diff --git a/package.json b/package.json
index e2e75f253..04b75a0b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.44.0",
+    "version": "24.50.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -64,4 +64,4 @@
         "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
-}
+}
\ No newline at end of file
diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
deleted file mode 100644
index da006e024..000000000
--- a/src/components/CreateManualInvoiceForm.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<script setup>
-import { reactive, ref, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FormModelPopup from './FormModelPopup.vue';
-import VnInputDate from './common/VnInputDate.vue';
-
-const emit = defineEmits(['onDataSaved']);
-
-const { t } = useI18n();
-const router = useRouter();
-
-const manualInvoiceFormData = reactive({
-    maxShipped: Date.vnNew(),
-});
-
-const formModelPopupRef = ref();
-const invoiceOutSerialsOptions = ref([]);
-const taxAreasOptions = ref([]);
-const ticketsOptions = ref([]);
-const clientsOptions = ref([]);
-const isLoading = computed(() => formModelPopupRef.value?.isLoading);
-
-const onDataSaved = async (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
-    if (requestResponse && requestResponse.id)
-        router.push({ name: 'InvoiceOutSummary', params: { id: requestResponse.id } });
-};
-</script>
-
-<template>
-    <FetchData
-        url="InvoiceOutSerials"
-        :filter="{ where: { code: { neq: 'R' } }, order: ['code'] }"
-        @on-fetch="(data) => (invoiceOutSerialsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="TaxAreas"
-        :filter="{ order: ['code'] }"
-        @on-fetch="(data) => (taxAreasOptions = data)"
-        auto-load
-    />
-    <FormModelPopup
-        ref="formModelPopupRef"
-        :title="t('Create manual invoice')"
-        url-create="InvoiceOuts/createManualInvoice"
-        model="invoiceOut"
-        :form-initial-data="manualInvoiceFormData"
-        @on-data-saved="onDataSaved"
-    >
-        <template #form-inputs="{ data }">
-            <span v-if="isLoading" class="text-primary invoicing-text">
-                <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
-                {{ t('Invoicing in progress...') }}
-            </span>
-            <VnRow>
-                <VnSelect
-                    :label="t('Ticket')"
-                    :options="ticketsOptions"
-                    hide-selected
-                    option-label="id"
-                    option-value="id"
-                    v-model="data.ticketFk"
-                    @update:model-value="data.clientFk = null"
-                    url="Tickets"
-                    :where="{ refFk: null }"
-                    :fields="['id', 'nickname']"
-                    :filter-options="{ order: 'shipped DESC' }"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <span class="row items-center" style="max-width: max-content">{{
-                    t('Or')
-                }}</span>
-                <VnSelect
-                    :label="t('Client')"
-                    :options="clientsOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="data.clientFk"
-                    @update:model-value="data.ticketFk = null"
-                    url="Clients"
-                    :fields="['id', 'name']"
-                    :filter-options="{ order: 'name ASC' }"
-                />
-                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
-            </VnRow>
-            <VnRow>
-                <VnSelect
-                    :label="t('Serial')"
-                    :options="invoiceOutSerialsOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="code"
-                    v-model="data.serial"
-                />
-                <VnSelect
-                    :label="t('Area')"
-                    :options="taxAreasOptions"
-                    hide-selected
-                    option-label="code"
-                    option-value="code"
-                    v-model="data.taxArea"
-                />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    :label="t('Reference')"
-                    type="textarea"
-                    v-model="data.reference"
-                    fill-input
-                    autogrow
-                />
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<style lang="scss" scoped>
-.invoicing-text {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: $primary;
-    font-size: 24px;
-    margin-bottom: 8px;
-}
-</style>
-
-<i18n>
-es:
-    Create manual invoice: Crear factura manual
-    Ticket: Ticket
-    Client: Cliente
-    Max date: Fecha límite
-    Serial: Serie
-    Area: Area
-    Reference: Referencia
-    Or: O
-    Invoicing in progress...: Facturación en progreso...
-</i18n>
diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index a4cb55a2c..0de5d3aa2 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -77,7 +77,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref();
+const formData = ref([]);
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
index 1cf36deeb..d1ceff4ce 100644
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@@ -50,25 +50,25 @@ const loading = ref(false);
 
 const tableColumns = computed(() => [
     {
-        label: t('entry.buys.id'),
+        label: t('globals.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('entry.buys.name'),
+        label: t('globals.name'),
         name: 'name',
         field: 'name',
         align: 'left',
     },
     {
-        label: t('entry.buys.size'),
+        label: t('globals.size'),
         name: 'size',
         field: 'size',
         align: 'left',
     },
     {
-        label: t('entry.buys.producer'),
+        label: t('globals.producer'),
         name: 'producerName',
         field: 'producer',
         align: 'left',
@@ -152,10 +152,10 @@ const selectItem = ({ id }) => {
             </span>
             <h1 class="title">{{ t('Filter item') }}</h1>
             <VnRow>
-                <VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
+                <VnInput :label="t('globals.name')" v-model="itemFilterParams.name" />
                 <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
                 <VnSelect
-                    :label="t('entry.buys.producer')"
+                    :label="t('globals.producer')"
                     :options="producersOptions"
                     hide-selected
                     option-label="name"
@@ -163,7 +163,7 @@ const selectItem = ({ id }) => {
                     v-model="itemFilterParams.producerFk"
                 />
                 <VnSelect
-                    :label="t('entry.buys.type')"
+                    :label="t('globals.type')"
                     :options="ItemTypesOptions"
                     hide-selected
                     option-label="name"
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index c84772d9b..a471552f2 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -48,13 +48,13 @@ const loading = ref(false);
 
 const tableColumns = computed(() => [
     {
-        label: t('entry.basicData.id'),
+        label: t('globals.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('entry.basicData.warehouseOut'),
+        label: t('globals.warehouseOut'),
         name: 'warehouseOutFk',
         field: 'warehouseOutFk',
         align: 'left',
@@ -62,7 +62,7 @@ const tableColumns = computed(() => [
             warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
     },
     {
-        label: t('entry.basicData.warehouseIn'),
+        label: t('globals.warehouseIn'),
         name: 'warehouseInFk',
         field: 'warehouseInFk',
         align: 'left',
@@ -70,14 +70,14 @@ const tableColumns = computed(() => [
             warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
     },
     {
-        label: t('entry.basicData.shipped'),
+        label: t('globals.shipped'),
         name: 'shipped',
         field: 'shipped',
         align: 'left',
         format: (val) => toDate(val),
     },
     {
-        label: t('entry.basicData.landed'),
+        label: t('globals.landed'),
         name: 'landed',
         field: 'landed',
         align: 'left',
@@ -146,7 +146,7 @@ const selectTravel = ({ id }) => {
             <h1 class="title">{{ t('Filter travels') }}</h1>
             <VnRow>
                 <VnSelect
-                    :label="t('entry.basicData.agency')"
+                    :label="t('globals.agency')"
                     :options="agenciesOptions"
                     hide-selected
                     option-label="name"
@@ -154,7 +154,7 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.agencyModeFk"
                 />
                 <VnSelect
-                    :label="t('entry.basicData.warehouseOut')"
+                    :label="t('globals.warehouseOut')"
                     :options="warehousesOptions"
                     hide-selected
                     option-label="name"
@@ -162,7 +162,7 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.warehouseOutFk"
                 />
                 <VnSelect
-                    :label="t('entry.basicData.warehouseIn')"
+                    :label="t('globals.warehouseIn')"
                     :options="warehousesOptions"
                     hide-selected
                     option-label="name"
@@ -170,11 +170,11 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.warehouseInFk"
                 />
                 <VnInputDate
-                    :label="t('entry.basicData.shipped')"
+                    :label="t('globals.shipped')"
                     v-model="travelFilterParams.shipped"
                 />
                 <VnInputDate
-                    :label="t('entry.basicData.landed')"
+                    :label="t('globals.landed')"
                     v-model="travelFilterParams.landed"
                 />
             </VnRow>
diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index e89d32da4..938dceb4d 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -248,7 +248,7 @@ const removeTag = (index, params, search) => {
             >
                 <QItemSection class="col">
                     <VnSelect
-                        :label="t('components.itemsFilterPanel.tag')"
+                        :label="t('globals.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
                         option-label="name"
diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 6e0ae5907..ab2931dfd 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -22,7 +22,7 @@ const props = defineProps({
         default: 'main',
     },
 });
-
+const initialized = ref(false);
 const items = ref([]);
 const expansionItemElements = reactive({});
 const pinnedModules = computed(() => {
@@ -34,18 +34,26 @@ const search = ref(null);
 
 const filteredItems = computed(() => {
     if (!search.value) return items.value;
+    const normalizedSearch = normalize(search.value);
     return items.value.filter((item) => {
-        const locale = t(item.title).toLowerCase();
-        return locale.includes(search.value.toLowerCase());
+        const locale = normalize(t(item.title));
+        return locale.includes(normalizedSearch);
     });
 });
 
 const filteredPinnedModules = computed(() => {
     if (!search.value) return pinnedModules.value;
+    const normalizedSearch = search.value
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '')
+        .toLowerCase();
     const map = new Map();
     for (const [key, pinnedModule] of pinnedModules.value) {
-        const locale = t(pinnedModule.title).toLowerCase();
-        if (locale.includes(search.value.toLowerCase())) map.set(key, pinnedModule);
+        const locale = t(pinnedModule.title)
+            .normalize('NFD')
+            .replace(/[\u0300-\u036f]/g, '')
+            .toLowerCase();
+        if (locale.includes(normalizedSearch)) map.set(key, pinnedModule);
     }
     return map;
 });
@@ -53,11 +61,13 @@ const filteredPinnedModules = computed(() => {
 onMounted(async () => {
     await navigation.fetchPinned();
     getRoutes();
+    initialized.value = true;
 });
 
 watch(
     () => route.matched,
     () => {
+        if (!initialized.value) return;
         items.value = [];
         getRoutes();
     },
@@ -147,6 +157,13 @@ async function togglePinned(item, event) {
 const handleItemExpansion = (itemName) => {
     expansionItemElements[itemName].scrollToLastElement();
 };
+
+function normalize(text) {
+    return text
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '')
+        .toLowerCase();
+}
 </script>
 
 <template>
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 9da0b26a4..86802ee92 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -25,7 +25,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
 });
 
diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index 7fdd23b78..8ffdfe2bc 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -17,7 +17,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
     vertical: {
         type: Boolean,
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index fd7b0c51a..65f716142 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -162,9 +162,7 @@ onMounted(() => {
             : $props.defaultMode;
     stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
-        ...splittedColumns.value.columns
-            .filter((c) => c.visible == false)
-            .map((c) => c.name),
+        ...splittedColumns.value.columns.filter((c) => !c.visible).map((c) => c.name),
         ...['tableActions'],
     ];
     createForm.value = $props.create;
@@ -237,7 +235,7 @@ function splitColumns(columns) {
         if (col.create) splittedColumns.value.create.push(col);
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
-        if ($props.useModel && col.columnFilter != false)
+        if ($props.useModel && col.columnFilter !== false)
             col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index 3f9e65740..35308c2c4 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -163,7 +163,7 @@ function addDefaultData(data) {
                 />
                 <QFile
                     ref="inputFileRef"
-                    :label="t('entry.buys.file')"
+                    :label="t('globals.file')"
                     v-model="dms.files"
                     :multiple="false"
                     :accept="allowedContentTypes"
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index fcc04ddf7..eb9dc0f38 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -1,8 +1,7 @@
 <script setup>
-import { onMounted, watch, computed, ref } from 'vue';
+import { onMounted, watch, computed, ref, useAttrs } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useAttrs } from 'vue';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 
diff --git a/src/components/common/VnRadio.vue b/src/components/common/VnRadio.vue
index 4eeb9dbe9..69b1501a2 100644
--- a/src/components/common/VnRadio.vue
+++ b/src/components/common/VnRadio.vue
@@ -2,5 +2,12 @@
 const model = defineModel({ type: Boolean, required: true });
 </script>
 <template>
-    <QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
+    <QRadio
+        v-model="model"
+        v-bind="$attrs"
+        dense
+        :dark="true"
+        class="q-mr-sm"
+        size="xs"
+    />
 </template>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 4622f1cb0..227ff9465 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
-import FetchData from 'src/components/FetchData.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 import { useRequired } from 'src/composables/useRequired';
 import dataByOrder from 'src/utils/dataByOrder';
 
@@ -90,6 +90,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    dataKey: {
+        type: String,
+        default: null,
+    },
 });
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
@@ -98,14 +102,14 @@ const { optionLabel, optionValue, optionFilter, optionFilterValue, options, mode
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
-const dataRef = ref();
 const lastVal = ref();
 const noOneText = t('globals.noOne');
 const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
-
+const isLoading = ref(false);
+const useURL = computed(() => $props.url);
 const value = computed({
     get() {
         return $props.modelValue;
@@ -129,11 +133,18 @@ watch(modelValue, async (newValue) => {
 
 onMounted(() => {
     setOptions(options.value);
-    if ($props.url && $props.modelValue && !findKeyInOptions())
+    if (useURL.value && $props.modelValue && !findKeyInOptions())
         fetchFilter($props.modelValue);
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
+defineExpose({ opts: myOptions });
+
+const arrayDataKey =
+    $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
+
+const arrayData = useArrayData(arrayDataKey, { url: $props.url, searchUrl: false });
+
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -168,7 +179,7 @@ function filter(val, options) {
 }
 
 async function fetchFilter(val) {
-    if (!$props.url || !dataRef.value) return;
+    if (!$props.url) return;
 
     const { fields, include, sortBy, limit } = $props;
     const key =
@@ -190,8 +201,8 @@ async function fetchFilter(val) {
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
-
-    return dataRef.value.fetch(fetchOptions);
+    arrayData.reset(['skip', 'filter.skip', 'page']);
+    return (await arrayData.applyFilter({ filter: fetchOptions }))?.data;
 }
 
 async function filterHandler(val, update) {
@@ -231,20 +242,23 @@ function nullishToTrue(value) {
 
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 
-defineExpose({ opts: myOptions });
+async function onScroll({ to, direction, from, index }) {
+    const lastIndex = myOptions.value.length - 1;
+
+    if (from === 0 && index === 0) return;
+    if (!useURL.value && !$props.fetchRef) return;
+    if (direction === 'decrease') return;
+    if (to === lastIndex && arrayData.store.hasMoreData && !isLoading.value) {
+        isLoading.value = true;
+        await arrayData.loadMore();
+        setOptions(arrayData.store.data);
+        vnSelectRef.value.scrollTo(lastIndex);
+        isLoading.value = false;
+    }
+}
 </script>
 
 <template>
-    <FetchData
-        ref="dataRef"
-        :url="$props.url"
-        @on-fetch="(data) => setOptions(data)"
-        :where="where || { [optionValue]: value }"
-        :limit="limit"
-        :sort-by="sortBy"
-        :fields="fields"
-        :params="params"
-    />
     <QSelect
         v-model="value"
         :options="myOptions"
@@ -263,6 +277,9 @@ defineExpose({ opts: myOptions });
         :rules="mixinRules"
         virtual-scroll-slice-size="options.length"
         hide-bottom-space
+        :input-debounce="useURL ? '300' : '0'"
+        :loading="isLoading"
+        @virtual-scroll="onScroll"
     >
         <template v-if="isClearable" #append>
             <QIcon
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index f469aa799..cf8859a35 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -83,7 +83,7 @@ async function fetch() {
                     <slot name="header" :entity="entity" dense>
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
-                    <slot name="header-right">
+                    <slot name="header-right" :entity="entity">
                         <span></span>
                     </slot>
                 </div>
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index a8aca49dd..84f2b43d7 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -37,7 +37,7 @@ const $props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => ['filter', 'search', 'or', 'and'],
+        default: () => ['filter', 'or', 'and'],
     },
     customTags: {
         type: Array,
@@ -49,7 +49,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
     redirect: {
         type: Boolean,
@@ -61,7 +61,6 @@ const emit = defineEmits([
     'update:modelValue',
     'refresh',
     'clear',
-    'search',
     'init',
     'remove',
     'setUserParams',
diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index 3ce0b7aa6..4c045968f 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -1,16 +1,49 @@
 <script setup>
-defineProps({ phoneNumber: { type: [String, Number], default: null } });
+import { reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
+import axios from 'axios';
+const props = defineProps({
+    phoneNumber: { type: [String, Number], default: null },
+    channel: { type: Number, default: null },
+});
+
+const config = reactive({
+    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
+    'say-simple': {
+        icon: 'vn:saysimple',
+        href: null,
+        channel: props.channel,
+    },
+});
+const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
+
+onBeforeMount(async () => {
+    let { channel } = config[type];
+
+    if (type === 'say-simple') {
+        const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
+            .data;
+        if (!channel) channel = defaultChannel;
+
+        config[
+            type
+        ].href = `${url}?customerIdentity=%2B${props.phoneNumber}&channelId=${channel}`;
+    }
+});
 </script>
 <template>
     <QBtn
         v-if="phoneNumber"
         flat
         round
-        icon="phone"
+        :icon="config[type].icon"
         size="sm"
         color="primary"
         padding="none"
-        :href="`sip:${phoneNumber}`"
+        :href="config[type].href"
         @click.stop
-    />
+    >
+        <QTooltip>
+            {{ capitalize(type).replace('-', '') }}
+        </QTooltip>
+    </QBtn>
 </template>
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index b395b3934..dbcb2f3fe 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -65,13 +65,9 @@ onBeforeRouteLeave((to, from, next) => {
         auto-load
         @on-fetch="(data) => (observationTypes = data)"
     />
-    <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
+    <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
         <QCardSection horizontal>
-            <VnAvatar :worker-id="currentUser.id" size="md" />
-            <div class="full-width row justify-between q-pa-xs">
-                <VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
-                {{ t('globals.now') }}
-            </div>
+            {{ t('New note') }}
         </QCardSection>
         <QCardSection class="q-px-xs q-my-none q-py-none">
             <VnRow class="full-width">
@@ -144,7 +140,7 @@ onBeforeRouteLeave((to, from, next) => {
                         <div class="full-width row justify-between q-pa-xs">
                             <div>
                                 <VnUserLink
-                                    :name="`${note.worker.user.nickname}`"
+                                    :name="`${note.worker.user.name}`"
                                     :worker-id="note.worker.id"
                                 />
                                 <QBadge
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 80c607214..b058dc642 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -44,7 +44,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 10,
+        default: 20,
     },
     userParams: {
         type: Object,
@@ -100,7 +100,7 @@ const arrayData = useArrayData(props.dataKey, {
 const store = arrayData.store;
 
 onMounted(async () => {
-    if (props.autoLoad) await fetch();
+    if (props.autoLoad && !store.data?.length) await fetch();
     mounted.value = true;
 });
 
@@ -115,7 +115,11 @@ watch(
 
 watch(
     () => store.data,
-    (data) => emit('onChange', data)
+    (data) => {
+        if (!mounted.value) return;
+        emit('onChange', data);
+    },
+    { immediate: true }
 );
 
 watch(
diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue
index 40dabf610..b57489a98 100644
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="vn-row q-gutter-md q-mb-md">
+    <div class="vn-row q-gutter-md">
         <slot />
     </div>
 </template>
@@ -18,6 +18,9 @@
         &:not(.wrap) {
             flex-direction: column;
         }
+        &[fixed] {
+            flex-direction: row;
+        }
     }
 }
 </style>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index dc6d4751c..da2d370fe 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -45,7 +45,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 10,
+        default: 20,
     },
     userParams: {
         type: Object,
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 747c6ab64..ac0c1da08 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -75,18 +75,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             limit: store.limit,
         };
 
-        let exprFilter;
         let userParams = { ...store.userParams };
-        if (store?.exprBuilder) {
-            const where = buildFilter(userParams, (param, value) => {
-                const res = store.exprBuilder(param, value);
-                if (res) delete userParams[param];
-                return res;
-            });
-            exprFilter = where ? { where } : null;
-        }
 
-        Object.assign(filter, store.userFilter, exprFilter);
+        Object.assign(filter, store.userFilter);
+
         let where;
         if (filter?.where || store.filter?.where)
             where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
@@ -96,11 +88,28 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
-        if (store.order && store.order.length) params.filter.order = store.order;
+        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (store.order?.length) params.filter.order = [...store.order];
         else delete params.filter.order;
 
+        store.currentFilter = JSON.parse(JSON.stringify(params));
+        delete store.currentFilter.filter.include;
+        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
+
+        let exprFilter;
+        if (store?.exprBuilder) {
+            exprFilter = buildFilter(params, (param, value) => {
+                if (param == 'filter') return;
+                const res = store.exprBuilder(param, value);
+                if (res) delete params[param];
+                return res;
+            });
+        }
+
+        if (params.filter.where || exprFilter)
+            params.filter.where = { ...params.filter.where, ...exprFilter };
         params.filter = JSON.stringify(params.filter);
-        store.currentFilter = params;
+
         store.isLoading = true;
         const response = await axios.get(store.url, {
             signal: canceller.signal,
@@ -247,6 +256,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     function updateStateParams() {
+        if (!route?.path) return;
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
         if (store?.searchUrl)
             newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
@@ -270,7 +280,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                destroy();
+                else destroy();
                 return router.push(pushUrl);
             }
         }
diff --git a/src/composables/useOpenURL.js b/src/composables/useOpenURL.js
new file mode 100644
index 000000000..008774c20
--- /dev/null
+++ b/src/composables/useOpenURL.js
@@ -0,0 +1,8 @@
+import { openURL } from 'quasar';
+const defaultWindowFeatures = {
+    noopener: true,
+    noreferrer: true,
+};
+export default function (url, windowFeatures = defaultWindowFeatures, fn = undefined) {
+    openURL(url, fn, windowFeatures);
+}
diff --git a/src/filters/getParamWhere.js b/src/filters/getParamWhere.js
index 22dd69af1..ef00a93ae 100644
--- a/src/filters/getParamWhere.js
+++ b/src/filters/getParamWhere.js
@@ -9,7 +9,7 @@ function parseJSON(str, fallback) {
 }
 export default function (route, param) {
     // catch route query params
-    const params = parseJSON(route?.query?.params, {});
+    const params = parseJSON(route?.query?.table, {});
     // extract and parse filter from params
     const { filter: filterStr = '{}' } = params;
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 12a5e8fc3..867965ece 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -59,7 +59,7 @@ globals:
     downloadCSVSuccess: CSV downloaded successfully
     reference: Reference
     agency: Agency
-    wareHouseOut: Warehouse Out
+    warehouseOut: Warehouse Out
     wareHouseIn: Warehouse In
     landed: Landed
     shipped: Shipped
@@ -106,6 +106,26 @@ globals:
     weight: Weight
     error: Ups! Something went wrong
     recalc: Recalculate
+    alias: Alias
+    vat: VAT
+    intrastat: Intrastat
+    tags: Tags
+    size: Size
+    producer: Producer
+    origin: Origin
+    state: State
+    subtotal: Subtotal
+    visible: Visible
+    price: Price
+    client: Client
+    country: Country
+    phone: Phone
+    mobile: Mobile
+    postcode: Postcode
+    street: Street
+    tag: Tag
+    ticketId: Ticket ID
+    confirmed: Confirmed
     small: Small
     medium: Medium
     big: Big
@@ -300,13 +320,10 @@ globals:
     maxTemperature: Max
     minTemperature: Min
     params:
-        id: ID
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
         provinceFk: Province
-        from: From
-        To: To
         stateFk: State
         email: Email
         SSN: SSN
@@ -336,16 +353,12 @@ login:
     loginError: Invalid username or password
     fieldRequired: This field is required
     twoFactorRequired: Two-factor verification required
-twoFactor:
-    code: Code
+twoFactorRequired:
     validate: Validate
     insert: Enter the verification code
     explanation: >-
         Please, enter the verification code that we have sent to your email in the
         next 5 minutes
-verifyEmail:
-    pageTitles:
-        verifyEmail: Email verification
 recoverPassword:
     userOrEmail: User or recovery email
     explanation: >-
@@ -357,15 +370,7 @@ resetPassword:
 entry:
     list:
         newEntry: New entry
-        landed: Landed
-        invoiceNumber: Invoice number
-        supplier: Supplier
-        booked: Booked
-        confirmed: Confirmed
-        ordered: Ordered
         tableVisibleColumns:
-            id: Id
-            reference: Reference
             created: Creation
             supplierFk: Supplier
             isBooked: Booked
@@ -378,236 +383,117 @@ entry:
     summary:
         commission: Commission
         currency: Currency
-        company: Company
-        reference: Reference
         invoiceNumber: Invoice number
         ordered: Ordered
-        confirmed: Confirmed
         booked: Booked
         excludedFromAvailable: Inventory
         travelReference: Reference
         travelAgency: Agency
         travelShipped: Shipped
-        travelWarehouseOut: Warehouse Out
         travelDelivered: Delivered
         travelLanded: Landed
-        travelWarehouseIn: Warehouse In
         travelReceived: Received
         buys: Buys
-        quantity: Quantity
         stickers: Stickers
         package: Package
-        weight: Weight
         packing: Packing
         grouping: Grouping
         buyingValue: Buying value
         import: Import
         pvp: PVP
-        item: Item
     basicData:
-        supplier: Supplier
         travel: Travel
-        reference: Reference
-        invoiceNumber: Invoice number
-        company: Company
         currency: Currency
         commission: Commission
         observation: Observation
-        ordered: Ordered
-        confirmed: Confirmed
         booked: Booked
         excludedFromAvailable: Inventory
-        agency: Agency
-        warehouseOut: Warehouse Out
-        warehouseIn: Warehouse In
-        shipped: Shipped
-        landed: Landed
-        id: ID
     buys:
-        groupingPrice: Grouping price
-        packingPrice: Packing price
-        reference: Reference
         observations: Observations
-        item: Item
-        size: Size
-        packing: Packing
-        grouping: Grouping
-        buyingValue: Buying value
         packagingFk: Box
-        file: File
-        name: Name
-        producer: Producer
-        type: Type
         color: Color
-        id: ID
         printedStickers: Printed stickers
     notes:
         observationType: Observation type
-    descriptor:
-        agency: Agency
-        landed: Landed
-        warehouseOut: Warehouse Out
     latestBuys:
         tableVisibleColumns:
             image: 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
             isExcludedFromAvailable: Es inventory
 ticket:
-    pageTitles:
-        tickets: Tickets
-        list: List
-        ticketCreate: New ticket
-        summary: Summary
-        basicData: Basic Data
-        boxing: Boxing
-        sms: Sms
-        notes: Notes
-        sale: Sale
-        dms: File management
-        volume: Volume
-        observation: Notes
-        ticketAdvance: Advance tickets
-        futureTickets: Future tickets
-        purchaseRequest: Purchase request
-        weeklyTickets: Weekly tickets
-    list:
-        nickname: Nickname
-        state: State
-        shipped: Shipped
-        landed: Landed
-        salesPerson: Sales person
-        total: Total
     card:
-        ticketId: Ticket ID
-        state: State
         customerId: Customer ID
-        salesPerson: Sales person
-        agency: Agency
-        shipped: Shipped
-        warehouse: Warehouse
         customerCard: Customer card
-        alias: Alias
         ticketList: Ticket List
         newOrder: New Order
     boxing:
         expedition: Expedition
-        item: Item
         created: Created
-        worker: Worker
         selectTime: 'Select time:'
         selectVideo: 'Select video:'
         notFound: No videos available
     summary:
-        state: State
-        salesPerson: Sales person
-        agency: Agency
         zone: Zone
-        warehouse: Warehouse
         collection: Collection
         route: Route
         invoice: Invoice
         shipped: Shipped
-        landed: Landed
         consigneePhone: Consignee phone
         consigneeMobile: Consignee mobile
         consigneeAddress: Consignee address
         clientPhone: Client phone
         clientMobile: Client mobile
         consignee: Consignee
-        subtotal: Subtotal
-        vat: VAT
         total: Total
         saleLines: Line items
-        item: Item
-        visible: Visible
         available: Available
-        quantity: Quantity
-        price: Price
         discount: Discount
         packing: Packing
         hasComponentLack: Component lack
         itemShortage: Not visible
         claim: Claim
         reserved: Reserved
-        created: Created
         package: Package
         taxClass: Tax class
         services: Services
         requester: Requester
         atender: Atender
         request: Request
-        weight: Weight
         goTo: Go to
         summaryAmount: Summary
         purchaseRequest: Purchase request
         service: Service
-        description: Description
         attender: Attender
         ok: Ok
     create:
-        client: Client
         address: Address
-        landed: Landed
-        warehouse: Warehouse
-        agency: Agency
 invoiceOut:
-    list:
-        ref: Reference
-        issued: Issued
-        shortIssued: Issued
-        client: Client
-        created: Created
-        shortCreated: Created
-        company: Company
-        dued: Due date
-        shortDued: Due date
-        amount: Amount
     card:
         issued: Issued
-        client: Client
-        company: Company
         customerCard: Customer card
     summary:
         issued: Issued
-        created: Created
         dued: Due
         booked: Booked
-        company: Company
         taxBreakdown: Tax breakdown
-        type: Type
         taxableBase: Taxable base
         rate: Rate
         fee: Fee
         tickets: Tickets
-        ticketId: Ticket id
-        nickname: Alias
-        shipped: Shipped
         totalWithVat: Amount
     globalInvoices:
         errors:
@@ -620,23 +506,16 @@ invoiceOut:
             invoiceWithFutureDate: Exists an invoice with a future date
             noTicketsToInvoice: There are not tickets to invoice
             criticalInvoiceError: 'Critical invoicing error, process stopped'
+            invalidSerialTypeForAll: The serial type must be global when invoicing all clients
         table:
-            client: Client
             addressId: Address id
             streetAddress: Street
         statusCard:
             percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}'
             pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs'
     negativeBases:
-        from: From
-        to: To
-        company: Company
-        country: Country
         clientId: Client Id
-        client: Client
-        amount: Amount
         base: Base
-        ticketId: Ticket Id
         active: Active
         hasToInvoice: Has to Invoice
         verifiedData: Verified Data
@@ -649,15 +528,6 @@ shelving:
         priority: Priority
         newShelving: New Shelving
     summary:
-        code: Code
-        parking: Parking
-        priority: Priority
-        worker: Worker
-        recyclable: Recyclable
-    basicData:
-        code: Code
-        parking: Parking
-        priority: Priority
         recyclable: Recyclable
 parking:
     pickingOrder: Picking order
@@ -670,56 +540,27 @@ parking:
 order:
     field:
         salesPersonFk: Sales Person
-        clientFk: Client
-        isConfirmed: Confirmed
-        created: Created
-        landed: Landed
-        hour: Hour
-        agency: Agency
-        total: Total
     form:
         clientFk: Client
         addressFk: Address
-        landed: Landed
         agencyModeFk: Agency
     list:
         newOrder: New Order
     summary:
         basket: Basket
-        nickname: Nickname
-        company: Company
-        confirmed: Confirmed
         notConfirmed: Not confirmed
         created: Created
-        landed: Landed
-        phone: Phone
         createdFrom: Created From
         address: Address
-        notes: Notes
-        subtotal: Subtotal
         total: Total
-        vat: VAT
-        state: State
-        alias: Alias
         items: Items
         orderTicketList: Order Ticket List
-        details: Details
-        item: Item
-        quantity: Quantity
-        price: Price
         amount: Amount
         confirm: Confirm
         confirmLines: Confirm lines
 department:
-    pageTitles:
-        basicData: Basic data
-        department: Department
-        summary: Summary
-    name: Name
-    code: Code
     chat: Chat
     bossDepartment: Boss Department
-    email: Email
     selfConsumptionCustomer: Self-consumption customer
     telework: Telework
     notifyOnErrors: Notify on errors
@@ -728,47 +569,11 @@ department:
     hasToSendMail: Send check-ins by email
     departmentRemoved: Department removed
 worker:
-    pageTitles:
-        workers: Workers
-        list: List
-        basicData: Basic data
-        summary: Summary
-        notifications: Notifications
-        workerCreate: New worker
-        department: Department
-        pda: PDA
-        notes: Notas
-        dms: My documentation
-        pbx: Private Branch Exchange
-        log: Log
-        calendar: Calendar
-        timeControl: Time control
-        locker: Locker
-        balance: Balance
-        medical: Medical
-        operator: Operator
     list:
-        name: Name
-        email: Email
-        phone: Phone
-        mobile: Mobile
-        active: Active
         department: Department
         schedule: Schedule
         newWorker: New worker
-    card:
-        workerId: Worker ID
-        user: User
-        name: Name
-        email: Email
-        phone: Phone
-        mobile: Mobile
-        active: Active
-        warehouse: Warehouse
-        agency: Agency
-        salesPerson: Sales person
     summary:
-        basicData: Basic data
         boss: Boss
         phoneExtension: Phone extension
         entPhone: Enterprise phone
@@ -800,19 +605,12 @@ worker:
         serialNumber: Serial number
         removePDA: Deallocate PDA
     create:
-        name: Name
         lastName: Last name
         birth: Birth
         fi: Fi
         code: Worker code
-        phone: Phone
-        postcode: Postcode
-        province: Province
-        city: City
-        street: Street
         webUser: Web user
         personalEmail: Personal email
-        company: Company
         boss: Boss
         payMethods: Pay method
         iban: IBAN
@@ -824,16 +622,13 @@ worker:
             endDate: End date
             center: Training center
             invoice: Invoice
-            amount: Amount
             remark: Remark
             hasDiploma: Has diploma
     medical:
         tableVisibleColumns:
-            date: Date
             time: Hour
             center: Formation Center
             invoice: Invoice
-            amount: Amount
             isFit: Fit
             remark: Observations
     imageNotFound: Image not found
@@ -857,18 +652,7 @@ worker:
         isOnReservationMode: Reservation mode
         machine: Machine
 wagon:
-    pageTitles:
-        wagons: Wagons
-        wagonsList: Wagons List
-        wagonCreate: Create wagon
-        wagonEdit: Edit wagon
-        typesList: Types List
-        typeCreate: Create type
-        typeEdit: Edit type
-        wagonCounter: Trolley counter
-        wagonTray: Tray List
     type:
-        name: Name
         submit: Submit
         reset: Reset
         trayColor: Tray color
@@ -876,13 +660,10 @@ wagon:
     list:
         plate: Plate
         volume: Volume
-        type: Type
         remove: Remove
         removeItem: Wagon removed successfully
     create:
         plate: Plate
-        volume: Volume
-        type: Type
         label: Label
     warnings:
         noData: No data available
@@ -899,26 +680,17 @@ wagon:
 supplier:
     list:
         payMethod: Pay method
-        payDeadline: Pay deadline
-        payDay: Pay day
         account: Account
         newSupplier: New supplier
         tableVisibleColumns:
-            id: Id
-            name: Name
             nif: NIF/CIF
-            nickname: Alias
             account: Account
-            payMethod: Pay Method
             payDay: Pay Day
-            country: Country
     summary:
         responsible: Responsible
-        notes: Notes
         verified: Verified
         isActive: Is active
         billingData: Billing data
-        payMethod: Pay method
         payDeadline: Pay deadline
         payDay: Pay day
         account: Account
@@ -931,15 +703,10 @@ supplier:
         fiscalAddress: Fiscal address
         socialName: Social name
         taxNumber: Tax number
-        street: Street
         city: City
-        postCode: Postcode
-        province: Province
-        country: Country
     create:
         supplierName: Supplier name
     basicData:
-        alias: Alias
         workerFk: Responsible
         isSerious: Verified
         isActive: Active
@@ -954,36 +721,18 @@ supplier:
         sageWithholdingFk: Sage withholding
         sageTransactionTypeFk: Sage transaction type
         supplierActivityFk: Supplier activity
-        healthRegister: Health register
-        street: Street
-        postcode: Postcode
-        city: City *
-        provinceFk: Province
-        country: Country
         isTrucker: Trucker
         isVies: Vies
     billingData:
         payMethodFk: Billing data
         payDemFk: Payment deadline
-        payDay: Pay day
     accounts:
         iban: Iban
         bankEntity: Bank entity
         beneficiary: Beneficiary
     contacts:
-        name: Name
-        phone: Phone
-        mobile: Mobile
         email: Email
         observation: Notes
-    addresses:
-        street: Street
-        postcode: Postcode
-        phone: Phone
-        name: Name
-        city: City
-        province: Province
-        mobile: Mobile
     agencyTerms:
         agencyFk: Agency
         minimumM3: Minimum M3
@@ -995,25 +744,16 @@ supplier:
         addRow: Add row
     consumption:
         entry: Entry
-        date: Date
-        reference: Reference
 travel:
     travelList:
         tableVisibleColumns:
-            id: Id
             ref: Reference
-            agency: Agency
-            shipped: Shipped
-            landed: Landed
             shipHour: Shipment Hour
             landHour: Landing Hour
-            warehouseIn: Warehouse in
-            warehouseOut: Warehouse out
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
     summary:
-        confirmed: Confirmed
         entryId: Entry Id
         freight: Freight
         package: Package
@@ -1026,65 +766,90 @@ travel:
         AddEntry: Add entry
         thermographs: Thermographs
         hb: HB
-    variables:
-        search: Id/Reference
-        agencyModeFk: Agency
-        warehouseInFk: ' Warehouse In'
-        warehouseOutFk: Warehouse Out
-        landedFrom: Landed from
-        landedTo: Landed to
-        continent: Continent out
-        totalEntries: Total entries
     basicData:
-        reference: Reference
-        agency: Agency
-        shipped: Shipped
-        landed: Landed
-        warehouseOut: Warehouse Out
-        warehouseIn: Warehouse In
-        delivered: Delivered
-        received: Received
         daysInForward: Days in forward
         isRaid: Raid
     thermographs:
-        code: Code
         temperature: Temperature
-        state: State
         destination: Destination
-        created: Created
         thermograph: Thermograph
-        reference: Reference
-        type: Type
-        company: Company
-        warehouse: Warehouse
         travelFileDescription: 'Travel id { travelId }'
-        file: File
+item:
+    descriptor:
+        buyer: Buyer
+        color: Color
+        category: Category
+        available: Available
+        warehouseText: 'Calculated on the warehouse of { warehouseName }'
+        itemDiary: Item diary
+    list:
+        id: Identifier
+        stems: Stems
+        category: Category
+        typeName: Type
+        isActive: Active
+        userName: Buyer
+        weightByPiece: Weight/Piece
+        stemMultiplier: Multiplier
+    fixedPrice:
+        itemFk: Item ID
+        groupingPrice: Grouping price
+        packingPrice: Packing price
+        hasMinPrice: Has min price
+        minPrice: Min price
+        started: Started
+        ended: Ended
+    create:
+        priority: Priority
+    buyRequest:
+        requester: Requester
+        requested: Requested
+        attender: Atender
+        achieved: Achieved
+        concept: Concept
+    summary:
+        otherData: Other data
+        tax: Tax
+        botanical: Botanical
+        barcode: Barcode
+        completeName: Complete name
+        family: Familiy
+        stems: Stems
+        multiplier: Multiplier
+        buyer: Buyer
+        doPhoto: Do photo
+        intrastatCode: Intrastat code
+        ref: Reference
+        relevance: Relevance
+        weight: Weight (gram)/stem
+        units: Units/box
+        expense: Expense
+        generic: Generic
+        recycledPlastic: Recycled plastic
+        nonRecycledPlastic: Non recycled plastic
+        minSalesQuantity: Min sales quantity
+        genus: Genus
+        specie: Specie
 components:
     topbar: {}
     itemsFilterPanel:
         typeFk: Type
-        tag: Tag
         value: Value
         # ItemFixedPriceFilter
         buyerFk: Buyer
-        warehouseFk: Warehouse
         started: From
         ended: To
         mine: For me
         hasMinPrice: Minimum price
         # LatestBuysFilter
         salesPersonFk: Buyer
-        supplierFk: Supplier
         from: From
-        to: To
         active: Is active
-        visible: Is visible
         floramondo: Is floramondo
         showBadDates: Show future items
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings
-        logOut: Log Out
         localWarehouse: Local warehouse
         localBank: Local bank
         localCompany: Local company
@@ -1092,9 +857,9 @@ components:
         userCompany: User company
     smartCard:
         downloadFile: Download file
-        clone: Clone
         openCard: View
         openSummary: Summary
+        viewSummary: Summary
     cardDescriptor:
         mainList: Main list
         summary: Summary
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ca2525c83..94bc5a586 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -58,8 +58,8 @@ globals:
     downloadCSVSuccess: Descarga de CSV exitosa
     reference: Referencia
     agency: Agencia
-    wareHouseOut: Alm. salida
-    wareHouseIn: Alm. entrada
+    warehouseOut: Alm. salida
+    warehouseIn: Alm. entrada
     landed: F. entrega
     shipped: F. envío
     totalEntries: Ent. totales
@@ -108,6 +108,26 @@ globals:
     weight: Peso
     error: ¡Ups! Algo salió mal
     recalc: Recalcular
+    alias: Alias
+    vat: IVA
+    intrastat: Intrastat
+    tags: Etiquetas
+    size: Medida
+    producer: Productor
+    origin: Origen
+    state: Estado
+    subtotal: Subtotal
+    visible: Visible
+    price: Precio
+    client: Cliente
+    country: País
+    phone: Teléfono
+    mobile: Móvil
+    postcode: Código postal
+    street: Dirección
+    tag: Etiqueta
+    ticketId: ID ticket
+    confirmed: Confirmado
     small: Pequeño/a
     medium: Mediano/a
     big: Grande
@@ -304,13 +324,10 @@ globals:
     maxTemperature: Máx
     minTemperature: Mín
     params:
-        id: Id
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
         provinceFk: Provincia
-        from: Desde
-        To: Hasta
         stateFk: Estado
         departmentFk: Departamento
         email: Correo
@@ -341,13 +358,9 @@ login:
     fieldRequired: Este campo es obligatorio
     twoFactorRequired: Verificación de doble factor requerida
 twoFactor:
-    code: Código
     validate: Validar
     insert: Introduce el código de verificación
     explanation: Por favor introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos
-verifyEmail:
-    pageTitles:
-        verifyEmail: Verificación de correo
 recoverPassword:
     userOrEmail: Usuario o correo de recuperación
     explanation: >-
@@ -359,15 +372,7 @@ resetPassword:
 entry:
     list:
         newEntry: Nueva entrada
-        landed: F. entrega
-        invoiceNumber: Núm. factura
-        supplier: Proveedor
-        booked: Asentado
-        confirmed: Confirmado
-        ordered: Pedida
         tableVisibleColumns:
-            id: Id
-            reference: Referencia
             created: Creación
             supplierFk: Proveedor
             isBooked: Asentado
@@ -380,11 +385,8 @@ entry:
     summary:
         commission: Comisión
         currency: Moneda
-        company: Empresa
-        reference: Referencia
         invoiceNumber: Núm. factura
         ordered: Pedida
-        confirmed: Confirmada
         booked: Contabilizada
         excludedFromAvailable: Inventario
         travelReference: Referencia
@@ -393,230 +395,108 @@ entry:
         travelWarehouseOut: Alm. salida
         travelDelivered: Enviada
         travelLanded: F. entrega
-        travelWarehouseIn: Alm. entrada
         travelReceived: Recibida
         buys: Compras
-        quantity: Cantidad
         stickers: Etiquetas
         package: Embalaje
-        weight: Peso
         packing: Packing
         grouping: Grouping
         buyingValue: Coste
         import: Importe
         pvp: PVP
-        item: Artículo
     basicData:
-        supplier: Proveedor
         travel: Envío
-        reference: Referencia
-        invoiceNumber: Núm. factura
-        company: Empresa
         currency: Moneda
         observation: Observación
         commission: Comisión
-        ordered: Pedida
-        confirmed: Confirmado
         booked: Asentado
         excludedFromAvailable: Inventario
-        agency: Agencia
-        warehouseOut: Alm. salida
-        warehouseIn: Alm. entrada
-        shipped: F. envío
-        landed: F. entrega
-        id: ID
     buys:
-        groupingPrice: Precio grouping
-        packingPrice: Precio packing
-        reference: Referencia
         observations: Observaciónes
-        item: Artículo
-        size: Medida
-        packing: Packing
-        grouping: Grouping
-        buyingValue: Coste
         packagingFk: Embalaje
-        file: Fichero
-        name: Nombre
-        producer: Productor
-        type: Tipo
         color: Color
-        id: ID
         printedStickers: Etiquetas impresas
     notes:
         observationType: Tipo de observación
-    descriptor:
-        agency: Agencia
-        landed: F. entrega
-        warehouseOut: Alm. salida
     latestBuys:
         tableVisibleColumns:
             image: 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
             isExcludedFromAvailable: Es inventario
 ticket:
-    pageTitles:
-        tickets: Tickets
-        list: Listado
-        ticketCreate: Nuevo ticket
-        summary: Resumen
-        basicData: Datos básicos
-        boxing: Encajado
-        sms: Sms
-        notes: Notas
-        sale: Lineas del pedido
-        dms: Gestión documental
-        volume: Volumen
-        observation: Notas
-        ticketAdvance: Adelantar tickets
-        futureTickets: Tickets a futuro
-        expedition: Expedición
-        purchaseRequest: Petición de compra
-        weeklyTickets: Tickets programados
-        saleTracking: Líneas preparadas
-        services: Servicios
-        tracking: Estados
-        components: Componentes
-        pictures: Fotos
-        packages: Embalajes
-    list:
-        nickname: Alias
-        state: Estado
-        shipped: Enviado
-        landed: Entregado
-        salesPerson: Comercial
-        total: Total
     card:
-        ticketId: ID ticket
-        state: Estado
         customerId: ID cliente
-        salesPerson: Comercial
-        agency: Agencia
-        shipped: Enviado
-        warehouse: Almacén
         customerCard: Ficha del cliente
-        alias: Alias
         ticketList: Listado de tickets
         newOrder: Nuevo pedido
     boxing:
         expedition: Expedición
-        item: Artículo
         created: Creado
-        worker: Trabajador
         selectTime: 'Seleccionar hora:'
         selectVideo: 'Seleccionar vídeo:'
         notFound: No hay vídeos disponibles
     summary:
-        state: Estado
-        salesPerson: Comercial
-        agency: Agencia
         zone: Zona
-        warehouse: Almacén
         collection: Colección
         route: Ruta
         invoice: Factura
         shipped: Enviado
-        landed: Entregado
         consigneePhone: Tel. consignatario
         consigneeMobile: Móv. consignatario
         consigneeAddress: Dir. consignatario
         clientPhone: Tel. cliente
         clientMobile: Móv. cliente
         consignee: Consignatario
-        subtotal: Subtotal
-        vat: IVA
         total: Total
         saleLines: Líneas del pedido
-        item: Artículo
-        visible: Visible
         available: Disponible
-        quantity: Cantidad
-        price: Precio
         discount: Descuento
         packing: Encajado
         hasComponentLack: Faltan componentes
         itemShortage: No visible
         claim: Reclamación
         reserved: Reservado
-        created: Fecha creación
         package: Embalaje
         taxClass: Tipo IVA
         services: Servicios
         requester: Solicitante
         atender: Comprador
         request: Petición de compra
-        weight: Peso
         goTo: Ir a
         summaryAmount: Resumen
         purchaseRequest: Petición de compra
         service: Servicio
-        description: Descripción
         attender: Consignatario
     create:
-        client: Cliente
         address: Dirección
-        landed: F. entrega
-        warehouse: Almacén
-        agency: Agencia
 invoiceOut:
-    list:
-        ref: Referencia
-        issued: Fecha emisión
-        shortIssued: F. emisión
-        client: Cliente
-        created: Fecha creación
-        shortCreated: F. creación
-        company: Empresa
-        dued: Fecha vencimineto
-        shortDued: F. vencimiento
-        amount: Importe
     card:
         issued: Fecha emisión
-        client: Cliente
-        company: Empresa
         customerCard: Ficha del cliente
         ticketList: Listado de tickets
     summary:
         issued: Fecha
-        created: Fecha creación
         dued: Vencimiento
         booked: Contabilizada
-        company: Empresa
         taxBreakdown: Desglose impositivo
-        type: Tipo
         taxableBase: Base imp.
         rate: Tarifa
         fee: Cuota
         tickets: Tickets
-        ticketId: Id ticket
-        nickname: Alias
-        shipped: F. envío
         totalWithVat: Importe
     globalInvoices:
         errors:
@@ -629,21 +509,16 @@ invoiceOut:
             invoiceWithFutureDate: Existe una factura con una fecha futura
             noTicketsToInvoice: No existen tickets para facturar
             criticalInvoiceError: Error crítico en la facturación proceso detenido
+            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
         table:
-            client: Cliente
             addressId: Id dirección
             streetAddress: Dirección fiscal
         statusCard:
             percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
             pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
     negativeBases:
-        company: Empresa
-        country: País
         clientId: Id cliente
-        client: Cliente
-        amount: Importe
         base: Base
-        ticketId: Id ticket
         active: Activo
         hasToInvoice: Facturar
         verifiedData: Datos comprobados
@@ -653,43 +528,24 @@ invoiceOut:
 order:
     field:
         salesPersonFk: Comercial
-        clientFk: Cliente
-        isConfirmed: Confirmada
-        created: Creado
-        landed: F. entrega
-        hour: Hora
-        agency: Agencia
-        total: Total
     form:
         clientFk: Cliente
         addressFk: Dirección
-        landed: F. entrega
         agencyModeFk: Agencia
     list:
         newOrder: Nuevo Pedido
     summary:
         basket: Cesta
-        nickname: Alias
-        company: Empresa
-        confirmed: Confirmada
         notConfirmed: No confirmada
         created: Creado
-        landed: F. entrega
-        phone: Teléfono
         createdFrom: Creado desde
         address: Dirección
-        notes: Notas
-        subtotal: Subtotal
         total: Total
         vat: IVA
         state: Estado
         alias: Alias
         items: Artículos
         orderTicketList: Tickets del pedido
-        details: Detalles
-        item: Item
-        quantity: Cantidad
-        price: Precio
         amount: Monto
         confirm: Confirmar
         confirmLines: Confirmar lineas
@@ -699,15 +555,6 @@ shelving:
         priority: Prioridad
         newShelving: Nuevo Carro
     summary:
-        code: Código
-        parking: Parking
-        priority: Prioridad
-        worker: Trabajador
-        recyclable: Reciclable
-    basicData:
-        code: Código
-        parking: Parking
-        priority: Prioridad
         recyclable: Reciclable
 parking:
     pickingOrder: Orden de recogida
@@ -717,15 +564,8 @@ parking:
         info: Puedes buscar por código de parking
         label: Buscar parking...
 department:
-    pageTitles:
-        basicData: Basic data
-        department: Departamentos
-        summary: Resumen
-    name: Nombre
-    code: Código
     chat: Chat
     bossDepartment: Jefe de departamento
-    email: Email
     selfConsumptionCustomer: Cliente autoconsumo
     telework: Teletrabaja
     notifyOnErrors: Notificar errores
@@ -734,48 +574,11 @@ department:
     hasToSendMail: Enviar fichadas por mail
     departmentRemoved: Departamento eliminado
 worker:
-    pageTitles:
-        workers: Trabajadores
-        list: Listado
-        basicData: Datos básicos
-        summary: Resumen
-        notifications: Notificaciones
-        workerCreate: Nuevo trabajador
-        department: Departamentos
-        pda: PDA
-        notes: Notas
-        dms: Mi documentación
-        pbx: Centralita
-        log: Historial
-        calendar: Calendario
-        timeControl: Control de horario
-        locker: Taquilla
-        balance: Balance
-        formation: Formación
-        medical: Mutua
-        operator: Operario
     list:
-        name: Nombre
-        email: Email
-        phone: Teléfono
-        mobile: Móvil
-        active: Activo
         department: Departamento
         schedule: Horario
         newWorker: Nuevo trabajador
-    card:
-        workerId: ID Trabajador
-        user: Usuario
-        name: Nombre
-        email: Correo personal
-        phone: Teléfono
-        mobile: Móvil
-        active: Activo
-        warehouse: Almacén
-        agency: Empresa
-        salesPerson: Comercial
     summary:
-        basicData: Datos básicos
         boss: Jefe
         phoneExtension: Extensión de teléfono
         entPhone: Teléfono de empresa
@@ -798,19 +601,12 @@ worker:
         serialNumber: Número de serie
         removePDA: Desasignar PDA
     create:
-        name: Nombre
         lastName: Apellido
         birth: Fecha de nacimiento
         fi: DNI/NIF/NIE
         code: Código de trabajador
-        phone: Teléfono
-        postcode: Código postal
-        province: Provincia
-        city: Población
-        street: Dirección
         webUser: Usuario Web
         personalEmail: Correo personal
-        company: Empresa
         boss: Jefe
         payMethods: Método de pago
         iban: IBAN
@@ -822,16 +618,13 @@ worker:
             endDate: Fecha Fin
             center: Centro Formación
             invoice: Factura
-            amount: Importe
             remark: Bonficado
             hasDiploma: Diploma
     medical:
         tableVisibleColumns:
-            date: Fecha
             time: Hora
             center: Centro de Formación
             invoice: Factura
-            amount: Importe
             isFit: Apto
             remark: Observaciones
     imageNotFound: No se ha encontrado la imagen
@@ -856,18 +649,7 @@ worker:
         machine: Máquina
 
 wagon:
-    pageTitles:
-        wagons: Vagones
-        wagonsList: Listado vagones
-        wagonCreate: Crear tipo
-        wagonEdit: Editar tipo
-        typesList: Listado tipos
-        typeCreate: Crear tipo
-        typeEdit: Editar tipo
-        wagonCounter: Contador de carros
-        wagonTray: Listado bandejas
     type:
-        name: Nombre
         submit: Guardar
         reset: Deshacer cambios
         trayColor: Color de la bandeja
@@ -875,13 +657,9 @@ wagon:
     list:
         plate: Matrícula
         volume: Volumen
-        type: Tipo
         remove: Borrar
         removeItem: Vagón borrado correctamente
     create:
-        plate: Matrícula
-        volume: Volumen
-        type: Tipo
         label: Etiqueta
     warnings:
         noData: Sin datos disponibles
@@ -897,26 +675,16 @@ wagon:
 supplier:
     list:
         payMethod: Método de pago
-        payDeadline: Plazo de pago
-        payDay: Día de pago
         account: Cuenta
         newSupplier: Nuevo proveedor
         tableVisibleColumns:
-            id: Id
-            name: Nombre
             nif: NIF/CIF
-            nickname: Alias
             account: Cuenta
-            payMethod: Método de pago
-            payDay: Dia de pago
-            country: País
     summary:
         responsible: Responsable
-        notes: Notas
         verified: Verificado
         isActive: Está activo
         billingData: Forma de pago
-        payMethod: Método de pago
         payDeadline: Plazo de pago
         payDay: Día de pago
         account: Cuenta
@@ -929,15 +697,11 @@ supplier:
         fiscalAddress: Dirección fiscal
         socialName: Razón social
         taxNumber: NIF/CIF
-        street: Dirección
         city: Población
-        postCode: Código postal
         province: Provincia
-        country: País
     create:
         supplierName: Nombre del proveedor
     basicData:
-        alias: Alias
         workerFk: Responsable
         isSerious: Verificado
         isActive: Activo
@@ -952,36 +716,17 @@ supplier:
         sageWithholdingFk: Retención sage
         sageTransactionTypeFk: Tipo de transacción sage
         supplierActivityFk: Actividad proveedor
-        healthRegister: Pasaporte sanitario
-        street: Calle
-        postcode: Código postal
-        city: Población *
-        provinceFk: Provincia
-        country: País
         isTrucker: Transportista
         isVies: Vies
     billingData:
         payMethodFk: Forma de pago
         payDemFk: Plazo de pago
-        payDay: Día de pago
     accounts:
         iban: Iban
         bankEntity: Entidad bancaria
         beneficiary: Beneficiario
     contacts:
-        name: Nombre
-        phone: Teléfono
-        mobile: Móvil
-        email: Email
         observation: Notas
-    addresses:
-        street: Dirección
-        postcode: Código postal
-        phone: Teléfono
-        name: Nombre
-        city: Población
-        province: Provincia
-        mobile: Móvil
     agencyTerms:
         agencyFk: Agencia
         minimumM3: M3 mínimos
@@ -993,25 +738,16 @@ supplier:
         addRow: Añadir fila
     consumption:
         entry: Entrada
-        date: Fecha
-        reference: Referencia
 travel:
     travelList:
         tableVisibleColumns:
-            id: Id
             ref: Referencia
-            agency: Agencia
-            shipped: F.envío
             shipHour: Hora de envío
             landHour: Hora de llegada
-            landed: F.entrega
-            warehouseIn: Alm.salida
-            warehouseOut: Alm.entrada
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
     summary:
-        confirmed: Confirmado
         entryId: Id entrada
         freight: Porte
         package: Embalaje
@@ -1024,63 +760,89 @@ travel:
         AddEntry: Añadir entrada
         thermographs: Termógrafos
         hb: HB
-    variables:
-        search: Id/Referencia
-        agencyModeFk: Agencia
-        warehouseInFk: Alm. entrada
-        warehouseOutFk: ' Alm. salida'
-        landedFrom: Llegada desde
-        landedTo: Llegada hasta
-        continent: Cont. Salida
-        totalEntries: Ent. totales
     basicData:
-        reference: Referencia
-        agency: Agencia
-        shipped: F. Envío
-        landed: F. entrega
-        warehouseOut: Alm. salida
-        warehouseIn: Alm. entrada
-        delivered: Enviada
-        received: Recibida
         daysInForward: Días redada
         isRaid: Redada
     thermographs:
-        code: Código
         temperature: Temperatura
-        state: Estado
         destination: Destino
-        created: Fecha creación
         thermograph: Termógrafo
-        reference: Referencia
-        type: Tipo
-        company: Empresa
-        warehouse: Almacén
         travelFileDescription: 'Id envío { travelId }'
-        file: Fichero
+item:
+    descriptor:
+        buyer: Comprador
+        color: Color
+        category: Categoría
+        available: Disponible
+        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
+        itemDiary: Registro de compra-venta
+    list:
+        id: Identificador
+        stems: Tallos
+        category: Reino
+        typeName: Tipo
+        isActive: Activo
+        weightByPiece: Peso (gramos)/tallo
+        userName: Comprador
+        stemMultiplier: Multiplicador
+    fixedPrice:
+        itemFk: ID Artículo
+        groupingPrice: Precio grouping
+        packingPrice: Precio packing
+        hasMinPrice: Tiene precio mínimo
+        minPrice: Precio min
+        started: Inicio
+        ended: Fin
+    create:
+        priority: Prioridad
+    summary:
+        otherData: Otros datos
+        tax: IVA
+        botanical: Botánico
+        barcode: Código de barras
+        completeName: Nombre completo
+        family: Familia
+        stems: Tallos
+        multiplier: Multiplicador
+        buyer: Comprador
+        doPhoto: Hacer foto
+        intrastatCode: Código intrastat
+        ref: Referencia
+        relevance: Relevancia
+        weight: Peso (gramos)/tallo
+        units: Unidades/caja
+        expense: Gasto
+        generic: Genérico
+        recycledPlastic: Plástico reciclado
+        nonRecycledPlastic: Plástico no reciclado
+        minSalesQuantity: Cantidad mínima de venta
+        genus: Genus
+        specie: Specie
+    buyRequest:
+        requester: Solicitante
+        requested: Solicitado
+        attender: Comprador
+        achieved: Conseguido
+        concept: Concepto
 components:
     topbar: {}
     itemsFilterPanel:
         typeFk: Tipo
-        tag: Etiqueta
         value: Valor
         # ItemFixedPriceFilter
         buyerFk: Comprador
-        warehouseFk: Almacén
         started: Desde
         ended: Hasta
         mine: Para mi
         hasMinPrice: Precio mínimo
         # LatestBuysFilter
         salesPersonFk: Comprador
-        supplierFk: Proveedor
         active: Activo
-        visible: Visible
         floramondo: Floramondo
         showBadDates: Ver items a futuro
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración
-        logOut: Cerrar sesión
         localWarehouse: Almacén local
         localBank: Banco local
         localCompany: Empresa local
@@ -1088,7 +850,6 @@ components:
         userCompany: Empresa del usuario
     smartCard:
         downloadFile: Descargar archivo
-        clone: Clonar
         openCard: Ficha
         openSummary: Detalles
         viewSummary: Vista previa
diff --git a/src/pages/Account/AccountCreate.vue b/src/pages/Account/AccountCreate.vue
index e584a1acd..6b7c049c8 100644
--- a/src/pages/Account/AccountCreate.vue
+++ b/src/pages/Account/AccountCreate.vue
@@ -37,7 +37,7 @@ const redirectToAccountBasicData = (_, { id }) => {
             <div class="column q-gutter-sm">
                 <VnInput
                     v-model="data.name"
-                    :label="t('account.create.name')"
+                    :label="t('globals.name')"
                     :rules="validate('VnUser.name')"
                 />
                 <VnInput
@@ -47,12 +47,12 @@ const redirectToAccountBasicData = (_, { id }) => {
                 />
                 <VnInput
                     v-model="data.email"
-                    :label="t('account.create.email')"
+                    :label="t('globals.params.email')"
                     type="email"
                     :rules="validate('VnUser.email')"
                 />
                 <VnSelect
-                    :label="t('account.create.role')"
+                    :label="t('account.card.role')"
                     v-model="data.roleFk"
                     :options="rolesOptions"
                     option-value="id"
@@ -63,7 +63,7 @@ const redirectToAccountBasicData = (_, { id }) => {
                 />
                 <VnInput
                     v-model="data.password"
-                    :label="t('account.create.password')"
+                    :label="t('ldap.password')"
                     type="password"
                     :rules="validate('VnUser.password')"
                 />
diff --git a/src/pages/Account/AccountFilter.vue b/src/pages/Account/AccountFilter.vue
index 3c8378d93..46fac875a 100644
--- a/src/pages/Account/AccountFilter.vue
+++ b/src/pages/Account/AccountFilter.vue
@@ -45,7 +45,7 @@ const rolesOptions = ref([]);
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('account.card.name')"
+                        :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
                         is-outlined
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 7b8433e73..84d8f1cde 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -102,11 +102,11 @@ onMounted(async () => await getInitialLdapConfig());
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('ldap.testConnection')"
+                    :label="t('account.card.testConnection')"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('ldap.testConnection') }}
+                        {{ t('account.card.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -114,7 +114,7 @@ onMounted(async () => await getInitialLdapConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('ldap.enableSync')"
+                            :label="t('account.card.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"
@@ -146,7 +146,7 @@ onMounted(async () => await getInitialLdapConfig());
                     />
                     <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
                     <VnInput
-                        :label="t('ldap.groupDN')"
+                        :label="t('account.card.groupDN')"
                         clearable
                         v-model="data.groupDn"
                     />
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 9e7f1b10a..cbaaf8e26 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -104,7 +104,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="AccountUsers"
+        data-key="AccountList"
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
@@ -112,12 +112,12 @@ const exprBuilder = (param, value) => {
     />
     <RightMenu>
         <template #right-panel>
-            <AccountFilter data-key="AccountUsers" />
+            <AccountFilter data-key="AccountList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="AccountUsers"
+        data-key="AccountList"
         url="VnUsers/preview"
         :filter="filter"
         order="id DESC"
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 7af9f4364..15b886f27 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -110,12 +110,12 @@ onMounted(async () => await getInitialSambaConfig());
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('samba.testConnection')"
+                    :label="t('account.card.testConnection')"
                     :disable="formModel.hasChanges"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('samba.testConnection') }}
+                        {{ t('account.card.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -123,7 +123,7 @@ onMounted(async () => await getInitialSambaConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('samba.enableSync')"
+                            :label="t('account.card.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"
diff --git a/src/pages/Account/Alias/AliasCreateForm.vue b/src/pages/Account/Alias/AliasCreateForm.vue
index b21099555..e401b6d54 100644
--- a/src/pages/Account/Alias/AliasCreateForm.vue
+++ b/src/pages/Account/Alias/AliasCreateForm.vue
@@ -36,15 +36,12 @@ const onDataSaved = ({ id }) => {
         <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                    <VnInput v-model="data.alias" :label="t('globals.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('mailAlias.description')"
-                    />
+                    <VnInput v-model="data.description" :label="t('role.description')" />
                 </div>
             </VnRow>
         </template>
diff --git a/src/pages/Account/Alias/Card/AliasBasicData.vue b/src/pages/Account/Alias/Card/AliasBasicData.vue
index ba940cda5..c78dfb4df 100644
--- a/src/pages/Account/Alias/Card/AliasBasicData.vue
+++ b/src/pages/Account/Alias/Card/AliasBasicData.vue
@@ -11,8 +11,8 @@ const { t } = useI18n();
     <FormModel model="Alias">
         <template #form="{ data }">
             <div class="column q-gutter-y-md">
-                <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
-                <VnInput v-model="data.description" :label="t('mailAlias.description')" />
+                <VnInput v-model="data.alias" :label="t('globals.name')" />
+                <VnInput v-model="data.description" :label="t('role.description')" />
                 <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
             </div>
         </template>
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
index 963f84547..713cecf75 100644
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -71,7 +71,7 @@ const removeAlias = () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
+            <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Account/Alias/Card/AliasSummary.vue b/src/pages/Account/Alias/Card/AliasSummary.vue
index b2dc1f0fc..1f76fe7c2 100644
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@@ -42,8 +42,8 @@ const entityId = computed(() => $props.id || route.params.id);
                         <QIcon name="open_in_new" />
                     </router-link>
                 </QCardSection>
-                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
-                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
+                <VnLv :label="t('role.id')" :value="alias.id" />
+                <VnLv :label="t('role.description')" :value="alias.description" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index f1cdaf9df..e6c9da6fe 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -36,7 +36,7 @@ watch(
             <div class="q-gutter-y-sm">
                 <VnInput v-model="data.name" :label="t('account.card.nickname')" />
                 <VnInput v-model="data.nickname" :label="t('account.card.alias')" />
-                <VnInput v-model="data.email" :label="t('account.card.email')" />
+                <VnInput v-model="data.email" :label="t('globals.params.email')" />
                 <VnSelect
                     url="Languages"
                     v-model="data.lang"
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 4571ee8ab..3156f8e1e 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -54,7 +54,7 @@ const hasAccount = ref(false);
         </template>
         <template #before>
             <!-- falla id :id="entityId.value" collection="user" size="160x160" -->
-            <VnImg :id="entityId" collection="user" resolution="160x160" class="photo">
+            <VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
                 <template #error>
                     <div
                         class="absolute-full picture text-center q-pa-md flex flex-center"
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index 5398485e3..5a27e2ed6 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -82,14 +82,14 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="Roles"
+        data-key="AccountRolesList"
         :expr-builder="exprBuilder"
         :label="t('role.searchRoles')"
         :info="t('role.searchInfo')"
     />
     <VnTable
         ref="tableRef"
-        data-key="Roles"
+        data-key="AccountRolesList"
         :url="`VnRoles`"
         :create="{
             urlCreate: 'VnRoles',
diff --git a/src/pages/Account/Role/AccountRolesFilter.vue b/src/pages/Account/Role/AccountRolesFilter.vue
index 8340b965d..ff4411897 100644
--- a/src/pages/Account/Role/AccountRolesFilter.vue
+++ b/src/pages/Account/Role/AccountRolesFilter.vue
@@ -29,7 +29,7 @@ const props = defineProps({
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('role.name')"
+                        :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
                         is-outlined
diff --git a/src/pages/Account/Role/Card/RoleBasicData.vue b/src/pages/Account/Role/Card/RoleBasicData.vue
index 56f4f0c27..1de9ff387 100644
--- a/src/pages/Account/Role/Card/RoleBasicData.vue
+++ b/src/pages/Account/Role/Card/RoleBasicData.vue
@@ -12,15 +12,12 @@ const { t } = useI18n();
         <template #form="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.name" :label="t('role.card.name')" />
+                    <VnInput v-model="data.name" :label="t('globals.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('role.card.description')"
-                    />
+                    <VnInput v-model="data.description" :label="t('role.description')" />
                 </div>
             </VnRow>
         </template>
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index 35f9a1f27..a2d5710f4 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -9,7 +9,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Role"
         :descriptor="RoleDescriptor"
-        search-data-key="AccountRoles"
+        search-data-key="AccountRolesList"
         :searchbar-props="{
             url: 'VnRoles',
             label: t('role.searchRoles'),
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index e4af3ed13..af018565a 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -58,7 +58,7 @@ const removeRole = async () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('role.card.description')" :value="entity.description" />
+            <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Account/Role/Card/RoleForm.vue b/src/pages/Account/Role/Card/RoleForm.vue
index 382639beb..09a098085 100644
--- a/src/pages/Account/Role/Card/RoleForm.vue
+++ b/src/pages/Account/Role/Card/RoleForm.vue
@@ -22,15 +22,12 @@ const { t } = useI18n();
         <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.name" :label="t('role.card.name')" />
+                    <VnInput v-model="data.name" :label="t('globals.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('role.card.description')"
-                    />
+                    <VnInput v-model="data.description" :label="t('role.description')" />
                 </div>
             </VnRow>
         </template>
diff --git a/src/pages/Account/Role/Card/RoleSummary.vue b/src/pages/Account/Role/Card/RoleSummary.vue
index 76c72e947..fef85f919 100644
--- a/src/pages/Account/Role/Card/RoleSummary.vue
+++ b/src/pages/Account/Role/Card/RoleSummary.vue
@@ -44,9 +44,9 @@ const filter = {
                         <QIcon name="open_in_new" />
                     </a>
                 </QCardSection>
-                <VnLv :label="t('role.card.id')" :value="role.id" />
-                <VnLv :label="t('role.card.name')" :value="role.name" />
-                <VnLv :label="t('role.card.description')" :value="role.description" />
+                <VnLv :label="t('role.id')" :value="role.id" />
+                <VnLv :label="t('globals.name')" :value="role.name" />
+                <VnLv :label="t('role.description')" :value="role.description" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index fe8707eb8..f2f563923 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -1,32 +1,15 @@
 account:
-    pageTitles:
-        users: Users
-        list: Users
-        roles: Roles
-        alias: Mail aliasses
-        accounts: Accounts
-        ldap: LDAP
-        samba: Samba
-        acls: ACLs
-        connections: Connections
-        inheritedRoles: Inherited Roles
-        subRoles: Sub Roles
-        newRole: New role
-        privileges: Privileges
-        mailAlias: Mail Alias
-        mailForwarding: Mail Forwarding
-        accountCreate: New user
-        aliasUsers: Users
     card:
-        name: Name
         nickname: User
         role: Role
-        email: Email
         alias: Alias
         lang: Language
         roleFk: Role
         newUser: New user
         ticketTracking: Ticket tracking
+        enableSync: Habilitar sincronización
+        groupDN: DN grupos
+        testConnection: Probar conexión
         privileges:
             delegate: Can delegate privileges
         enabled: Account enabled!
@@ -74,11 +57,7 @@ account:
     search: Search user
     searchInfo: You can search by id, name or nickname
     create:
-        name: Name
         nickname: Nickname
-        email: Email
-        role: Role
-        password: Password
         active: Active
     mailForwarding:
         forwardingMail: Forward email
@@ -86,50 +65,30 @@ account:
         enableMailForwarding: Enable mail forwarding
         mailInputInfo: All emails will be forwarded to the specified address.
 role:
-    pageTitles:
-        inheritedRoles: Inherited Roles
-        subRoles: Sub Roles
-    card:
-        description: Description
-        id: Id
-        name: Name
     newRole: New role
     searchRoles: Search role
     searchInfo: Search role by id or name
-    name: Name
     description: Description
     id: Id
 mailAlias:
-    pageTitles:
-        aliasUsers: Users
     search: Search mail alias
     searchInfo: Search alias by id or name
-    alias: Alias
-    description: Description
-    id: Id
     newAlias: New alias
-    name: Name
     isPublic: Public
 ldap:
-    enableSync: Enable synchronization
     server: Server
     rdn: RDN
     userDN: User DN
     filter: Filter
-    groupDN: Group DN
-    testConnection: Test connection
     success: LDAP connection established!
     password: Password
 samba:
-    enableSync: Enable synchronization
     domainController: Domain controller
     domainAD: AD domain
     userAD: AD user
-    groupDN: Group DN
     passwordAD: AD password
     domainPart: User DN (without domain part)
     verifyCertificate: Verify certificate
-    testConnection: Test connection
     success: Samba connection established!
 accounts:
     homedir: Homedir base
@@ -147,8 +106,6 @@ connections:
     created: Created
     killSession: Kill session
 acls:
-    role: Role
-    accessType: Access type
     permissions: Permission
     search: Search acls
     searchInfo: Search acls by model name
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index 112ffe9cc..ba559f2c3 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -1,27 +1,7 @@
 account:
-    pageTitles:
-        users: Usuarios
-        list: Usuarios
-        roles: Roles
-        alias: Alias de correo
-        accounts: Cuentas
-        ldap: LDAP
-        samba: Samba
-        acls: ACLs
-        connections: Conexiones
-        inheritedRoles: Roles heredados
-        newRole: Nuevo rol
-        subRoles: Subroles
-        privileges: Privilegios
-        mailAlias: Alias de correo
-        mailForwarding: Reenvío de correo
-        accountCreate: Nuevo usuario
-        aliasUsers: Usuarios
     card:
         nickname: Usuario
-        name: Nombre
         role: Rol
-        email: Mail
         alias: Alias
         lang: Idioma
         roleFk: Rol
@@ -33,6 +13,9 @@ account:
         deactivated: ¡Usuario desactivado!
         newUser: Nuevo usuario
         twoFactor: Doble factor
+        enableSync: Habilitar sincronización
+        groupDN: DN grupos
+        testConnection: Probar conexión
         privileges:
             delegate: Puede delegar privilegios
         actions:
@@ -73,11 +56,7 @@ account:
     search: Buscar usuario
     searchInfo: Puedes buscar por id, nombre o usuario
     create:
-        name: Nombre
         nickname: Nombre mostrado
-        email: Email
-        role: Rol
-        password: Contraseña
         active: Activo
     mailForwarding:
         forwardingMail: Dirección de reenvío
@@ -85,51 +64,30 @@ account:
         enableMailForwarding: Habilitar redirección de correo
         mailInputInfo: Todos los correos serán reenviados a la dirección especificada, no se mantendrá copia de los mismos en el buzón del usuario.
 role:
-    pageTitles:
-        inheritedRoles: Roles heredados
-        subRoles: Subroles
-        newRole: Nuevo rol
-    card:
-        description: Descripción
-        id: Id
-        name: Nombre
     newRole: Nuevo rol
     searchRoles: Buscar roles
     searchInfo: Buscar rol por id o nombre
-    name: Nombre
     description: Descripción
     id: Id
 mailAlias:
-    pageTitles:
-        aliasUsers: Usuarios
     search: Buscar alias de correo
     searchInfo: Buscar alias por id o nombre
-    alias: Alias
-    description: Descripción
-    id: Id
     newAlias: Nuevo alias
-    name: Nombre
     isPublic: Público
 ldap:
     password: Contraseña
-    enableSync: Habilitar sincronización
     server: Servidor
     rdn: RDN
     userDN: DN usuarios
     filter: Filtro
-    groupDN: DN grupos
-    testConnection: Probar conexión
     success: ¡Conexión con LDAP establecida!
 samba:
-    enableSync: Habilitar sincronización
     domainController: Controlador de dominio
     domainAD: Dominio AD
-    groupDN: DN grupos
     userAD: Usuario AD
     passwordAD: Contraseña AD
     domainPart: DN usuarios (sin la parte del dominio)
     verifyCertificate: Verificar certificado
-    testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
 accounts:
     homedir: Directorio base para carpetas de usuario
@@ -147,8 +105,6 @@ connections:
     created: Creado
     killSession: Matar sesión
 acls:
-    role: Rol
-    accessType: Tipo de acceso
     permissions: Permiso
     search: Buscar acls
     searchInfo: Buscar acls por nombre
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index dc25fe4a0..f7e2ffbf6 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -23,7 +23,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index d31669b43..a77d2f865 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -55,7 +55,7 @@ const exprBuilder = (param, value) => {
                 />
                 <VnSelect
                     :input-debounce="0"
-                    :label="t('customer.basicData.businessType')"
+                    :label="t('customer.summary.businessType')"
                     :options="businessTypes"
                     :rules="validate('client.businessTypeFk')"
                     emit-value
@@ -67,13 +67,13 @@ const exprBuilder = (param, value) => {
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('customer.basicData.contact')"
+                    :label="t('customer.summary.contact')"
                     :rules="validate('client.contact')"
                     clearable
                     v-model="data.contact"
                 />
                 <VnInput
-                    :label="t('customer.basicData.email')"
+                    :label="t('globals.params.email')"
                     :rules="validate('client.email')"
                     clearable
                     type="email"
@@ -90,13 +90,13 @@ const exprBuilder = (param, value) => {
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('customer.basicData.phone')"
+                    :label="t('customer.extendedList.tableVisibleColumns.phone')"
                     :rules="validate('client.phone')"
                     clearable
                     v-model="data.phone"
                 />
                 <VnInput
-                    :label="t('customer.basicData.mobile')"
+                    :label="t('customer.summary.mobile')"
                     :rules="validate('client.mobile')"
                     clearable
                     v-model="data.mobile"
@@ -106,7 +106,7 @@ const exprBuilder = (param, value) => {
                 <VnSelect
                     url="Workers/search"
                     v-model="data.salesPersonFk"
-                    :label="t('customer.basicData.salesPerson')"
+                    :label="t('customer.summary.salesPerson')"
                     :params="{
                         departmentCodes: ['VT', 'shopping'],
                     }"
@@ -144,7 +144,7 @@ const exprBuilder = (param, value) => {
                     option-value="id"
                     option-label="name"
                     emit-value
-                    :label="t('customer.basicData.contactChannel')"
+                    :label="t('customer.summary.contactChannel')"
                     map-options
                     :rules="validate('client.contactChannelFk')"
                     :input-debounce="0"
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 40166aefe..0753bee9e 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -37,6 +37,9 @@ const entityId = computed(() => {
 
 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
+const debtWarning = computed(() => {
+    return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
+});
 </script>
 
 <template>
@@ -53,11 +56,17 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
             <CustomerDescriptorMenu :customer="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
-
-            <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
             <VnLv
-                :label="t('customer.card.securedCredit')"
+                :label="t('customer.summary.payMethod')"
+                :value="entity.payMethod.name"
+            />
+
+            <VnLv
+                :label="t('customer.summary.credit')"
+                :value="toCurrency(entity.credit)"
+            />
+            <VnLv
+                :label="t('customer.summary.securedCredit')"
                 :value="toCurrency(entity.creditInsurance)"
             />
 
@@ -66,7 +75,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="toCurrency(entity.debt)"
                 :info="t('customer.summary.riskInfo')"
             />
-            <VnLv :label="t('customer.card.salesPerson')">
+            <VnLv :label="t('customer.summary.salesPerson')">
                 <template #value>
                     <VnUserLink
                         v-if="entity.salesPersonUser"
@@ -77,7 +86,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 </template>
             </VnLv>
             <VnLv
-                :label="t('customer.card.businessTypeFk')"
+                :label="t('customer.extendedList.tableVisibleColumns.businessTypeFk')"
                 :value="entity.businessType.description"
             />
         </template>
@@ -111,7 +120,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     v-if="customer.debt > customer.credit"
                     name="vn:risk"
                     size="xs"
-                    color="primary"
+                    :color="debtWarning"
                 >
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
@@ -168,23 +177,6 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer ticket list') }}</QTooltip>
                 </QBtn>
-                <QBtn
-                    :to="{
-                        name: 'TicketList',
-                        query: {
-                            table: JSON.stringify({
-                                clientFk: entity.id,
-                            }),
-                            createForm: JSON.stringify({ clientId: entity.id }),
-                        },
-                    }"
-                    size="md"
-                    color="primary"
-                    target="_blank"
-                    icon="vn:ticketAdd"
-                >
-                    <QTooltip>{{ t('New ticket') }}</QTooltip>
-                </QBtn>
                 <QBtn
                     :to="{
                         name: 'InvoiceOutList',
@@ -196,23 +188,6 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
-                <QBtn
-                    :to="{
-                        name: 'OrderList',
-                        query: {
-                            table: JSON.stringify({
-                                clientFk: entity.id,
-                            }),
-                            createForm: JSON.stringify({ clientFk: entity.id }),
-                        },
-                    }"
-                    size="md"
-                    target="_blank"
-                    icon="vn:basketadd"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('New order') }}</QTooltip>
-                </QBtn>
                 <QBtn
                     :to="{
                         name: 'AccountSummary',
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 7af415820..aeaeaef57 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -6,8 +6,8 @@ import axios from 'axios';
 import { useQuasar } from 'quasar';
 
 import useNotify from 'src/composables/useNotify';
-
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
+import useOpenURL from 'src/composables/useOpenURL';
 
 const $props = defineProps({
     customer: {
@@ -15,7 +15,6 @@ const $props = defineProps({
         required: true,
     },
 });
-
 const { notify } = useNotify();
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -40,9 +39,42 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
+
+const openCreateForm = (type) => {
+    const query = {
+        table: {
+            clientFk: $props.customer.id,
+        },
+        createForm: {
+            addressId: $props.customer.defaultAddressFk,
+        },
+    };
+    const clientFk = {
+        ticket: 'clientId',
+        order: 'clientFk',
+    };
+    const key = clientFk[type];
+    if (!key) return;
+    query.createForm[key] = $props.customer.id;
+
+    const params = Object.entries(query)
+        .map(([key, value]) => `${key}=${JSON.stringify(value)}`)
+        .join('&');
+    useOpenURL(`/#/${type}/list?${params}`);
+};
 </script>
 
 <template>
+    <QItem v-ripple clickable @click="openCreateForm('ticket')">
+        <QItemSection>
+            {{ t('globals.pageTitles.createTicket') }}
+        </QItemSection>
+    </QItem>
+    <QItem v-ripple clickable @click="openCreateForm('order')">
+        <QItemSection>
+            {{ t('globals.pageTitles.createOrder') }}
+        </QItemSection>
+    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 8e41119ef..95a162670 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
-import { toCurrency, toPercentage, toDate } from 'src/filters';
+import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
@@ -27,21 +27,16 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
-const clientUrl = ref();
-
-onMounted(async () => {
-    clientUrl.value = (await getUrl('client/')) + entityId.value + '/';
-});
-
+const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
 const balanceDue = computed(() => {
-    return (
-        customer.value &&
-        customer.value.defaulters.length &&
-        customer.value.defaulters[0].amount
-    );
+    const amount = defaulterAmount.value;
+    if (!amount || amount < 0) {
+        return null;
+    }
+    return amount;
 });
 
-const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
+const balanceDueWarning = computed(() => (defaulterAmount.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
     return customer.value.claimsRatio?.claimingRate ?? 0;
@@ -87,7 +82,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
                 <VnLv :value="entity.phone">
                     <template #label>
-                        {{ t('customer.summary.phone') }}
+                        {{ t('customer.extendedList.tableVisibleColumns.phone') }}
                         <VnLinkPhone :phone-number="entity.phone" />
                     </template>
                 </VnLv>
@@ -95,11 +90,17 @@ const sumRisk = ({ clientRisks }) => {
                     <template #label>
                         {{ t('customer.summary.mobile') }}
                         <VnLinkPhone :phone-number="entity.mobile" />
+                        <VnLinkPhone
+                            say-simple
+                            :phone-number="entity.mobile"
+                            :channel="entity.country?.saySimpleCountry?.channel"
+                            class="q-ml-xs"
+                        />
                     </template>
                 </VnLv>
                 <VnLv :value="entity.email" copy
                     ><template #label>
-                        {{ t('customer.summary.email') }}
+                        {{ t('globals.params.email') }}
                         <VnLinkMail email="entity.email"></VnLinkMail> </template
                 ></VnLv>
                 <VnLv
@@ -142,7 +143,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.country"
                     :label="t('customer.summary.country')"
-                    :value="entity.country.country"
+                    :value="entity.country.name"
                 />
                 <VnLv :label="t('customer.summary.street')" :value="entity.street" />
             </QCard>
@@ -213,7 +214,7 @@ const sumRisk = ({ clientRisks }) => {
                     :value="entity.defaultAddress.city"
                 />
                 <VnLv
-                    :label="t('customer.summary.addressStreet')"
+                    :label="t('customer.summary.street')"
                     :value="entity.defaultAddress.street"
                 />
             </QCard>
@@ -299,7 +300,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.defaulters"
                     :label="t('customer.summary.balanceDue')"
-                    :value="toCurrency(balanceDue)"
+                    :value="dashOrCurrency(balanceDue)()"
                     :class="balanceDueWarning"
                     :info="t('customer.summary.balanceDueInfo')"
                 />
diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue
index d7f933a7f..ef3ff3b94 100644
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@@ -2,10 +2,9 @@
 import { computed, onBeforeMount, ref, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
+import VnRow from 'components/ui/VnRow.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify';
 import { useStateStore } from 'stores/useStateStore';
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 6c50cc9df..79d48a667 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -11,10 +11,24 @@ defineProps({
         required: true,
     },
 });
+const handleSalesModelValue = (val) => ({
+    or: [
+        { id: val },
+        { name: val },
+        { nickname: { like: '%' + val + '%' } },
+        { code: { like: `${val}%` } },
+    ],
+});
+
+const exprBuilder = (param, value) => {
+    return {
+        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
+    };
+};
 </script>
 
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -34,7 +48,7 @@ defineProps({
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('customerFilter.filter.name')"
+                        :label="t('globals.name')"
                         v-model="params.name"
                         is-outlined
                     />
@@ -43,7 +57,7 @@ defineProps({
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('customerFilter.filter.socialName')"
+                        :label="t('customer.summary.socialName')"
                         v-model="params.socialName"
                         is-outlined
                     />
@@ -52,14 +66,18 @@ defineProps({
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnSelect
-                        url="Workers/activeWithInheritedRole"
-                        :filter="{ where: { role: 'salesPerson' } }"
+                        url="Workers/search"
+                        :params="{
+                            departmentCodes: ['VT'],
+                        }"
                         auto-load
                         :label="t('Salesperson')"
+                        :expr-builder="exprBuilder"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
                         option-value="id"
                         option-label="name"
+                        sort-by="nickname ASC"
                         emit-value
                         map-options
                         use-input
@@ -68,7 +86,18 @@ defineProps({
                         outlined
                         rounded
                         :input-debounce="0"
-                    />
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.nickname }},{{ opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template></VnSelect
+                    >
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 815ec57fa..3cb17332c 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -77,7 +77,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.credit'),
+        label: t('customer.summary.credit'),
         name: 'credit',
         columnFilter: {
             component: 'number',
@@ -115,7 +115,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.mobile'),
+        label: t('customer.summary.mobile'),
         name: 'mobile',
         cardVisible: true,
         columnFilter: {
@@ -162,17 +162,17 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.city'),
+        label: t('customer.summary.city'),
         name: 'city',
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.postcode'),
+        label: t('customer.summary.postcode'),
         name: 'postcode',
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.email'),
+        label: t('globals.params.email'),
         name: 'email',
         cardVisible: true,
     },
@@ -207,7 +207,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
+        label: t('customer.summary.payMethodFk'),
         name: 'payMethodFk',
         columnFilter: {
             component: 'select',
@@ -250,7 +250,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isActive'),
+        label: t('customer.summary.isActive'),
         name: 'isActive',
         chip: {
             color: null,
@@ -279,7 +279,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
+        label: t('customer.summary.isEqualizated'),
         name: 'isEqualizated',
         create: true,
         columnFilter: {
@@ -325,7 +325,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
+        label: t('customer.summary.hasLcr'),
         name: 'hasLcr',
         columnFilter: {
             inWhere: true,
@@ -333,7 +333,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
+        label: t('customer.summary.hasCoreVnl'),
         name: 'hasCoreVnl',
         columnFilter: {
             inWhere: true,
@@ -394,16 +394,16 @@ function handleLocation(data, location) {
     <VnSearchbar
         :info="t('You can search by customer id or name')"
         :label="t('Search customer')"
-        data-key="Customer"
+        data-key="CustomerList"
     />
     <RightMenu>
         <template #right-panel>
-            <CustomerFilter data-key="Customer" />
+            <CustomerFilter data-key="CustomerList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Customer"
+        data-key="CustomerList"
         url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
@@ -424,7 +424,7 @@ function handleLocation(data, location) {
             <VnSelect
                 url="Workers/search"
                 v-model="data.salesPersonFk"
-                :label="t('customer.basicData.salesPerson')"
+                :label="t('customer.summary.salesPerson')"
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 1e5387815..0ea8315d6 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -23,6 +23,7 @@ const incoterms = ref([]);
 const customsAgents = ref([]);
 const observationTypes = ref([]);
 const notes = ref([]);
+let originalNotes = [];
 const deletes = ref([]);
 
 onBeforeMount(() => {
@@ -42,7 +43,8 @@ const getData = async (observations) => {
         });
 
         if (data.length) {
-            notes.value = data
+            originalNotes = data;
+            notes.value = originalNotes
                 .map((observation) => {
                     const type = observationTypes.value.find(
                         (type) => type.id === observation.observationTypeFk
@@ -81,14 +83,24 @@ const deleteNote = (id, index) => {
 };
 
 const onDataSaved = async () => {
-    let payload = {};
-    const creates = notes.value.filter((note) => note.$isNew);
-    if (creates.length) {
-        payload.creates = creates;
-    }
-    if (deletes.value.length) {
-        payload.deletes = deletes.value;
-    }
+    let payload = {
+        creates: notes.value.filter((note) => note.$isNew),
+        deletes: deletes.value,
+        updates: notes.value
+            .filter((note) =>
+                originalNotes.some(
+                    (oNote) =>
+                        oNote.id === note.id &&
+                        (note.description !== oNote.description ||
+                            note.observationTypeFk !== oNote.observationTypeFk)
+                )
+            )
+            .map((note) => ({
+                data: note,
+                where: { id: note.id },
+            })),
+    };
+
     await axios.post('AddressObservations/crud', payload);
     notes.value = [];
     deletes.value = [];
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 1c0dfd2ce..c1ba506fd 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -194,14 +194,14 @@ const getItemPackagingType = (ticketSales) => {
         redirect="ticket"
     >
         <template #column-nickname="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.nickname }}
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
 
         <template #column-routeFk="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.routeFk }}
                 <RouteDescriptorProxy :id="row.routeFk" />
             </span>
@@ -218,7 +218,7 @@ const getItemPackagingType = (ticketSales) => {
             <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
         </template>
         <template #column-state="{ row }">
-            <span v-if="row.invoiceOut">
+            <span v-if="row.invoiceOut" @click.stop>
                 <span :class="{ link: row.invoiceOut.ref }">
                     {{ row.invoiceOut.ref }}
                     <InvoiceOutDescriptorProxy :id="row.invoiceOut.id" />
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 545c3f274..07ec53964 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -1,21 +1,5 @@
-customerFilter:
-    filter:
-        name: Name
-        socialName: Social name
 customer:
-    list:
-        phone: Phone
-        email: Email
-        customerOrders: Display customer orders
-        moreOptions: More options
     card:
-        customerList: Customer list
-        customerId: Claim ID
-        salesPerson: Sales person
-        credit: Credit
-        risk: Risk
-        securedCredit: Secured credit
-        payMethod: Pay method
         debt: Debt
         isFrozen: Customer frozen
         hasDebt: Customer has debt
@@ -23,9 +7,7 @@ customer:
         notChecked: Customer no checked
         webAccountInactive: Web account inactive
         noWebAccess: Web access is disabled
-        businessType: Business type
         passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
-        businessTypeFk: Business type
     summary:
         basicData: Basic data
         fiscalAddress: Fiscal address
@@ -37,9 +19,7 @@ customer:
         customerId: Customer ID
         name: Name
         contact: Contact
-        phone: Phone
         mobile: Mobile
-        email: Email
         salesPerson: Sales person
         contactChannel: Contact channel
         socialName: Social name
@@ -63,7 +43,6 @@ customer:
         hasB2BVnl: Has B2B VNL
         addressName: Address name
         addressCity: City
-        addressStreet: Street
         username: Username
         webAccess: Web access
         totalGreuge: Total greuge
@@ -92,45 +71,27 @@ customer:
         goToLines: Go to lines
     basicData:
         socialName: Fiscal name
-        businessType: Business type
-        contact: Contact
         youCanSaveMultipleEmails: You can save multiple emails
-        email: Email
-        phone: Phone
-        mobile: Mobile
-        salesPerson: Sales person
-        contactChannel: Contact channel
         previousClient: Previous client
     extendedList:
         tableVisibleColumns:
             id: Identifier
-            name: Name
             socialName: Social name
             fi: Tax number
             salesPersonFk: Salesperson
-            credit: Credit
             creditInsurance: Credit insurance
             phone: Phone
-            mobile: Mobile
             street: Street
             countryFk: Country
             provinceFk: Province
-            city: City
-            postcode: Postcode
-            email: Email
             created: Created
             businessTypeFk: Business type
-            payMethodFk: Billing data
             sageTaxTypeFk: Sage tax type
             sageTransactionTypeFk: Sage tr. type
-            isActive: Active
             isVies: Vies
             isTaxDataChecked: Verified data
-            isEqualizated: Is equalizated
             isFreezed: Freezed
             hasToInvoice: Invoice
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
-            hasLcr: Received LCR
-            hasCoreVnl: VNL core received
             hasSepaVnl: VNL B2B received
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 451784425..36a266497 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -1,22 +1,7 @@
 Search customer: Buscar cliente
 You can search by customer id or name: Puedes buscar por id o nombre del cliente
-customerFilter:
-    filter:
-        name: Nombre
-        socialName: Razón Social
 customer:
-    list:
-        phone: Teléfono
-        email: Email
-        customerOrders: Mostrar órdenes del cliente
-        moreOptions: Más opciones
     card:
-        customerId: ID cliente
-        salesPerson: Comercial
-        credit: Crédito
-        risk: Riesgo
-        securedCredit: Crédito asegurado
-        payMethod: Método de pago
         debt: Riesgo
         isFrozen: Cliente congelado
         hasDebt: Cliente con riesgo
@@ -24,9 +9,7 @@ customer:
         notChecked: Cliente no comprobado
         webAccountInactive: Sin acceso web
         noWebAccess: El acceso web está desactivado
-        businessType: Tipo de negocio
         passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
-        businessTypeFk: Tipo de negocio
     summary:
         basicData: Datos básicos
         fiscalAddress: Dirección fiscal
@@ -38,9 +21,7 @@ customer:
         customerId: ID cliente
         name: Nombre
         contact: Contacto
-        phone: Teléfono
         mobile: Móvil
-        email: Email
         salesPerson: Comercial
         contactChannel: Canal de contacto
         socialName: Razón social
@@ -64,7 +45,6 @@ customer:
         hasB2BVnl: Recibido B2B VNL
         addressName: Nombre de la dirección
         addressCity: Ciudad
-        addressStreet: Calle
         username: Usuario
         webAccess: Acceso web
         totalGreuge: Greuge total
@@ -93,45 +73,27 @@ customer:
         goToLines: Ir a líneas
     basicData:
         socialName: Nombre fiscal
-        businessType: Tipo de negocio
-        contact: Contacto
         youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
-        email: Email
-        phone: Teléfono
-        mobile: Móvil
-        salesPerson: Comercial
-        contactChannel: Canal de contacto
         previousClient: Cliente anterior
     extendedList:
         tableVisibleColumns:
             id: Identificador
-            name: Nombre
             socialName: Razón social
             fi: NIF / CIF
             salesPersonFk: Comercial
-            credit: Crédito
             creditInsurance: Crédito asegurado
             phone: Teléfono
-            mobile: Móvil
             street: Dirección fiscal
             countryFk: País
             provinceFk: Provincia
-            city: Población
-            postcode: Código postal
-            email: Email
             created: Fecha creación
             businessTypeFk: Tipo de negocio
-            payMethodFk: Forma de pago
             sageTaxTypeFk: Tipo de impuesto Sage
             sageTransactionTypeFk: Tipo tr. sage
-            isActive: Activo
             isVies: Vies
             isTaxDataChecked: Datos comprobados
-            isEqualizated: Recargo de equivalencias
             isFreezed: Congelado
             hasToInvoice: Factura
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
-            hasLcr: Recibido LCR
-            hasCoreVnl: Recibido core VNL
             hasSepaVnl: Recibido B2B VNL
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 141bb4159..07bccd971 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -20,16 +20,16 @@ const { t } = useI18n();
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('department.name')"
+                    :label="t('globals.name')"
                     v-model="data.name"
-                    :rules="validate('department.name')"
+                    :rules="validate('globals.name')"
                     clearable
                     autofocus
                 />
                 <VnInput
                     v-model="data.code"
-                    :label="t('department.code')"
-                    :rules="validate('department.code')"
+                    :label="t('globals.code')"
+                    :rules="validate('globals.code')"
                     clearable
                 />
             </VnRow>
@@ -42,8 +42,8 @@ const { t } = useI18n();
                 />
                 <VnInput
                     v-model="data.notificationEmail"
-                    :label="t('department.email')"
-                    :rules="validate('department.email')"
+                    :label="t('globals.params.email')"
+                    :rules="validate('globals.params.email')"
                     clearable
                 />
             </VnRow>
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
index ecbb39ed0..623eab94a 100644
--- a/src/pages/Department/Card/DepartmentSummary.vue
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -45,16 +45,8 @@ onMounted(async () => {
                 />
                 <div class="full-width row wrap justify-between content-between">
                     <div class="column" style="min-width: 50%">
-                        <VnLv
-                            :label="t('department.name')"
-                            :value="department.name"
-                            dash
-                        />
-                        <VnLv
-                            :label="t('department.code')"
-                            :value="department.code"
-                            dash
-                        />
+                        <VnLv :label="t('globals.name')" :value="department.name" dash />
+                        <VnLv :label="t('globals.code')" :value="department.code" dash />
                         <VnLv
                             :label="t('department.chat')"
                             :value="department.chatName"
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 07f4426ba..147287837 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -52,7 +52,7 @@ const onFilterTravelSelected = (formData, id) => {
         <template #form="{ data }">
             <VnRow>
                 <VnSelect
-                    :label="t('entry.basicData.supplier')"
+                    :label="t('globals.supplier')"
                     v-model="data.supplierFk"
                     url="Suppliers"
                     option-value="id"
@@ -107,18 +107,15 @@ const onFilterTravelSelected = (formData, id) => {
                 </VnSelectDialog>
             </VnRow>
             <VnRow>
-                <VnInput
-                    v-model="data.reference"
-                    :label="t('entry.basicData.reference')"
-                />
+                <VnInput v-model="data.reference" :label="t('globals.reference')" />
             </VnRow>
             <VnRow>
                 <VnInput
                     v-model="data.invoiceNumber"
-                    :label="t('entry.basicData.invoiceNumber')"
+                    :label="t('entry.summary.invoiceNumber')"
                 />
                 <VnSelect
-                    :label="t('entry.basicData.company')"
+                    :label="t('globals.company')"
                     v-model="data.companyFk"
                     :options="companiesOptions"
                     option-value="id"
@@ -130,14 +127,14 @@ const onFilterTravelSelected = (formData, id) => {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('entry.basicData.currency')"
+                    :label="t('entry.summary.currency')"
                     v-model="data.currencyFk"
                     :options="currenciesOptions"
                     option-value="id"
                     option-label="code"
                 />
                 <QInput
-                    :label="t('entry.basicData.commission')"
+                    :label="t('entry.summary.commission')"
                     v-model="data.commission"
                     type="number"
                     autofocus
@@ -155,17 +152,11 @@ const onFilterTravelSelected = (formData, id) => {
                 />
             </VnRow>
             <VnRow>
-                <QCheckbox
-                    v-model="data.isOrdered"
-                    :label="t('entry.basicData.ordered')"
-                />
-                <QCheckbox
-                    v-model="data.isConfirmed"
-                    :label="t('entry.basicData.confirmed')"
-                />
+                <QCheckbox v-model="data.isOrdered" :label="t('entry.summary.ordered')" />
+                <QCheckbox v-model="data.isConfirmed" :label="t('globals.confirmed')" />
                 <QCheckbox
                     v-model="data.isExcludedFromAvailable"
-                    :label="t('entry.basicData.excludedFromAvailable')"
+                    :label="t('entry.summary.excludedFromAvailable')"
                 />
                 <QCheckbox
                     v-if="isAdministrative()"
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index ff89faada..98ce884cf 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -5,7 +5,6 @@ import { useI18n } from 'vue-i18n';
 import { QBtn } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
@@ -157,13 +156,13 @@ const tableColumnComponents = computed(() => ({
 const entriesTableColumns = computed(() => {
     return [
         {
-            label: t('entry.summary.item'),
+            label: t('globals.item'),
             field: 'itemFk',
             name: 'item',
             align: 'left',
         },
         {
-            label: t('entry.summary.quantity'),
+            label: t('globals.quantity'),
             field: 'quantity',
             name: 'quantity',
             align: 'left',
@@ -187,7 +186,7 @@ const entriesTableColumns = computed(() => {
             align: 'left',
         },
         {
-            label: t('entry.summary.weight'),
+            label: t('globals.weight'),
             field: 'weight',
             name: 'weight',
             align: 'left',
@@ -212,13 +211,13 @@ const entriesTableColumns = computed(() => {
             format: (value) => toCurrency(value),
         },
         {
-            label: t('entry.buys.groupingPrice'),
+            label: t('item.fixedPrice.groupingPrice'),
             field: 'price2',
             name: 'price2',
             align: 'left',
         },
         {
-            label: t('entry.buys.packingPrice'),
+            label: t('item.fixedPrice.packingPrice'),
             field: 'price3',
             name: 'price3',
             align: 'left',
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 8431e1096..c03b7756f 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -35,7 +35,7 @@ const packagingsOptions = ref([]);
 
 const columns = computed(() => [
     {
-        label: t('entry.buys.item'),
+        label: t('globals.item'),
         name: 'item',
         field: 'itemFk',
         options: lastItemBuysOptions.value,
@@ -56,19 +56,19 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('entry.buys.packing'),
+        label: t('entry.summary.packing'),
         name: 'packing',
         field: 'packing',
         align: 'left',
     },
     {
-        label: t('entry.buys.grouping'),
+        label: t('entry.summary.grouping'),
         name: 'grouping',
         field: 'grouping',
         align: 'left',
     },
     {
-        label: t('entry.buys.buyingValue'),
+        label: t('entry.summary.buyingValue'),
         name: 'buyingValue',
         field: 'buyingValue',
         align: 'left',
@@ -200,7 +200,7 @@ const redirectToBuysView = () => {
             <VnRow>
                 <QFile
                     ref="inputFileRef"
-                    :label="t('entry.buys.file')"
+                    :label="t('globals.file')"
                     v-model="importData.file"
                     :multiple="false"
                     accept=".json"
@@ -220,10 +220,7 @@ const redirectToBuysView = () => {
             </VnRow>
             <div v-if="importData.file">
                 <VnRow>
-                    <VnInput
-                        :label="t('entry.buys.reference')"
-                        v-model="importData.ref"
-                    />
+                    <VnInput :label="t('globals.reference')" v-model="importData.ref" />
                 </VnRow>
                 <VnRow>
                     <VnInput
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 794f791ae..188e66358 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -73,14 +73,11 @@ const showEntryReport = () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv
-                :label="t('entry.descriptor.agency')"
-                :value="entity.travel?.agency?.name"
-            />
+            <VnLv :label="t('globals.agency')" :value="entity.travel?.agency?.name" />
             <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
             <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
             <VnLv
-                :label="t('entry.descriptor.warehouseOut')"
+                :label="t('globals.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"
             />
         </template>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 62e13551a..d88f19417 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -84,7 +84,7 @@ const tableColumnComponents = {
 const entriesTableColumns = computed(() => {
     return [
         {
-            label: t('entry.summary.quantity'),
+            label: t('globals.quantity'),
             field: 'quantity',
             name: 'quantity',
             align: 'left',
@@ -102,7 +102,7 @@ const entriesTableColumns = computed(() => {
             align: 'left',
         },
         {
-            label: t('entry.summary.weight'),
+            label: t('globals.weight'),
             field: 'weight',
             name: 'weight',
             align: 'left',
@@ -188,8 +188,8 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.currency')"
                     :value="entry.currency?.name"
                 />
-                <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
-                <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
+                <VnLv :label="t('globals.company')" :value="entry.company.code" />
+                <VnLv :label="t('globals.reference')" :value="entry.reference" />
                 <VnLv
                     :label="t('entry.summary.invoiceNumber')"
                     :value="entry.invoiceNumber"
@@ -217,7 +217,7 @@ const fetchEntryBuys = async () => {
                 />
                 <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
                 <VnLv
-                    :label="t('entry.summary.travelWarehouseOut')"
+                    :label="t('globals.warehouseOut')"
                     :value="entry.travel.warehouseOut?.name"
                 />
                 <QCheckbox
@@ -227,7 +227,7 @@ const fetchEntryBuys = async () => {
                 />
                 <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
-                    :label="t('entry.summary.travelWarehouseIn')"
+                    :label="t('globals.warehouseIn')"
                     :value="entry.travel.warehouseIn?.name"
                 />
                 <QCheckbox
@@ -250,7 +250,7 @@ const fetchEntryBuys = async () => {
                     :disable="true"
                 />
                 <QCheckbox
-                    :label="t('entry.summary.confirmed')"
+                    :label="t('globals.confirmed')"
                     v-model="entry.isConfirmed"
                     :disable="true"
                 />
diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 23a6a0021..c885c2485 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -35,7 +35,7 @@ const entriesTableColumns = computed(() => [
     {
         align: 'left',
         name: 'item',
-        label: t('entry.summary.item'),
+        label: t('globals.item'),
         field: (row) => row.item.name,
     },
     {
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 119808176..9f15130c0 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -40,7 +40,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.packing'),
+        label: t('entry.summary.packing'),
         name: 'packing',
         columnFilter: {
             component: 'number',
@@ -49,7 +49,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.grouping'),
+        label: t('entry.summary.grouping'),
         name: 'grouping',
         columnFilter: {
             component: 'number',
@@ -58,7 +58,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.quantity'),
+        label: t('globals.quantity'),
         name: 'quantity',
         columnFilter: {
             component: 'number',
@@ -67,12 +67,12 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.description'),
+        label: t('globals.description'),
         name: 'description',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.size'),
+        label: t('globals.size'),
         name: 'size',
         columnFilter: {
             component: 'number',
@@ -81,27 +81,27 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.tags'),
+        label: t('globals.tags'),
         name: 'tags',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.type'),
+        label: t('globals.type'),
         name: 'type',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.intrastat'),
+        label: t('globals.intrastat'),
         name: 'intrastat',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.origin'),
+        label: t('globals.origin'),
         name: 'origin',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
+        label: t('globals.weightByPiece'),
         name: 'weightByPiece',
         columnFilter: {
             component: 'number',
@@ -129,7 +129,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.buyingValue'),
+        label: t('entry.summary.buyingValue'),
         name: 'buyingValue',
         columnFilter: {
             component: 'number',
@@ -156,7 +156,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
+        label: t('entry.buys.packageValue'),
         name: 'packageValue',
         columnFilter: {
             component: 'number',
@@ -202,7 +202,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.weight'),
+        label: t('globals.weight'),
         name: 'weight',
         columnFilter: {
             component: 'number',
@@ -211,7 +211,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.packagingFk'),
+        label: t('entry.buys.packagingFk'),
         name: 'packagingFk',
         columnFilter: {
             component: 'number',
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index a9c25af43..3487f86c0 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -47,14 +47,14 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('entry.list.tableVisibleColumns.id'),
+        label: t('globals.id'),
         name: 'id',
         isTitle: true,
         cardVisible: true,
     },
     {
         align: 'left',
-        label: t('entry.list.tableVisibleColumns.reference'),
+        label: t('globals.reference'),
         name: 'reference',
         isTitle: true,
         component: 'input',
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 7ae6901d3..3f0cd2d99 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -99,7 +99,7 @@ const travelDialogRef = ref(false);
 const tableRef = ref();
 const travel = ref(null);
 const userParams = ref({
-    dated: Date.vnNew(),
+    dated: Date.vnNew().toJSON(),
 });
 
 const filter = ref({
@@ -219,6 +219,7 @@ function round(value) {
                 data-key="StockBoughts"
                 url="StockBoughts/getStockBought"
                 save-url="StockBoughts/crud"
+                search-url="StockBoughts"
                 order="reserve DESC"
                 :right-search="false"
                 :is-editable="true"
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 0fd775ee6..812171825 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -18,7 +18,7 @@ const $props = defineProps({
         required: true,
     },
 });
-const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&dated=${$props.dated}`;
 const columns = [
     {
         align: 'left',
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
index 7694cfe6c..e59332064 100644
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -27,7 +27,7 @@ onMounted(async () => {
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
-        search-url="table"
+        search-url="StockBoughts"
         @set-user-params="setUserParams"
     >
         <template #tags="{ tag, formatFn }">
@@ -36,12 +36,19 @@ onMounted(async () => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
                         id="date"
                         v-model="params.dated"
+                        @update:model-value="
+                            (value) => {
+                                params.dated = value;
+                                setUserParams(params);
+                                searchFn();
+                            }
+                        "
                         :label="t('Date')"
                         is-outlined
                     />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 9bc4856a8..92f3fffca 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -355,10 +355,10 @@ const createInvoiceInCorrection = async () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('invoiceIn.card.issued')" :value="toDate(entity.issued)" />
+            <VnLv :label="t('invoiceIn.list.issued')" :value="toDate(entity.issued)" />
             <VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />
-            <VnLv :label="t('invoiceIn.card.amount')" :value="toCurrency(totalAmount)" />
-            <VnLv :label="t('invoiceIn.summary.supplier')">
+            <VnLv :label="t('invoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
+            <VnLv :label="t('invoiceIn.list.supplier')">
                 <template #value>
                     <span class="link">
                         {{ entity?.supplier?.nickname }}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 801a04342..08fc11f69 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -95,7 +95,7 @@ const dueDayColumns = ref([
     },
     {
         name: 'amount',
-        label: 'invoiceIn.summary.amount',
+        label: 'invoiceIn.list.amount',
         field: (row) => row.amount,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -123,7 +123,7 @@ const intrastatColumns = ref([
     },
     {
         name: 'amount',
-        label: 'invoiceIn.summary.amount',
+        label: 'invoiceIn.list.amount',
         field: (row) => toCurrency(row.amount),
         sortable: true,
         align: 'left',
@@ -210,7 +210,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('invoiceIn.summary.supplier')"
+                    :label="t('invoiceIn.list.supplier')"
                     :value="entity.supplier?.name"
                 >
                     <template #value>
@@ -221,7 +221,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('invoiceIn.summary.supplierRef')"
+                    :label="t('invoiceIn.list.supplierRef')"
                     :value="entity.supplierRef"
                 />
                 <VnLv
@@ -271,7 +271,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :value="entity.expenseDeductible?.name"
                 />
                 <VnLv
-                    :label="t('invoiceIn.summary.company')"
+                    :label="t('invoiceIn.card.company')"
                     :value="entity.company?.code"
                 />
                 <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
diff --git a/src/pages/InvoiceIn/InvoiceInCreate.vue b/src/pages/InvoiceIn/InvoiceInCreate.vue
index e6863beb1..c809e032b 100644
--- a/src/pages/InvoiceIn/InvoiceInCreate.vue
+++ b/src/pages/InvoiceIn/InvoiceInCreate.vue
@@ -83,7 +83,7 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         </template>
                     </VnSelect>
                     <VnInput
-                        :label="t('invoiceIn.summary.supplierRef')"
+                        :label="t('invoiceIn.list.supplierRef')"
                         v-model="data.supplierRef"
                     />
                 </VnRow>
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 265f95b0e..8d658bee3 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -50,7 +50,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'serial',
-        label: t('invoiceIn.list.serial'),
+        label: t('invoiceIn.serial'),
     },
     {
         align: 'left',
@@ -122,7 +122,7 @@ const cols = computed(() => [
         :columns="cols"
         :right-search="false"
         :disable-option="{ card: true }"
-        :auto-load="!!$route.query.params"
+        :auto-load="!!$route.query.table"
     >
         <template #column-supplierFk="{ row }">
             <span class="link" @click.stop>
@@ -151,7 +151,7 @@ const cols = computed(() => [
                 </template>
             </VnSelect>
             <VnInput
-                :label="t('invoiceIn.summary.supplierRef')"
+                :label="t('invoiceIn.list.supplierRef')"
                 v-model="data.supplierRef"
             />
             <VnSelect
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index b09340c81..b39511f29 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -5,14 +5,11 @@ invoiceIn:
         ref: Reference
         supplier: Supplier
         supplierRef: Supplier ref.
-        serial: Serial
         file: File
         issued: Issued
         awb: AWB
         amount: Amount
     card:
-        issued: Issued
-        amount: Amount
         client: Client
         company: Company
         customerCard: Customer card
@@ -21,8 +18,6 @@ invoiceIn:
         dueDay: Due day
         intrastat: Intrastat
     summary:
-        supplier: Supplier
-        supplierRef: Supplier ref.
         currency: Currency
         issued: Expedition date
         operated: Operation date
@@ -30,7 +25,6 @@ invoiceIn:
         bookedDate: Booked date
         sage: Sage withholding
         vat: Undeductible VAT
-        company: Company
         expense: Expense
         taxableBase: Taxable base
         rate: Rate
@@ -38,7 +32,6 @@ invoiceIn:
         sageTransaction: Sage transaction
         dueDay: Date
         bank: Bank
-        amount: Amount
         foreignValue: Foreign value
         dueTotal: Due day
         noMatch: Do not match
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 31d41fc97..5f483dd08 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -11,8 +11,6 @@ invoiceIn:
         awb: AWB
         amount: Importe
     card:
-        issued: Fecha emisión
-        amount: Importe
         client: Cliente
         company: Empresa
         customerCard: Ficha del cliente
@@ -20,8 +18,6 @@ invoiceIn:
         vat: Iva
         dueDay: Fecha de vencimiento
     summary:
-        supplier: Proveedor
-        supplierRef: Ref. proveedor
         currency: Divisa
         docNumber: Número documento
         issued: Fecha de expedición
@@ -30,14 +26,12 @@ invoiceIn:
         bookedDate: Fecha contable
         sage: Retención sage
         vat: Iva no deducible
-        company: Empresa
         expense: Gasto
         taxableBase: Base imp.
         rate: Tasa
         sageTransaction: Sage transación
         dueDay: Fecha
         bank: Caja
-        amount: Importe
         foreignValue: Divisa
         dueTotal: Vencimiento
         code: Código
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index 5e4be407e..2b60948dd 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -69,7 +69,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         <template #body="{ entity }">
             <VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
             <VnLv :label="t('globals.amount')" :value="toCurrency(entity.amount)" />
-            <VnLv v-if="entity.client" :label="t('invoiceOut.card.client')">
+            <VnLv v-if="entity.client" :label="t('globals.client')">
                 <template #value>
                     <span class="link">
                         {{ entity.client.name }}
@@ -79,7 +79,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
             </VnLv>
             <VnLv
                 v-if="entity.company"
-                :label="t('invoiceOut.card.company')"
+                :label="t('globals.company')"
                 :value="entity.company.code"
             />
         </template>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index ca8fb075c..81b3e7c41 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -42,7 +42,7 @@ function fetch() {
 const taxColumns = ref([
     {
         name: 'item',
-        label: 'invoiceOut.summary.type',
+        label: 'globals.type',
         field: (row) => row.name,
         sortable: true,
     },
@@ -72,21 +72,21 @@ const taxColumns = ref([
 const ticketsColumns = ref([
     {
         name: 'item',
-        label: t('invoiceOut.summary.ticketId'),
+        label: t('globals.ticketId'),
         field: (row) => row.id,
         sortable: true,
         align: 'left',
     },
     {
         name: 'nickname',
-        label: t('invoiceOut.summary.nickname'),
+        label: t('globals.alias'),
         field: (row) => row.nickname,
         sortable: true,
         align: 'left',
     },
     {
         name: 'landed',
-        label: t('invoiceOut.summary.shipped'),
+        label: t('globals.shipped'),
         field: (row) => row.shipped,
         format: (value) => toDate(value),
         sortable: true,
@@ -124,18 +124,12 @@ const ticketsColumns = ref([
                     :label="t('invoiceOut.summary.dued')"
                     :value="toDate(invoiceOut.dued)"
                 />
-                <VnLv
-                    :label="t('invoiceOut.summary.created')"
-                    :value="toDate(invoiceOut.created)"
-                />
+                <VnLv :label="t('globals.created')" :value="toDate(invoiceOut.created)" />
                 <VnLv
                     :label="t('invoiceOut.summary.booked')"
                     :value="toDate(invoiceOut.booked)"
                 />
-                <VnLv
-                    :label="t('invoiceOut.summary.company')"
-                    :value="invoiceOut.company.code"
-                />
+                <VnLv :label="t('globals.company')" :value="invoiceOut.company.code" />
             </QCard>
             <QCard class="vn-three">
                 <VnTitle :text="t('invoiceOut.summary.taxBreakdown')" />
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index 5f2eb3c02..7f6bf41d3 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -59,7 +59,7 @@ const columns = computed(() => [
         field: 'clientId',
     },
     {
-        label: t('invoiceOut.globalInvoices.table.client'),
+        label: t('globals.client'),
         field: 'clientName',
         name: 'clientName',
         align: 'left',
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index e85f1f44c..3fd3104bf 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -183,7 +183,7 @@ onMounted(async () => {
 <i18n>
 en:
     invoiceDate: Invoice date
-    maxShipped: Max date
+    maxShipped: Max date ticket
     allClients: All clients
     oneClient: One client
     company: Company
@@ -195,7 +195,7 @@ en:
 
 es:
     invoiceDate: Fecha de factura
-    maxShipped: Fecha límite
+    maxShipped: Fecha límite ticket
     allClients: Todos los clientes
     oneClient: Un solo cliente
     company: Empresa
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 91477e1a4..9facb35dc 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -6,15 +6,19 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { usePrintService } from 'composables/usePrintService';
-import VnTable from 'components/VnTable/VnTable.vue';
+import { usePrintService } from 'src/composables/usePrintService';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import axios from 'axios';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import VnRadio from 'src/components/common/VnRadio.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -26,99 +30,86 @@ const selectedRows = ref([]);
 const hasSelectedCards = computed(() => selectedRows.value.length > 0);
 const MODEL = 'InvoiceOuts';
 const { openReport } = usePrintService();
+const addressOptions = ref([]);
+const selectedOption = ref('ticket');
+async function fetchClientAddress(id) {
+    const { data } = await axios.get(
+        `Clients/${id}/addresses?filter[order]=isActive DESC`
+    );
+    addressOptions.value = data;
+}
+
+const exprBuilder = (_, value) => {
+    return {
+        or: [{ code: value }, { description: { like: `%${value}%` } }],
+    };
+};
 
 const columns = computed(() => [
     {
         align: 'center',
         name: 'id',
         label: t('invoiceOutList.tableVisibleColumns.id'),
-        chip: {
-            condition: () => true,
-        },
+        chip: { condition: () => true },
         isId: true,
-        columnFilter: {
-            name: 'search',
-        },
+        columnFilter: { name: 'search' },
     },
     {
         align: 'left',
         name: 'ref',
-        label: t('invoiceOutList.tableVisibleColumns.ref'),
+        label: t('globals.reference'),
         isTitle: true,
         component: 'select',
-        attrs: {
-            url: MODEL,
-            optionLabel: 'ref',
-            optionValue: 'id',
-        },
-        columnField: {
-            component: null,
-        },
+        attrs: { url: MODEL, optionLabel: 'ref', optionValue: 'id' },
+        columnField: { component: null },
     },
     {
         align: 'left',
-        name: 'Issued',
-        label: t('invoiceOutList.tableVisibleColumns.issued'),
+        name: 'issued',
+        label: t('invoiceOut.summary.issued'),
         component: 'date',
         format: (row) => toDate(row.issued),
-        columnField: {
-            component: null,
-        },
+        columnField: { component: null },
     },
     {
         align: 'left',
         name: 'clientFk',
-        label: t('invoiceOutModule.customer'),
+        label: t('globals.client'),
         cardVisible: true,
         component: 'select',
-        attrs: {
-            url: 'Clients',
-            fields: ['id', 'name'],
-        },
-        columnField: {
-            component: null,
-        },
+        attrs: { url: 'Clients', fields: ['id', 'name'] },
+        columnField: { component: null },
     },
     {
         align: 'left',
         name: 'companyCode',
-        label: t('invoiceOutModule.company'),
+        label: t('globals.company'),
         cardVisible: true,
         component: 'select',
-        attrs: {
-            url: 'Companies',
-            optionLabel: 'code',
-            optionValue: 'id',
-        },
-        columnField: {
-            component: null,
-        },
+        attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' },
+        columnField: { component: null },
     },
     {
         align: 'left',
         name: 'amount',
-        label: t('invoiceOutModule.amount'),
+        label: t('globals.amount'),
         cardVisible: true,
         format: (row) => toCurrency(row.amount),
     },
     {
         align: 'left',
         name: 'created',
-        label: t('invoiceOutList.tableVisibleColumns.created'),
+        label: t('globals.created'),
         component: 'date',
-        columnField: {
-            component: null,
-        },
+        columnField: { component: null },
         format: (row) => toDate(row.created),
     },
     {
         align: 'left',
         name: 'dued',
-        label: t('invoiceOutList.tableVisibleColumns.dueDate'),
+        label: t('invoiceOut.summary.dued'),
         component: 'date',
-        columnField: {
-            component: null,
-        },
+        columnField: { component: null },
         format: (row) => toDate(row.dued),
     },
     {
@@ -128,11 +119,12 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, InvoiceOutSummary),
             },
             {
-                title: t('DownloadPdf'),
-                icon: 'vn:ticket',
+                title: t('globals.downloadPdf'),
+                icon: 'cloud_download',
                 isPrimary: true,
                 action: (row) => openPdf(row.id),
             },
@@ -181,12 +173,12 @@ watchEffect(selectedRows);
 <template>
     <VnSearchbar
         :info="t('youCanSearchByInvoiceReference')"
-        :label="t('searchInvoice')"
-        data-key="invoiceOut"
+        :label="t('Search invoice')"
+        data-key="invoiceOutList"
     />
     <RightMenu>
         <template #right-panel>
-            <InvoiceOutFilter data-key="invoiceOut" />
+            <InvoiceOutFilter data-key="invoiceOutList" />
         </template>
     </RightMenu>
     <VnSubToolbar>
@@ -197,21 +189,19 @@ watchEffect(selectedRows);
                 @click="downloadPdf()"
                 :disable="!hasSelectedCards"
             >
-                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+                <QTooltip>{{ t('downloadPdf') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
     <VnTable
         ref="tableRef"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
         :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
-            title: t('Create manual invoice'),
+            title: t('createManualInvoice'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {
-                active: true,
-            },
+            formInitialData: { active: true },
         }"
         :right-search="false"
         v-model:selected="selectedRows"
@@ -231,74 +221,203 @@ watchEffect(selectedRows);
             </span>
         </template>
         <template #more-create-dialog="{ data }">
-            <div class="flex no-wrap flex-center">
-                <VnSelect
-                    url="Tickets"
-                    v-model="data.ticketFk"
-                    :label="t('invoiceOutList.tableVisibleColumns.ticket')"
-                    option-label="id"
-                    option-value="id"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <span class="q-ml-md">O</span>
+            <div class="row q-col-gutter-xs">
+                <div class="col-12">
+                    <div class="q-col-gutter-xs">
+                        <VnRow fixed>
+                            <VnRadio
+                                v-model="selectedOption"
+                                val="ticket"
+                                :label="t('globals.ticket')"
+                                class="q-my-none q-mr-md"
+                            />
+
+                            <VnInput
+                                v-show="selectedOption === 'ticket'"
+                                v-model="data.ticketFk"
+                                :label="t('globals.ticket')"
+                                style="flex: 1"
+                            />
+
+                            <div
+                                class="row q-col-gutter-xs q-ml-none"
+                                v-show="selectedOption !== 'ticket'"
+                            >
+                                <div class="col">
+                                    <VnSelect
+                                        v-model="data.clientFk"
+                                        :label="t('globals.client')"
+                                        url="Clients"
+                                        :options="customerOptions"
+                                        option-label="name"
+                                        option-value="id"
+                                        @update:model-value="fetchClientAddress"
+                                    >
+                                        <template #option="scope">
+                                            <QItem
+                                                v-bind="scope.itemProps"
+                                                @click="selectedClient(scope.opt)"
+                                            >
+                                                <QItemSection>
+                                                    <QItemLabel>
+                                                        #{{ scope.opt?.id }} -
+                                                        {{ scope.opt?.name }}
+                                                    </QItemLabel>
+                                                </QItemSection>
+                                            </QItem>
+                                        </template>
+                                    </VnSelect>
+                                </div>
+                                <div class="col">
+                                    <VnSelect
+                                        v-model="data.addressFk"
+                                        :label="t('ticket.summary.consignee')"
+                                        :options="addressOptions"
+                                        option-label="nickname"
+                                        option-value="id"
+                                        v-if="
+                                            data.clientFk &&
+                                            selectedOption === 'consignatario'
+                                        "
+                                    >
+                                        <template #option="scope">
+                                            <QItem v-bind="scope.itemProps">
+                                                <QItemSection>
+                                                    <QItemLabel
+                                                        :class="{
+                                                            'color-vn-label':
+                                                                !scope.opt?.isActive,
+                                                        }"
+                                                    >
+                                                        {{
+                                                            `${
+                                                                !scope.opt?.isActive
+                                                                    ? t('inactive')
+                                                                    : ''
+                                                            } `
+                                                        }}
+                                                        <span>
+                                                            {{
+                                                                scope.opt?.nickname
+                                                            }}</span
+                                                        >
+                                                        <span
+                                                            v-if="
+                                                                scope.opt?.province ||
+                                                                scope.opt?.city ||
+                                                                scope.opt?.street
+                                                            "
+                                                            >, {{ scope.opt?.street }},
+                                                            {{ scope.opt?.city }},
+                                                            {{
+                                                                scope.opt?.province?.name
+                                                            }}
+                                                            -
+                                                            {{
+                                                                scope.opt?.agencyMode
+                                                                    ?.name
+                                                            }}</span
+                                                        >
+                                                    </QItemLabel>
+                                                </QItemSection>
+                                            </QItem>
+                                        </template>
+                                    </VnSelect>
+                                </div>
+                            </div>
+                        </VnRow>
+                        <VnRow fixed>
+                            <VnRadio
+                                v-model="selectedOption"
+                                val="cliente"
+                                :label="t('globals.client')"
+                                class="q-my-none q-mr-md"
+                            />
+                        </VnRow>
+                        <VnRow fixed>
+                            <VnRadio
+                                v-model="selectedOption"
+                                val="consignatario"
+                                :label="t('ticket.summary.consignee')"
+                                class="q-my-none q-mr-md"
+                            />
+                        </VnRow>
+                    </div>
+                </div>
+                <div class="full-width">
+                    <VnRow class="row q-col-gutter-xs">
+                        <VnSelect
+                            url="InvoiceOutSerials"
+                            v-model="data.serial"
+                            :label="t('invoiceIn.serial')"
+                            :options="invoiceOutSerialsOptions"
+                            option-label="description"
+                            option-value="code"
+                            option-filter
+                            :expr-builder="exprBuilder"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{ scope.opt?.code }} -
+                                            {{ scope.opt?.description }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                        <VnInputDate
+                            :label="t('invoiceOut.summary.dued')"
+                            v-model="data.maxShipped"
+                        />
+                    </VnRow>
+                    <VnRow class="row q-col-gutter-xs">
+                        <VnSelect
+                            url="TaxAreas"
+                            v-model="data.taxArea"
+                            :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
+                            :options="taxAreasOptions"
+                            option-label="code"
+                            option-value="code"
+                        />
+                        <VnInput
+                            v-model="data.reference"
+                            :label="t('globals.reference')"
+                        />
+                    </VnRow>
+                </div>
             </div>
-            <VnSelect
-                url="Clients"
-                v-model="data.clientFk"
-                :label="t('invoiceOutModule.customer')"
-                :options="customerOptions"
-                option-label="name"
-                option-value="id"
-            />
-            <VnSelect
-                url="InvoiceOutSerials"
-                v-model="data.serial"
-                :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
-                :options="invoiceOutSerialsOptions"
-                option-label="description"
-                option-value="code"
-            />
-            <VnInputDate
-                :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
-                v-model="data.maxShipped"
-            />
-            <VnSelect
-                url="TaxAreas"
-                v-model="data.taxArea"
-                :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
-                :options="taxAreasOptions"
-                option-label="code"
-                option-value="code"
-            />
-            <QInput
-                v-model="data.reference"
-                :label="t('invoiceOutList.tableVisibleColumns.ref')"
-            />
         </template>
     </VnTable>
 </template>
 
+<style lang="scss" scoped>
+#formModel .vn-row {
+    min-height: 45px;
+
+    .q-radio {
+        align-self: flex-end;
+        flex: 0.3;
+    }
+
+    > .q-input,
+    > .q-select {
+        flex: 0.75;
+    }
+}
+</style>
+
 <i18n>
-en:
-    searchInvoice: Search issued invoice
-    fileDenied: Browser denied file download...
-    fileAllowed: Successful download of CSV file
-    youCanSearchByInvoiceReference: You can search by invoice reference
-    createInvoice: Make invoice
-    Create manual invoice: Create manual invoice
-es:
-    searchInvoice: Buscar factura emitida
-    fileDenied: El navegador denegó la descarga de archivos...
-    fileAllowed: Descarga exitosa de archivo CSV
-    youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    createInvoice: Crear factura
-    Create manual invoice: Crear factura manual
+    en:
+        invoiceId: Invoice ID
+        youCanSearchByInvoiceReference: You can search by invoice reference
+        createManualInvoice: Create Manual Invoice
+        inactive: (Inactive)
+
+    es:
+        invoiceId: ID de factura
+        youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
+        createManualInvoice: Crear factura manual
+        inactive: (Inactivo)
 </i18n>
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 94eab2aab..8c8c01e9c 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -33,7 +33,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInputDate
                         v-model="params.from"
-                        :label="t('invoiceOut.negativeBases.from')"
+                        :label="t('globals.from')"
                         is-outlined
                     />
                 </QItemSection>
@@ -42,7 +42,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInputDate
                         v-model="params.to"
-                        :label="t('invoiceOut.negativeBases.to')"
+                        :label="t('globals.to')"
                         is-outlined
                     />
                 </QItemSection>
@@ -51,7 +51,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInput
                         v-model="params.company"
-                        :label="t('invoiceOut.negativeBases.company')"
+                        :label="t('globals.company')"
                         is-outlined
                     />
                 </QItemSection>
@@ -60,7 +60,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInput
                         v-model="params.country"
-                        :label="t('invoiceOut.negativeBases.country')"
+                        :label="t('globals.country')"
                         is-outlined
                     />
                 </QItemSection>
@@ -79,7 +79,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInput
                         v-model="params.clientSocialName"
-                        :label="t('invoiceOut.negativeBases.client')"
+                        :label="t('globals.client')"
                         is-outlined
                     />
                 </QItemSection>
@@ -88,7 +88,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInputNumber
                         v-model="params.amount"
-                        :label="t('invoiceOut.negativeBases.amount')"
+                        :label="t('globals.amount')"
                         is-outlined
                     />
                 </QItemSection>
diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml
index 5ad92ed09..8cefe8bdc 100644
--- a/src/pages/InvoiceOut/locale/en.yml
+++ b/src/pages/InvoiceOut/locale/en.yml
@@ -2,6 +2,7 @@ invoiceOutModule:
     customer: Client
     amount: Amount
     company: Company
+    address: Address
 invoiceOutList:
     tableVisibleColumns:
         id: ID
@@ -15,11 +16,11 @@ invoiceOutList:
 DownloadPdf: Download PDF
 InvoiceOutSummary: Summary
 negativeBases:
-        country: Country
-        clientId: Client ID
-        base: Base
-        ticketId: Ticket
-        active: Active
-        hasToInvoice: Has to invoice
-        verifiedData: Verified data
-        commercial: Commercial
\ No newline at end of file
+    country: Country
+    clientId: Client ID
+    base: Base
+    ticketId: Ticket
+    active: Active
+    hasToInvoice: Has to invoice
+    verifiedData: Verified data
+    commercial: Commercial
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index a05125630..bf5126641 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -4,14 +4,12 @@ invoiceOutModule:
     customer: Cliente
     amount: Importe
     company: Empresa
+    address: Consignatario
 invoiceOutList:
     tableVisibleColumns:
         id: ID
         ref: Referencia
         issued: Fecha emisión
-        customer: Cliente
-        company: Empresa
-        amount: Importe
         created: F. creación
         dueDate: F. máxima
         invoiceOutSerial: Serial
@@ -20,12 +18,12 @@ invoiceOutList:
 DownloadPdf: Descargar PDF
 InvoiceOutSummary: Resumen
 negativeBases:
-        country: País
-        clientId: ID del cliente
-        client: Cliente
-        base: Base
-        ticketId: Ticket
-        active: Activo
-        hasToInvoice: Debe facturar
-        verifiedData: Datos verificados
-        commercial: Comercial
\ No newline at end of file
+    country: País
+    clientId: ID del cliente
+    client: Cliente
+    base: Base
+    ticketId: Ticket
+    active: Activo
+    hasToInvoice: Debe facturar
+    verifiedData: Datos verificados
+    commercial: Comercial
diff --git a/src/pages/Item/Card/CreateIntrastatForm.vue b/src/pages/Item/Card/CreateIntrastatForm.vue
index 5fe254759..443615d7e 100644
--- a/src/pages/Item/Card/CreateIntrastatForm.vue
+++ b/src/pages/Item/Card/CreateIntrastatForm.vue
@@ -42,7 +42,7 @@ onMounted(async () => {
                     :required="true"
                 />
                 <VnInput
-                    :label="t('createIntrastatForm.description')"
+                    :label="t('itemBasicData.description')"
                     v-model="data.description"
                     :required="true"
                 />
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 243d4c7cb..c51b320b5 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -140,10 +140,7 @@ const openRegularizeStockForm = () => {
                     </span>
                 </template>
             </VnLv>
-            <VnLv
-                :label="t('item.descriptor.producer')"
-                :value="dashIfEmpty(entity.subName)"
-            />
+            <VnLv :label="t('globals.producer')" :value="dashIfEmpty(entity.subName)" />
             <VnLv
                 v-if="entity.value5"
                 :label="t('item.descriptor.color')"
@@ -157,7 +154,7 @@ const openRegularizeStockForm = () => {
             />
             <VnLv
                 v-if="entity.value7"
-                :label="t('item.descriptor.stems')"
+                :label="t('item.list.stems')"
                 :value="entity.value7"
             />
         </template>
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index 3cd51758b..735e5eb4f 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -75,7 +75,7 @@ const handlePhotoUpdated = (evt = false) => {
                             <QIcon name="vn:item" />
                         </div>
                         <div class="text-grey-5" style="opacity: 0.4">
-                            {{ t('item.descriptor.item') }}
+                            {{ t('globals.item') }}
                         </div>
                     </div>
                 </div>
@@ -107,7 +107,7 @@ const handlePhotoUpdated = (evt = false) => {
     >
         <div class="col column items-center">
             <span class="text-uppercase color-vn-white" style="font-size: 11px">
-                {{ t('item.descriptor.visible') }}
+                {{ t('globals.visible') }}
             </span>
             <span class="text-weight-bold text-h5 color-vn-white">{{ visible }}</span>
         </div>
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 23dc6214e..a3ac6645e 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -90,7 +90,7 @@ const columns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('itemDiary.reference'),
+        label: t('itemBasicData.reference'),
         field: 'reference',
         name: 'reference',
         align: 'left',
diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index b211790ca..5c0251ea8 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -59,7 +59,7 @@ const columns = computed(() => [
         align: 'center',
     },
     {
-        label: t('lastEntries.warehouse'),
+        label: t('itemDiary.warehouse'),
         name: 'warehouse',
         field: 'warehouse',
         align: 'left',
@@ -94,7 +94,7 @@ const columns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('lastEntries.packing'),
+        label: t('shelvings.packing'),
         name: 'packing',
         align: 'center',
     },
@@ -104,7 +104,7 @@ const columns = computed(() => [
         align: 'center',
     },
     {
-        label: t('lastEntries.stems'),
+        label: t('itemBasicData.stems'),
         name: 'stems',
         field: 'stems',
         align: 'center',
@@ -188,7 +188,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     <VnSubToolbar>
         <template #st-data>
             <VnInputDate
-                :label="t('lastEntries.since')"
+                :label="t('itemDiary.since')"
                 dense
                 v-model="from"
                 class="q-mr-lg"
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 6ad09ac64..db90ba06f 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -55,13 +55,13 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
             <QCard class="vn-one">
                 <VnTitle
                     :url="getUrl(entityId, 'basic-data')"
-                    :text="t('item.summary.basicData')"
+                    :text="t('globals.summary.basicData')"
                 />
-                <VnLv :label="t('item.summary.name')" :value="item.name" />
+                <VnLv :label="t('globals.name')" :value="item.name" />
                 <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
                 <VnLv :label="t('item.summary.family')" :value="item.itemType.name" />
-                <VnLv :label="t('item.summary.size')" :value="item.size" />
-                <VnLv :label="t('item.summary.origin')" :value="item.origin.name" />
+                <VnLv :label="t('globals.size')" :value="item.size" />
+                <VnLv :label="t('globals.origin')" :value="item.origin.name" />
                 <VnLv :label="t('item.summary.stems')" :value="item.stems" />
                 <VnLv
                     :label="t('item.summary.multiplier')"
@@ -96,7 +96,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
                     :value="item.intrastat.id"
                 />
                 <VnLv
-                    :label="t('item.summary.intrastat')"
+                    :label="t('globals.intrastat')"
                     :value="item.intrastat.description"
                 />
                 <VnLv :label="t('item.summary.ref')" :value="item.comment" />
@@ -115,7 +115,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
                 />
             </QCard>
             <QCard class="vn-one">
-                <VnTitle :url="getUrl(entityId, 'tags')" :text="t('item.summary.tags')" />
+                <VnTitle :url="getUrl(entityId, 'tags')" :text="t('globals.tags')" />
                 <VnLv
                     v-for="(tag, index) in tags"
                     :key="index"
@@ -126,7 +126,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
             <QCard class="vn-one" v-if="item.description">
                 <VnTitle
                     :url="getUrl(entityId, 'basic-data')"
-                    :text="t('item.summary.description')"
+                    :text="t('globals.description')"
                 />
                 <p v-text="item.description" />
             </QCard>
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index e59085402..ed85e9ce7 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -151,7 +151,7 @@ const insertTag = (rows) => {
                                 :is-clearable="false"
                             />
                             <VnInput
-                                :label="t('itemTags.relevancy')"
+                                :label="t('itemBasicData.relevancy')"
                                 type="number"
                                 v-model="row.priority"
                                 :required="true"
diff --git a/src/pages/Item/ItemCreate.vue b/src/pages/Item/ItemCreate.vue
index 6b6234b70..d69153820 100644
--- a/src/pages/Item/ItemCreate.vue
+++ b/src/pages/Item/ItemCreate.vue
@@ -86,12 +86,9 @@ onBeforeMount(async () => {
         >
             <template #form="{ data }">
                 <VnRow>
-                    <VnInput
-                        v-model="data.provisionalName"
-                        :label="t('item.create.name')"
-                    />
+                    <VnInput v-model="data.provisionalName" :label="t('globals.name')" />
                     <VnSelect
-                        :label="t('item.create.tag')"
+                        :label="t('globals.tag')"
                         v-model="data.tag"
                         :options="tagsOptions"
                         option-value="id"
@@ -109,7 +106,7 @@ onBeforeMount(async () => {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('item.create.type')"
+                        :label="t('globals.type')"
                         v-model="data.typeFk"
                         :options="itemTypesOptions"
                         option-label="name"
@@ -133,7 +130,7 @@ onBeforeMount(async () => {
                         </template>
                     </VnSelect>
                     <VnSelect
-                        :label="t('item.create.intrastat')"
+                        :label="t('globals.intrastat')"
                         v-model="data.intrastatFk"
                         :options="intrastatsOptions"
                         option-label="description"
@@ -156,7 +153,7 @@ onBeforeMount(async () => {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('item.create.origin')"
+                        :label="t('globals.origin')"
                         v-model="data.originFk"
                         :options="originsOptions"
                         option-value="id"
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 7d4d6b896..a444d587b 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -64,8 +64,7 @@ const columns = computed(() => [
     },
     {
         label: t('globals.name'),
-        field: 'name',
-        name: 'description',
+        name: 'name',
         ...defaultColumnAttrs,
         create: true,
         cardVisible: true,
@@ -132,7 +131,7 @@ const columns = computed(() => [
     },
 
     {
-        label: t('item.fixedPrice.warehouse'),
+        label: t('globals.warehouse'),
         field: 'warehouseFk',
         name: 'warehouseFk',
         ...defaultColumnAttrs,
@@ -192,7 +191,7 @@ const editTableFieldsOptions = [
     },
     {
         field: 'warehouseFk',
-        label: t('item.fixedPrice.warehouse'),
+        label: t('globals.warehouse'),
         component: 'select',
         attrs: {
             options: [],
@@ -426,7 +425,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['description DESC']"
+            :order="['itemFk DESC', 'name DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -480,7 +479,7 @@ function handleOnDataSave({ CrudModelRef }) {
                     </template>
                 </VnSelect>
             </template>
-            <template #column-description="{ row }">
+            <template #column-name="{ row }">
                 <span class="link">
                     {{ row.name }}
                 </span>
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 84eefaed3..a8f7d0c5f 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -17,21 +17,6 @@ const props = defineProps({
 });
 
 const itemTypeWorkersOptions = ref([]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return { 'i.name': { like: `%${value}%` } };
-        case 'itemFk':
-        case 'warehouseFk':
-        case 'rate2':
-        case 'rate3':
-            param = `fp.${param}`;
-            return { [param]: value };
-        case 'minPrice':
-            param = `i.${param}`;
-            return { [param]: value };
-    }
-};
 </script>
 
 <template>
@@ -66,7 +51,7 @@ const exprBuilder = (param, value) => {
                         url="Warehouses"
                         auto-load
                         :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-                        :label="t('components.itemsFilterPanel.warehouseFk')"
+                        :label="t('globals.warehouse')"
                         v-model="params.warehouseFk"
                         option-label="name"
                         option-value="id"
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index f789d2cd0..30b4893bd 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -80,7 +80,7 @@ const columns = computed(() => [
         cardVisible: true,
     },
     {
-        label: t('item.list.grouping'),
+        label: t('entry.summary.grouping'),
         name: 'grouping',
         align: 'left',
         columnFilter: {
@@ -89,7 +89,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('item.list.packing'),
+        label: t('entry.summary.packing'),
         name: 'packing',
         align: 'left',
         columnFilter: {
@@ -118,7 +118,7 @@ const columns = computed(() => [
         cardVisible: true,
     },
     {
-        label: t('item.list.size'),
+        label: t('globals.size'),
         name: 'size',
         align: 'left',
         columnFilter: {
@@ -165,7 +165,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('item.list.intrastat'),
+        label: t('globals.intrastat'),
         name: 'intrastat',
         align: 'left',
         component: 'select',
@@ -184,7 +184,7 @@ const columns = computed(() => [
         cardVisible: true,
     },
     {
-        label: t('item.list.origin'),
+        label: t('globals.origin'),
         name: 'origin',
         align: 'left',
         component: 'select',
@@ -258,7 +258,7 @@ const columns = computed(() => [
         component: 'checkbox',
     },
     {
-        label: t('item.list.producer'),
+        label: t('globals.producer'),
         name: 'producer',
         align: 'left',
         component: 'select',
@@ -275,7 +275,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('item.list.landed'),
+        label: t('globals.landed'),
         name: 'landed',
         align: 'left',
         component: 'date',
diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 61156640e..a464a1084 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -40,7 +40,7 @@ watch(
 
 const columns = computed(() => [
     {
-        label: t('item.buyRequest.ticketId'),
+        label: t('globals.ticketId'),
         name: 'ticketFk',
         align: 'left',
         isId: true,
@@ -50,7 +50,7 @@ const columns = computed(() => [
         cardVisible: true,
     },
     {
-        label: t('item.buyRequest.shipped'),
+        label: t('globals.shipped'),
         name: 'shipped',
         align: 'left',
         component: 'date',
@@ -90,7 +90,7 @@ const columns = computed(() => [
         columnClass: 'shrink',
     },
     {
-        label: t('item.buyRequest.price'),
+        label: t('globals.price'),
         name: 'price',
         align: 'left',
         format: (row) => toCurrency(row.price),
@@ -115,7 +115,7 @@ const columns = computed(() => [
         columnClass: 'shrink',
     },
     {
-        label: t('item.buyRequest.item'),
+        label: t('globals.item'),
         name: 'item',
         align: 'left',
         component: 'input',
@@ -137,7 +137,7 @@ const columns = computed(() => [
         columnClass: 'expand',
     },
     {
-        label: t('item.buyRequest.state'),
+        label: t('globals.state'),
         name: 'state',
         format: (row) => getState(row.isOk),
         align: 'left',
diff --git a/src/pages/Item/ItemType/locale/es.yml b/src/pages/Item/ItemType/locale/es.yml
index 09ee5a1f7..93f8b0d0e 100644
--- a/src/pages/Item/ItemType/locale/es.yml
+++ b/src/pages/Item/ItemType/locale/es.yml
@@ -10,11 +10,6 @@ shared:
     fragile: Frágil
 summary:
     id: id
-    code: Código
-    name: Nombre
-    worker: Trabajador
-    category: Reino
-    temperature: Temperatura
     life: Vida
     promo: Promoción
     itemPackingType: Tipo de embalaje
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index e99853760..78a1c3ff0 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -16,7 +16,6 @@ itemDiary:
     date: Date
     origin: Origin
     state: State
-    reference: Reference
     entity: Entity
     in: In
     out: Out
@@ -48,22 +47,17 @@ itemBasicData:
 createIntrastatForm:
     title: New intrastat
     identifier: Identifier
-    description: Description
 tax:
     country: Country
     class: Class
 lastEntries:
-    since: Since
     to: To
     ig: Ig
-    warehouse: Warehouse
     landed: Landed
     entry: Entry
     pvp: PVP
     label: Label
-    packing: Packing
     grouping: Grouping
-    stems: Stems
     quantity: Quantity
     cost: Cost
     kg: Kg.
@@ -77,7 +71,6 @@ itemTags:
     addTag: Add tag
     tag: Tag
     value: Value
-    relevancy: Relevancy
 searchbar:
     label: Search item
     info: Search by item id
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 56c6ec317..5498f4458 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -16,7 +16,6 @@ itemDiary:
     date: Fecha
     origin: Origen
     state: Estado
-    reference: Referencia
     entity: Entidad
     in: Entrada
     out: Salida
@@ -48,22 +47,17 @@ itemBasicData:
 createIntrastatForm:
     title: Nuevo intrastat
     identifier: Identificador
-    description: Descripción
 tax:
     country: País
     class: Clase
 lastEntries:
-    since: Desde
     to: Hasta
     ig: Ig
-    warehouse: Almacén
     landed: F. Entrega
     entry: Entrada
     pvp: PVP
     label: Etiquetas
-    packing: Packing
     grouping: Grouping
-    stems: Tallos
     quantity: Cantidad
     cost: Coste
     kg: Kg.
@@ -77,7 +71,6 @@ itemTags:
     addTag: Añadir etiqueta
     tag: Etiqueta
     value: Valor
-    relevancy: Relevancia
 searchbar:
     label: Buscar artículo
     info: Buscar por id de artículo
diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index fac601735..326fae0ee 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -44,7 +44,7 @@ const columns = computed(() => [
         format: (row) => toDateTimeFormat(row.date_make),
     },
     {
-        label: t('salesOrdersTable.client'),
+        label: t('salesClientsTable.client'),
         name: 'clientFk',
         align: 'left',
         columnFilter: {
@@ -63,7 +63,7 @@ const columns = computed(() => [
         columnFilter: false,
     },
     {
-        label: t('salesOrdersTable.salesPerson'),
+        label: t('salesClientsTable.salesPerson'),
         name: 'salesPersonFk',
         align: 'left',
         optionFilter: 'firstName',
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index d24230c64..406bf5f29 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -77,7 +77,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('salesTicketsTable.client'),
+        label: t('salesClientsTable.client'),
         name: 'clientFk',
         align: 'left',
         field: 'nickname',
@@ -91,7 +91,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('salesTicketsTable.salesPerson'),
+        label: t('salesClientsTable.salesPerson'),
         name: 'salesPersonFk',
         field: 'userName',
         align: 'left',
@@ -108,7 +108,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('salesTicketsTable.date'),
+        label: t('salesClientsTable.date'),
         name: 'shippedDate',
         align: 'left',
         columnFilter: {
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index b8082f02a..2f839e5f5 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -13,8 +13,6 @@ salesOrdersTable:
     delete: Delete
     dateSend: Send date
     dateMake: Make date
-    client: Client
-    salesPerson: Salesperson
     deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
     agency: Agency
     import: Import
@@ -29,9 +27,6 @@ salesTicketsTable:
     componentLack: Component lack
     tooLittle: Ticket too little
     identifier: Identifier
-    client: Client
-    salesPerson: Salesperson
-    date: Date
     theoretical: Theoretical
     practical: Practical
     province: Province
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 4ee5b90a9..5b7f4f551 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -13,8 +13,6 @@ salesOrdersTable:
     delete: Eliminar
     dateSend: Fecha de envío
     dateMake: Fecha de realización
-    client: Cliente
-    salesPerson: Comercial
     deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
     agency: Agencia
     import: Importe
@@ -29,9 +27,6 @@ salesTicketsTable:
     componentLack: Faltan componentes
     tooLittle: Ticket demasiado pequeño
     identifier: Identificador
-    client: Cliente
-    salesPerson: Comercial
-    date: Fecha
     theoretical: Teórica
     practical: Práctica
     province: Provincia
diff --git a/src/pages/Order/Card/OrderBasicData.vue b/src/pages/Order/Card/OrderBasicData.vue
index 4bc9e2e43..dc8d1a429 100644
--- a/src/pages/Order/Card/OrderBasicData.vue
+++ b/src/pages/Order/Card/OrderBasicData.vue
@@ -162,7 +162,7 @@ const onClientChange = async (clientId) => {
                 <VnRow>
                     <VnInputDate
                         placeholder="dd-mm-aaa"
-                        :label="t('order.form.landed')"
+                        :label="t('globals.landed')"
                         v-model="data.landed"
                         @update:model-value="
                             () => fetchAgencyList(data.landed, data.addressFk)
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 758639f69..319025119 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -166,6 +166,7 @@ onMounted(() => {
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
+        search-url="params"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'typeFk'">
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index 1239d195b..e4806e96c 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useRouter } from 'vue-router';
-import { onMounted, ref } from 'vue';
+import { reactive, onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useState } from 'composables/useState';
@@ -9,7 +9,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useDialogPluginComponent } from 'quasar';
-import { reactive } from 'vue';
 
 const { t } = useI18n();
 const state = useState();
@@ -58,10 +57,6 @@ const fetchAgencyList = async (landed, addressFk) => {
     }
 };
 
-// const fetchOrderDetails = (order) => {
-//     fetchAddressList(order?.addressFk);
-//     fetchAgencyList(order?.landed, order?.addressFk);
-// };
 const $props = defineProps({
     clientFk: {
         type: Number,
@@ -73,39 +68,6 @@ const initialFormState = reactive({
     addressId: null,
     clientFk: $props.clientFk,
 });
-// const orderMapper = (order) => {
-//     return {
-//         addressId: order.addressFk,
-//         agencyModeId: order.agencyModeFk,
-//         landed: new Date(order.landed).toISOString(),
-//     };
-// };
-// const orderFilter = {
-//     include: [
-//         { relation: 'agencyMode', scope: { fields: ['name'] } },
-//         {
-//             relation: 'address',
-//             scope: { fields: ['nickname'] },
-//         },
-//         { relation: 'rows', scope: { fields: ['id'] } },
-//         {
-//             relation: 'client',
-//             scope: {
-//                 fields: [
-//                     'salesPersonFk',
-//                     'name',
-//                     'isActive',
-//                     'isFreezed',
-//                     'isTaxDataChecked',
-//                 ],
-//                 include: {
-//                     relation: 'salesPersonUser',
-//                     scope: { fields: ['id', 'name'] },
-//                 },
-//             },
-//         },
-//     ],
-// };
 
 const onClientChange = async (clientId = $props.clientFk) => {
     try {
@@ -185,7 +147,7 @@ onMounted(async () => {
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInputDate
                     placeholder="dd-mm-aaa"
-                    :label="t('order.form.landed')"
+                    :label="t('globals.landed')"
                     v-model="data.landed"
                     @update:model-value="
                         () => fetchAgencyList(data.landed, data.addressId)
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 74c8d8bed..138fcc40f 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -67,7 +67,7 @@ const setData = (entity) => {
 };
 
 const getConfirmationValue = (isConfirmed) => {
-    return t(isConfirmed ? 'order.summary.confirmed' : 'order.summary.notConfirmed');
+    return t(isConfirmed ? 'globals.confirmed' : 'order.summary.notConfirmed');
 };
 
 const total = ref(null);
@@ -94,7 +94,7 @@ const total = ref(null);
         </template>
         <template #body="{ entity }">
             <VnLv
-                :label="t('order.summary.state')"
+                :label="t('globals.state')"
                 :value="getConfirmationValue(entity.isConfirmed)"
             />
             <VnLv :label="t('order.field.salesPersonFk')">
@@ -105,9 +105,9 @@ const total = ref(null);
                     </span>
                 </template>
             </VnLv>
-            <VnLv :label="t('order.summary.landed')" :value="toDate(entity?.landed)" />
-            <VnLv :label="t('order.field.agency')" :value="entity?.agencyMode?.name" />
-            <VnLv :label="t('order.summary.alias')" :value="entity?.address?.nickname" />
+            <VnLv :label="t('globals.landed')" :value="toDate(entity?.landed)" />
+            <VnLv :label="t('globals.agency')" :value="entity?.agencyMode?.name" />
+            <VnLv :label="t('globals.alias')" :value="entity?.address?.nickname" />
             <VnLv
                 :label="t('order.summary.items')"
                 :value="(entity?.rows?.length || DEFAULT_ITEMS).toString()"
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 58c5c9551..cb6649155 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -111,6 +111,7 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'Items',
+            sortBy: 'name ASC ',
             fields: ['id', 'name', 'subName'],
         },
         columnField: {
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 032af1993..b8016abac 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -30,7 +30,7 @@ const descriptorData = useArrayData('orderData');
 const detailsColumns = ref([
     {
         name: 'item',
-        label: t('order.summary.item'),
+        label: t('globals.item'),
         field: (row) => row?.item?.id,
         sortable: true,
     },
@@ -41,12 +41,12 @@ const detailsColumns = ref([
     },
     {
         name: 'quantity',
-        label: t('order.summary.quantity'),
+        label: t('globals.quantity'),
         field: (row) => row?.quantity,
     },
     {
         name: 'price',
-        label: t('order.summary.price'),
+        label: t('globals.price'),
         field: (row) => toCurrency(row?.price),
     },
     {
@@ -98,7 +98,7 @@ async function handleConfirm() {
                         :text="t('globals.pageTitles.basicData')"
                     />
                     <VnLv label="ID" :value="entity.id" />
-                    <VnLv :label="t('order.summary.nickname')" dash>
+                    <VnLv :label="t('globals.alias')" dash>
                         <template #value>
                             <span class="link">
                                 {{ dashIfEmpty(entity?.address?.nickname) }}
@@ -107,11 +107,11 @@ async function handleConfirm() {
                         </template>
                     </VnLv>
                     <VnLv
-                        :label="t('order.summary.company')"
+                        :label="t('globals.company')"
                         :value="entity?.address?.companyFk"
                     />
                     <VnLv
-                        :label="t('order.summary.confirmed')"
+                        :label="t('globals.confirmed')"
                         :value="Boolean(entity?.isConfirmed)"
                     />
                 </QCard>
@@ -125,14 +125,14 @@ async function handleConfirm() {
                         :value="toDateHourMinSec(entity?.created)"
                     />
                     <VnLv
-                        :label="t('order.summary.confirmed')"
+                        :label="t('globals.confirmed')"
                         :value="toDateHourMinSec(entity?.confirmed)"
                     />
                     <VnLv
-                        :label="t('order.summary.landed')"
+                        :label="t('globals.landed')"
                         :value="toDateHourMinSec(entity?.landed)"
                     />
-                    <VnLv :label="t('order.summary.phone')">
+                    <VnLv :label="t('globals.phone')">
                         <template #value>
                             {{ dashIfEmpty(entity?.address?.phone) }}
                             <a
@@ -164,7 +164,7 @@ async function handleConfirm() {
                     <VnTitle :text="t('order.summary.total')" />
                     <VnLv>
                         <template #label>
-                            <span class="text-h6">{{ t('order.summary.subtotal') }}</span>
+                            <span class="text-h6">{{ t('globals.subtotal') }}</span>
                         </template>
                         <template #value>
                             <span class="text-h6">{{
@@ -174,7 +174,7 @@ async function handleConfirm() {
                     </VnLv>
                     <VnLv>
                         <template #label>
-                            <span class="text-h6">{{ t('order.summary.vat') }}</span>
+                            <span class="text-h6">{{ t('globals.vat') }}</span>
                         </template>
                         <template #value>
                             <span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
@@ -190,14 +190,14 @@ async function handleConfirm() {
                     </VnLv>
                 </QCard>
                 <QCard>
-                    <VnTitle :text="t('order.summary.details')" />
+                    <VnTitle :text="t('globals.details')" />
                     <QTable :columns="detailsColumns" :rows="entity?.rows" flat>
                         <template #header="props">
                             <QTr :props="props">
-                                <QTh auto-width>{{ t('order.summary.item') }}</QTh>
+                                <QTh auto-width>{{ t('globals.item') }}</QTh>
                                 <QTh>{{ t('globals.description') }}</QTh>
-                                <QTh auto-width>{{ t('order.summary.quantity') }}</QTh>
-                                <QTh auto-width>{{ t('order.summary.price') }}</QTh>
+                                <QTh auto-width>{{ t('globals.quantity') }}</QTh>
+                                <QTh auto-width>{{ t('globals.price') }}</QTh>
                                 <QTh auto-width>{{ t('order.summary.amount') }}</QTh>
                             </QTr>
                         </template>
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index e01790c6b..cb59d7c4a 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -14,7 +14,6 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
-import { onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
@@ -142,8 +141,13 @@ const columns = computed(() => [
         ],
     },
 ]);
-
-async function fetchClientAddress(id, formData) {
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk);
+});
+async function fetchClientAddress(id, formData = {}) {
     const { data } = await axios.get(`Clients/${id}`, {
         params: { filter: { include: { relation: 'addresses' } } },
     });
@@ -170,13 +174,6 @@ const getDateColor = (date) => {
     if (comparation == 0) return 'bg-warning';
     if (comparation < 0) return 'bg-success';
 };
-
-onMounted(() => {
-    if (!route.query.createForm) return;
-    const clientId = route.query.createForm;
-    const id = JSON.parse(clientId);
-    fetchClientAddress(id.clientFk, id);
-});
 </script>
 <template>
     <OrderSearchbar />
@@ -194,7 +191,7 @@ onMounted(() => {
             urlCreate: 'Orders/new',
             title: t('module.cerateOrder'),
             onDataSaved: (url) => {
-                tableRef.redirect(url);
+               tableRef.redirect(`${url}/catalog`);
             },
             formInitialData: {
                 active: true,
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index ede271960..b3eaf3b48 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -116,7 +116,7 @@ function getApiUrl() {
     return new URL(window.location).origin;
 }
 function getCmrUrl(value) {
-    return `${getApiUrl()}/api/Routes/${value}/cmr?access_token=${token}`;
+    return `${getApiUrl()}/api/Cmrs/${value}/print?access_token=${token}`;
 }
 function downloadPdfs() {
     if (!selectedRows.value.length) {
@@ -129,7 +129,7 @@ function downloadPdfs() {
     let cmrs = [];
     for (let value of selectedRows.value) cmrs.push(value.cmrFk);
     // prettier-ignore
-    return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
+    return window.open(`${getApiUrl()}/api/Cmrs/downloadZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
 </script>
 <template>
@@ -149,7 +149,7 @@ function downloadPdfs() {
     <VnTable
         ref="tableRef"
         data-key="CmrList"
-        url="Routes/cmrs"
+        url="Cmrs/filter"
         :columns="columns"
         :right-search="true"
         default-mode="table"
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 6beca6d88..b1ff4a8ae 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -53,9 +53,9 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         @on-fetch="setData"
     >
         <template #body="{ entity }">
-            <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
-            <VnLv :label="t('shelving.summary.parking')" :value="entity.parking?.code" />
-            <VnLv v-if="entity.worker" :label="t('shelving.summary.worker')">
+            <VnLv :label="t('globals.code')" :value="entity.code" />
+            <VnLv :label="t('shelving.list.parking')" :value="entity.parking?.code" />
+            <VnLv v-if="entity.worker" :label="t('globals.worker')">
                 <template #value>
                     <VnUserLink
                         :name="entity.worker?.user?.nickname"
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index dc0234c22..3bbd94a0a 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -58,7 +58,7 @@ const onSave = (shelving, newShelving) => {
             <VnRow>
                 <VnInput
                     v-model="data.code"
-                    :label="t('shelving.basicData.code')"
+                    :label="t('globals.code')"
                     :rules="validate('Shelving.code')"
                 />
                 <VnSelect
@@ -68,7 +68,7 @@ const onSave = (shelving, newShelving) => {
                     option-label="code"
                     :filter-options="['id', 'code']"
                     :fields="['id', 'code']"
-                    :label="t('shelving.basicData.parking')"
+                    :label="t('shelving.list.parking')"
                     :rules="validate('Shelving.parkingFk')"
                 />
             </VnRow>
@@ -76,12 +76,12 @@ const onSave = (shelving, newShelving) => {
                 <VnInput
                     v-model="data.priority"
                     type="number"
-                    :label="t('shelving.basicData.priority')"
+                    :label="t('shelving.list.priority')"
                     :rules="validate('Shelving.priority')"
                 />
                 <QCheckbox
                     v-model="data.isRecyclable"
-                    :label="t('shelving.basicData.recyclable')"
+                    :label="t('shelving.summary.recyclable')"
                     :rules="validate('Shelving.isRecyclable')"
                 />
             </VnRow>
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 94175b0c1..db7ac34f5 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -54,16 +54,13 @@ const filter = {
                         {{ t('globals.pageTitles.basicData') }}
                         <QIcon name="open_in_new" />
                     </RouterLink>
-                    <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
+                    <VnLv :label="t('globals.code')" :value="entity.code" />
                     <VnLv
-                        :label="t('shelving.summary.parking')"
+                        :label="t('shelving.list.parking')"
                         :value="entity.parking?.code"
                     />
-                    <VnLv
-                        :label="t('shelving.summary.priority')"
-                        :value="entity.priority"
-                    />
-                    <VnLv v-if="entity.worker" :label="t('shelving.summary.worker')">
+                    <VnLv :label="t('shelving.list.priority')" :value="entity.priority" />
+                    <VnLv v-if="entity.worker" :label="t('globals.worker')">
                         <template #value>
                             <VnUserLink
                                 :name="entity.worker?.user?.nickname"
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index f46a3be19..f1e95b8de 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -69,16 +69,13 @@ const redirectToUpdateView = (addressData) => {
                         @click="redirectToUpdateView(row)"
                     >
                         <template #list-items>
+                            <VnLv :label="t('globals.street')" :value="row.street" />
                             <VnLv
-                                :label="t('supplier.addresses.street')"
-                                :value="row.street"
-                            />
-                            <VnLv
-                                :label="t('supplier.addresses.postcode')"
+                                :label="t('globals.postcode')"
                                 :value="`${row.postalCode} - ${row.city}, ${row.province.name}`"
                             />
                             <VnLv
-                                :label="t('supplier.addresses.phone')"
+                                :label="t('globals.phone')"
                                 :value="`${row.phone}, ${row.mobile}`"
                             />
                         </template>
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 0feceb74a..7a078f03b 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -72,14 +72,8 @@ function handleLocation(data, location) {
         >
             <template #form="{ data, validate }">
                 <VnRow>
-                    <VnInput
-                        v-model="data.nickname"
-                        :label="t('supplier.addresses.name')"
-                    />
-                    <VnInput
-                        v-model="data.street"
-                        :label="t('supplier.addresses.street')"
-                    />
+                    <VnInput v-model="data.nickname" :label="t('globals.name')" />
+                    <VnInput v-model="data.street" :label="t('globals.street')" />
                 </VnRow>
                 <VnRow>
                     <VnLocation
@@ -101,14 +95,8 @@ function handleLocation(data, location) {
                     </VnLocation>
                 </VnRow>
                 <VnRow>
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('supplier.addresses.phone')"
-                    />
-                    <VnInput
-                        v-model="data.mobile"
-                        :label="t('supplier.addresses.mobile')"
-                    />
+                    <VnInput v-model="data.phone" :label="t('globals.phone')" />
+                    <VnInput v-model="data.mobile" :label="t('globals.mobile')" />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index ab8f9a4b1..a6031e985 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -26,7 +26,7 @@ const companySizes = [
             <VnRow>
                 <VnInput
                     v-model="data.nickname"
-                    :label="t('supplier.basicData.alias')"
+                    :label="t('globals.alias')"
                     :rules="validate('supplier.nickname')"
                     clearable
                 />
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index 7200bbba6..05c9858d9 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -58,7 +58,7 @@ const formatPayDems = (data) => {
             </VnRow>
             <VnRow>
                 <QInput
-                    :label="t('supplier.billingData.payDay')"
+                    :label="t('supplier.summary.payDay')"
                     type="number"
                     v-model="data.payDay"
                 />
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 8fa6a1e5c..fe1cec260 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -190,13 +190,11 @@ onMounted(async () => {
                         <span>{{ row.id }}</span>
                     </QTd>
                     <QTd no-hover>
-                        <span class="label">{{ t('supplier.consumption.date') }}: </span>
+                        <span class="label">{{ t('globals.date') }}: </span>
                         <span>{{ toDate(row.shipped) }}</span></QTd
                     >
                     <QTd colspan="6" no-hover>
-                        <span class="label"
-                            >{{ t('supplier.consumption.reference') }}:
-                        </span>
+                        <span class="label">{{ t('globals.reference') }}: </span>
                         <span>{{ row.invoiceNumber }}</span>
                     </QTd>
                 </QTr>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 3f2063784..6781c8d34 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -44,21 +44,12 @@ const insertRow = () => {
                     <VnRow class="row q-gutter-md">
                         <VnInput
                             input-name-focusable
-                            :label="t('supplier.contacts.name')"
+                            :label="t('globals.name')"
                             v-model="row.name"
                         />
-                        <VnInput
-                            :label="t('supplier.contacts.phone')"
-                            v-model="row.phone"
-                        />
-                        <VnInput
-                            :label="t('supplier.contacts.mobile')"
-                            v-model="row.mobile"
-                        />
-                        <VnInput
-                            :label="t('supplier.contacts.email')"
-                            v-model="row.email"
-                        />
+                        <VnInput :label="t('globals.phone')" v-model="row.phone" />
+                        <VnInput :label="t('globals.mobile')" v-model="row.mobile" />
+                        <VnInput :label="t('globals.params.email')" v-model="row.email" />
                     </VnRow>
                     <VnRow class="row q-gutter-md">
                         <QInput
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 5754031b3..0fbe03c99 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -116,7 +116,7 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.taxNumber')" :value="entity.nif" />
             <VnLv label="Alias" :value="entity.nickname" />
             <VnLv
-                :label="t('supplier.summary.payMethod')"
+                :label="t('supplier.list.payMethod')"
                 :value="entity?.payMethod?.name"
             />
             <VnLv
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 169c4d796..547842960 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -147,16 +147,12 @@ function handleLocation(data, location) {
                 />
                 <VnInput
                     v-model="data.healthRegister"
-                    :label="t('supplier.fiscalData.healthRegister')"
+                    :label="t('supplier.summary.healthRegister')"
                     clearable
                 />
             </VnRow>
             <VnRow>
-                <VnInput
-                    v-model="data.street"
-                    :label="t('supplier.fiscalData.street')"
-                    clearable
-                />
+                <VnInput v-model="data.street" :label="t('globals.street')" clearable />
             </VnRow>
             <VnRow>
                 <VnLocation
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 2ce5a7dce..bdbbd9911 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -60,7 +60,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('supplier.summary.notes')" class="q-mb-xs">
+                <VnLv :label="t('globals.notes')" class="q-mb-xs">
                     <template #value>
                         <span> {{ dashIfEmpty(supplier.note) }} </span>
                     </template>
@@ -98,7 +98,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
                     :text="t('supplier.summary.billingData')"
                 />
                 <VnLv
-                    :label="t('supplier.summary.payMethod')"
+                    :label="t('supplier.list.payMethod')"
                     :value="supplier.payMethod?.name"
                     dash
                 />
@@ -147,19 +147,16 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
                 />
                 <VnLv :label="t('supplier.summary.socialName')" :value="supplier.name" />
                 <VnLv :label="t('supplier.summary.taxNumber')" :value="supplier.nif" />
-                <VnLv :label="t('supplier.summary.street')" :value="supplier.street" />
+                <VnLv :label="t('globals.street')" :value="supplier.street" />
                 <VnLv :label="t('supplier.summary.city')" :value="supplier.city" />
-                <VnLv
-                    :label="t('supplier.summary.postCode')"
-                    :value="supplier.postCode"
-                />
+                <VnLv :label="t('globals.postCode')" :value="supplier.postCode" />
                 <VnLv
                     :label="t('supplier.summary.province')"
                     :value="supplier.province?.name"
                     dash
                 />
                 <VnLv
-                    :label="t('supplier.summary.country')"
+                    :label="t('globals.country')"
                     :value="supplier.country?.name"
                     dash
                 />
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index ea79947a4..69f826201 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -12,13 +12,13 @@ const tableRef = ref();
 const columns = computed(() => [
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.id'),
+        label: t('globals.id'),
         name: 'id',
         isTitle: true,
     },
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.name'),
+        label: t('globals.name'),
         name: 'socialName',
         create: true,
         columnFilter: {
@@ -35,7 +35,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.nickname'),
+        label: t('globals.alias'),
         name: 'alias',
         columnFilter: {
             name: 'search',
@@ -51,7 +51,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.payMethod'),
+        label: t('supplier.list.payMethod'),
         name: 'payMethod',
         columnFilter: {
             inWhere: true,
@@ -70,7 +70,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.payDay'),
+        label: t('supplier.summary.payDay'),
         name: 'payDay',
         columnFilter: {
             inWhere: true,
@@ -79,7 +79,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.country'),
+        label: t('globals.country'),
         name: 'country',
         columnFilter: {
             component: 'select',
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 13f8bcee9..cf10b9e21 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -16,12 +16,9 @@ import { useAcl } from 'src/composables/useAcl';
 import { useValidator } from 'src/composables/useValidator';
 import { toTimeFormat } from 'filters/date.js';
 
-const $props = defineProps({
-    formData: {
-        type: Object,
-        required: true,
-        default: () => ({}),
-    },
+const formData = defineModel({
+    type: Object,
+    required: true,
 });
 
 const emit = defineEmits(['updateForm']);
@@ -41,7 +38,6 @@ const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
 const zoneSelectRef = ref();
-const formData = ref($props.formData);
 
 watch(
     () => formData.value,
@@ -70,47 +66,28 @@ const zoneWhere = computed(() => {
         : {};
 });
 
-const getLanded = async (params) => {
-    try {
-        const validParams =
-            shipped.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) return;
+async function getLanded(params) {
+    getDate(`Agencies/getLanded`, params);
+}
 
-        formData.value.zoneFk = null;
-        zonesOptions.value = [];
-        const { data } = await axios.get(`Agencies/getLanded`, { params });
-        if (data) {
-            formData.value.zoneFk = data.zoneFk;
-            formData.value.landed = data.landed;
-            formData.value.shipped = params.shipped;
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
+async function getShipped(params) {
+    getDate(`Agencies/getShipped`, params);
+}
+
+async function getDate(query, params) {
+    for (const param in params) {
+        if (!params[param]) return;
     }
-};
 
-const getShipped = async (params) => {
-    try {
-        const validParams =
-            landed.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) return;
+    formData.value.zoneFk = null;
+    zonesOptions.value = [];
+    const { data } = await axios.get(query, { params });
+    if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
 
-        formData.value.zoneFk = null;
-        zonesOptions.value = [];
-        const { data } = await axios.get(`Agencies/getShipped`, { params });
-        if (data) {
-            formData.value.zoneFk = data.zoneFk;
-            formData.value.landed = params.landed;
-            formData.value.shipped = data.shipped;
-        } else {
-            notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-    }
-};
+    formData.value.zoneFk = data.zoneFk;
+    if (data.landed) formData.value.landed = data.landed;
+    if (data.shipped) formData.value.shipped = data.shipped;
+}
 
 const onChangeZone = async (zoneId) => {
     formData.value.agencyModeFk = null;
@@ -178,18 +155,26 @@ const clientId = computed({
     },
 });
 
-const landed = computed({
-    get: () => formData.value?.landed,
-    set: (val) => {
-        formData.value.landed = val;
-        getShipped({
-            landed: val,
+function addDateParams(obj) {
+    return {
+        ...obj,
+        ...{
             addressFk: formData.value?.addressFk,
             agencyModeFk: formData.value?.agencyModeFk,
             warehouseFk: formData.value?.warehouseFk,
-        });
-    },
-});
+        },
+    };
+}
+
+async function setLanded(landed) {
+    if (!landed) return;
+    getShipped(addDateParams({ landed }));
+}
+
+async function setShipped(shipped) {
+    if (!shipped) return;
+    getLanded(addDateParams({ shipped }));
+}
 
 const agencyModeId = computed({
     get: () => formData.value.agencyModeFk,
@@ -237,21 +222,6 @@ const warehouseId = computed({
     },
 });
 
-const shipped = computed({
-    get: () => formData.value?.shipped,
-    set: (val) => {
-        if (new Date(formData.value?.shipped).toDateString() != val.toDateString())
-            val.setHours(0, 0, 0, 0);
-        formData.value.shipped = val;
-        getLanded({
-            shipped: val,
-            addressFk: formData.value?.addressFk,
-            agencyModeFk: formData.value?.agencyModeFk,
-            warehouseFk: formData.value?.warehouseFk,
-        });
-    },
-});
-
 const onFormModelInit = () => {
     if (formData.value?.clientFk) clientAddressesList(formData.value?.clientFk);
 };
@@ -309,7 +279,7 @@ async function getZone(options) {
     <QForm>
         <VnRow>
             <VnSelect
-                :label="t('basicData.client')"
+                :label="t('ticketList.client')"
                 v-model="clientId"
                 option-value="id"
                 option-label="name"
@@ -332,7 +302,7 @@ async function getZone(options) {
                 </template>
             </VnSelect>
             <VnSelect
-                :label="t('basicData.warehouse')"
+                :label="t('ticketList.warehouse')"
                 v-model="warehouseId"
                 option-value="id"
                 option-label="name"
@@ -340,7 +310,7 @@ async function getZone(options) {
                 hide-selected
                 map-options
                 :required="true"
-                :rules="validate('basicData.warehouse')"
+                :rules="validate('ticketList.warehouse')"
             />
         </VnRow>
         <VnRow>
@@ -405,6 +375,17 @@ async function getZone(options) {
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
+            <VnSelect
+                :label="t('ticketList.company')"
+                v-model="formData.companyFk"
+                option-value="id"
+                option-label="code"
+                :options="companiesOptions"
+                hide-selected
+                map-options
+                :required="true"
+                :rules="validate('ticketList.company')"
+            />
             <VnSelect
                 :label="t('basicData.agency')"
                 v-model="agencyModeId"
@@ -418,7 +399,7 @@ async function getZone(options) {
             />
             <VnSelect
                 ref="zoneSelectRef"
-                :label="t('basicData.zone')"
+                :label="t('ticketList.zone')"
                 v-model="zoneId"
                 option-value="id"
                 option-label="name"
@@ -426,7 +407,7 @@ async function getZone(options) {
                 :fields="['id', 'name']"
                 sort-by="id"
                 :where="zoneWhere"
-                :rules="validate('basicData.zone')"
+                :rules="validate('ticketList.zone')"
                 :required="true"
                 :disable="!canEditZone"
                 @update:options="getZone"
@@ -467,22 +448,25 @@ async function getZone(options) {
         </VnRow>
         <VnRow>
             <VnInputDate
-                :label="t('basicData.shipped')"
+                :label="t('ticketList.shipped')"
                 v-model="formData.shipped"
                 :required="true"
-                :rules="validate('basicData.shipped')"
+                :rules="validate('ticketList.shipped')"
+                @update:model-value="setShipped"
             />
             <VnInputTime
                 :label="t('basicData.shippedHour')"
                 v-model="formData.shipped"
                 :required="true"
                 :rules="validate('basicData.shippedHour')"
+                @update:model-value="setShipped"
             />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"
                 :required="true"
                 :rules="validate('basicData.landed')"
+                @update:model-value="setLanded"
             />
         </VnRow>
     </QForm>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index fb7881403..851593bff 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -158,7 +158,7 @@ onBeforeMount(async () => await getTicketData());
             <TicketBasicDataForm
                 v-if="initialDataLoaded"
                 @update-form="($event) => (formData = $event)"
-                :form-data="formData"
+                v-model="formData"
             />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">
diff --git a/src/pages/Ticket/Card/ExpeditionNewTicket.vue b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
index c288f6cc2..6ecadfe6d 100644
--- a/src/pages/Ticket/Card/ExpeditionNewTicket.vue
+++ b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
@@ -60,7 +60,7 @@ const createTicket = async () => {
         <template #form-inputs="{ data }">
             <VnRow>
                 <VnInputDate
-                    :label="t('expedition.landed')"
+                    :label="t('basicData.landed')"
                     v-model="data.landed"
                     :model-value="date"
                 />
diff --git a/src/pages/Ticket/Card/TicketBoxing.vue b/src/pages/Ticket/Card/TicketBoxing.vue
index bff95c0e2..1a7287396 100644
--- a/src/pages/Ticket/Card/TicketBoxing.vue
+++ b/src/pages/Ticket/Card/TicketBoxing.vue
@@ -136,13 +136,13 @@ async function getVideoList(expeditionId, timed) {
                         <QItemLabel class="text-h6">#{{ expedition.id }}</QItemLabel>
                     </QItemSection>
                     <QItemSection>
-                        <QItemLabel caption>{{ t('ticket.boxing.created') }}</QItemLabel>
+                        <QItemLabel caption>{{ t('globals.created') }}</QItemLabel>
                         <QItemLabel>
                             {{
                                 date.formatDate(expedition.created, 'YYYY-MM-DD HH:mm:ss')
                             }}
                         </QItemLabel>
-                        <QItemLabel caption>{{ t('ticket.boxing.item') }}</QItemLabel>
+                        <QItemLabel caption>{{ t('globals.item') }}</QItemLabel>
                         <QItemLabel>{{ expedition.packagingItemFk }}</QItemLabel>
                         <QItemLabel caption>{{ t('ticket.boxing.worker') }}</QItemLabel>
                         <QItemLabel>{{ expedition.userName }}</QItemLabel>
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index b5b3c430c..f45bde2d1 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -72,7 +72,7 @@ const salesFilter = computed(() => ({
 
 const columns = computed(() => [
     {
-        label: t('ticketComponents.item'),
+        label: t('basicData.item'),
         name: 'item',
         align: 'left',
     },
@@ -92,13 +92,13 @@ const columns = computed(() => [
         columnFilter: false,
     },
     {
-        label: t('ticketComponents.description'),
+        label: t('basicData.description'),
         name: 'description',
         align: 'left',
         columnClass: 'expand',
     },
     {
-        label: t('ticketComponents.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
@@ -116,12 +116,12 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('ticketComponents.import'),
+        label: t('advanceTickets.import'),
         name: 'import',
         align: 'left',
     },
     {
-        label: t('ticketComponents.total'),
+        label: t('basicData.total'),
         name: 'total',
         align: 'left',
     },
@@ -184,7 +184,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
             <QCardSection horizontal>
                 <span class="text-weight-bold text-subtitle1 text-center full-width">
-                    {{ t('ticketComponents.total') }}
+                    {{ t('basicData.total') }}
                 </span>
             </QCardSection>
             <QCardSection horizontal>
@@ -226,9 +226,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </span>
             </QCardSection>
             <QCardSection horizontal>
-                <span class="q-mr-xs color-vn-label">
-                    {{ t('ticketComponents.price') }}:
-                </span>
+                <span class="q-mr-xs color-vn-label"> {{ t('basicData.price') }}: </span>
                 <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
             </QCardSection>
             <QCardSection horizontal>
@@ -238,18 +236,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
             </QCardSection>
             <QCardSection horizontal>
-                <span class="q-mr-xs color-vn-label">
-                    {{ t('ticketComponents.zone') }}:
-                </span>
+                <span class="q-mr-xs color-vn-label"> {{ t('ticketList.zone') }}: </span>
                 <span class="link">
                     {{ dashIfEmpty(ticketData?.zone?.name) }}
                     <ZoneDescriptorProxy :id="ticketData?.zone?.id" />
                 </span>
             </QCardSection>
             <QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
-                <span class="q-mr-xs color-vn-label">
-                    {{ t('ticketComponents.volume') }}:
-                </span>
+                <span class="q-mr-xs color-vn-label"> {{ t('volume.volume') }}: </span>
                 <span>{{ ticketVolume }}</span>
             </QCardSection>
             <QCardSection horizontal>
diff --git a/src/pages/Ticket/Card/TicketCreateRequest.vue b/src/pages/Ticket/Card/TicketCreateRequest.vue
index d6e757afe..b1e5d903b 100644
--- a/src/pages/Ticket/Card/TicketCreateRequest.vue
+++ b/src/pages/Ticket/Card/TicketCreateRequest.vue
@@ -32,10 +32,7 @@ const attendersOptions = ref([]);
     >
         <template #form-inputs="{ data }">
             <VnRow>
-                <VnInput
-                    v-model="data.description"
-                    :label="t('purchaseRequest.description')"
-                />
+                <VnInput v-model="data.description" :label="t('basicData.description')" />
                 <VnSelect
                     :label="t('purchaseRequest.atender')"
                     v-model="data.attenderFk"
@@ -48,13 +45,13 @@ const attendersOptions = ref([]);
             <VnRow>
                 <VnInput
                     v-model="data.quantity"
-                    :label="t('purchaseRequest.quantity')"
+                    :label="t('basicData.quantity')"
                     type="number"
                     min="1"
                 />
                 <VnInput
                     v-model="data.price"
-                    :label="t('purchaseRequest.price')"
+                    :label="t('basicData.price')"
                     type="number"
                     step="0.01"
                     min="0"
diff --git a/src/pages/Ticket/Card/TicketCreateServiceType.vue b/src/pages/Ticket/Card/TicketCreateServiceType.vue
index 067d7dee8..2f5857e86 100644
--- a/src/pages/Ticket/Card/TicketCreateServiceType.vue
+++ b/src/pages/Ticket/Card/TicketCreateServiceType.vue
@@ -34,7 +34,7 @@ onMounted(async () => {
             <VnRow>
                 <VnInput
                     ref="nameInputRef"
-                    :label="t('service.description')"
+                    :label="t('basicData.description')"
                     v-model="data.name"
                     :required="true"
                 />
diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
index d692f550d..3ea762c6c 100644
--- a/src/pages/Ticket/Card/TicketCreateTracking.vue
+++ b/src/pages/Ticket/Card/TicketCreateTracking.vue
@@ -39,7 +39,7 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
             <VnRow>
                 <VnSelect
                     v-model="data.stateFk"
-                    :label="t('tracking.state')"
+                    :label="t('ticketList.state')"
                     :options="statesOptions"
                     @update:model-value="onStateFkChange(data)"
                     hide-selected
@@ -47,7 +47,7 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
                     option-value="id"
                 />
                 <VnSelect
-                    :label="t('tracking.worker')"
+                    :label="t('expedition.worker')"
                     v-model="data.userFk"
                     url="Workers/search"
                     fields=" ['id', 'name']"
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 70fd9ab1e..f8ffb43ed 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -125,7 +125,7 @@ function ticketFilter(ticket) {
                     </span>
                 </template>
             </VnLv>
-            <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
+            <VnLv v-if="entity.ticketState" :label="t('globals.state')">
                 <template #value>
                     <QBadge
                         text-color="black"
@@ -135,7 +135,7 @@ function ticketFilter(ticket) {
                     </QBadge>
                 </template>
             </VnLv>
-            <VnLv :label="t('ticket.summary.salesPerson')">
+            <VnLv :label="t('globals.salesPerson')">
                 <template #value>
                     <VnUserLink
                         :name="entity.client?.salesPersonUser?.name"
@@ -144,16 +144,16 @@ function ticketFilter(ticket) {
                 </template>
             </VnLv>
             <VnLv
-                :label="t('ticket.card.shipped')"
+                :label="t('globals.shipped')"
                 :value="toDateTimeFormat(entity.shipped)"
             />
             <VnLv
                 v-if="entity.agencyMode"
-                :label="t('ticket.card.agency')"
+                :label="t('globals.agency')"
                 :value="entity.agencyMode.name"
             />
-            <VnLv :label="t('ticket.card.warehouse')" :value="entity.warehouse?.name" />
-            <VnLv :label="t('ticket.card.alias')" :value="entity.nickname" />
+            <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
+            <VnLv :label="t('globals.alias')" :value="entity.nickname" />
         </template>
         <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-xs">
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index bf4a1efb4..f1d30b1bd 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -1,9 +1,9 @@
 <script setup>
 import axios from 'axios';
-import { ref, toRefs } from 'vue';
+import { computed, ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { usePrintService } from 'composables/usePrintService';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -23,7 +23,6 @@ const props = defineProps({
         required: true,
     },
 });
-const route = useRoute();
 
 const { push, currentRoute } = useRouter();
 const { dialog, notify } = useQuasar();
@@ -31,7 +30,7 @@ const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const ticketSummary = useArrayData('TicketSummary');
 const { ticket } = toRefs(props);
-const ticketId = currentRoute.value.params.id;
+const ticketId = computed(() => props.ticket.id ?? currentRoute.value.params.id);
 const client = ref();
 const showTransferDialog = ref(false);
 const showTurnDialog = ref(false);
@@ -68,7 +67,7 @@ const actions = {
     setWeight: async () => {
         try {
             const invoiceIds = (
-                await axios.post(`Tickets/${ticketId}/setWeight`, {
+                await axios.post(`Tickets/${ticketId.value}/setWeight`, {
                     weight: weight.value,
                 })
             ).data;
@@ -86,7 +85,7 @@ const actions = {
     },
     remove: async () => {
         try {
-            await axios.post(`Tickets/${ticketId}/setDeleted`);
+            await axios.post(`Tickets/${ticketId.value}/setDeleted`);
 
             notify({ message: t('Ticket deleted'), type: 'positive' });
             notify({
@@ -176,14 +175,14 @@ function showSmsDialog(template, customData) {
 }
 
 async function showSmsDialogWithChanges() {
-    const query = `TicketLogs/${ticketId}/getChanges`;
+    const query = `TicketLogs/${ticketId.value}/getChanges`;
     const response = await axios.get(query);
 
     showSmsDialog('orderChanges', { changes: response.data });
 }
 
 async function sendSms(body) {
-    await axios.post(`Tickets/${ticketId}/sendSms`, body);
+    await axios.post(`Tickets/${ticketId.value}/sendSms`, body);
     notify({
         message: 'Notification sent',
         type: 'positive',
@@ -256,7 +255,10 @@ async function transferClient(client) {
         clientFk: client,
     };
 
-    const { data } = await axios.patch(`Tickets/${ticketId}/transferClient`, params);
+    const { data } = await axios.patch(
+        `Tickets/${ticketId.value}/transferClient`,
+        params
+    );
 
     if (data) window.location.reload();
 }
@@ -296,7 +298,10 @@ async function changeShippedHour(time) {
         shipped: time,
     };
 
-    const { data } = await axios.post(`Tickets/${ticketId}/updateEditableTicket`, params);
+    const { data } = await axios.post(
+        `Tickets/${ticketId.value}/updateEditableTicket`,
+        params
+    );
 
     if (data) window.location.reload();
 }
@@ -313,7 +318,7 @@ function openRecalculateDialog() {
 }
 
 async function recalculateComponents() {
-    await axios.post(`Tickets/${ticketId}/recalculateComponents`);
+    await axios.post(`Tickets/${ticketId.value}/recalculateComponents`);
     notify({
         message: t('Data saved'),
         type: 'positive',
@@ -336,11 +341,11 @@ async function handleInvoiceOutData() {
 }
 
 async function docuwareDownload() {
-    await axios.get(`Tickets/${ticketId}/docuwareDownload`);
+    await axios.get(`Tickets/${ticketId.value}/docuwareDownload`);
 }
 
 async function hasDocuware() {
-    const { data } = await axios.post(`Docuwares/${ticketId}/checkFile`, {
+    const { data } = await axios.post(`Docuwares/${ticketId.value}/checkFile`, {
         fileCabinet: 'deliveryNote',
         signed: true,
     });
@@ -371,11 +376,7 @@ async function uploadDocuware(force) {
 </script>
 <template>
     <FetchData
-        :url="
-            route.path.startsWith('/ticket')
-                ? `Tickets/${ticketId}/isEditable`
-                : `Tickets/${ticket}/isEditable`
-        "
+        :url="`Tickets/${ticketId}/isEditable`"
         auto-load
         @on-fetch="handleFetchData"
     />
@@ -396,8 +397,6 @@ async function uploadDocuware(force) {
                 <VnSelect
                     url="Clients"
                     :fields="['id', 'name']"
-                    option-label="name"
-                    option-value="id"
                     v-model="client"
                     :label="t('Client')"
                     auto-load
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index d682d0408..b7f1f4dd0 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -57,7 +57,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('expedition.item'),
+        label: t('basicData.item'),
         name: 'packagingItemFk',
         align: 'left',
         cardVisible: true,
@@ -107,7 +107,7 @@ const columns = computed(() => [
         format: (row) => toDateTimeFormat(row.created),
     },
     {
-        label: t('expedition.state'),
+        label: t('ticketList.state'),
         name: 'state',
         align: 'left',
         cardVisible: true,
@@ -129,7 +129,7 @@ const columns = computed(() => [
 
 const logTableColumns = computed(() => [
     {
-        label: t('expedition.state'),
+        label: t('ticketList.state'),
         name: 'state',
         field: 'state',
         align: 'center',
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index b5302d15f..12f7ba2c6 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -88,7 +88,7 @@ async function handleSave() {
                             :disable="!!row.id"
                         />
                         <VnInput
-                            :label="t('ticketNotes.description')"
+                            :label="t('basicData.description')"
                             v-model="row.description"
                             class="col"
                             @keyup.enter="handleSave"
diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index c0418bcf6..04d6020f3 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -93,7 +93,7 @@ watch(
                             </template>
                         </VnSelect>
                         <VnInput
-                            :label="t('package.quantity')"
+                            :label="t('basicData.quantity')"
                             v-model.number="row.quantity"
                             class="col"
                             type="number"
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index d0af9efd0..fdc35d369 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -81,7 +81,7 @@ const crudModelFilter = reactive({
 const columns = computed(() => [
     {
         align: 'left',
-        label: t('purchaseRequest.id'),
+        label: t('ticketList.id'),
         name: 'id',
         chip: {
             condition: () => true,
@@ -90,13 +90,13 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('purchaseRequest.description'),
+        label: t('basicData.description'),
         name: 'description',
         columnClass: 'expand',
     },
     {
         align: 'left',
-        label: t('purchaseRequest.created'),
+        label: t('expedition.created'),
         name: 'created',
         format: (row) => toDateFormat(row.created),
         cardVisible: true,
@@ -117,12 +117,12 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('purchaseRequest.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
     },
     {
         align: 'left',
-        label: t('purchaseRequest.price'),
+        label: t('basicData.price'),
         name: 'price',
     },
     {
@@ -133,7 +133,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('purchaseRequest.state'),
+        label: t('ticketList.state'),
         name: 'isOk',
         cardVisible: true,
     },
@@ -248,10 +248,7 @@ onMounted(() => (stateStore.rightDrawer = false));
         </template>
 
         <template #more-create-dialog="{ data }">
-            <VnInput
-                v-model="data.description"
-                :label="t('purchaseRequest.description')"
-            />
+            <VnInput v-model="data.description" :label="t('basicData.description')" />
             <VnSelect
                 :label="t('purchaseRequest.atender')"
                 v-model="data.attenderFk"
@@ -262,15 +259,16 @@ onMounted(() => (stateStore.rightDrawer = false));
             />
             <VnInput
                 v-model="data.quantity"
-                :label="t('purchaseRequest.quantity')"
+                :label="t('basicData.quantity')"
                 type="number"
                 min="1"
             />
             <VnInput
                 v-model="data.price"
-                :label="t('purchaseRequest.price')"
+                :label="t('basicData.price')"
                 type="number"
                 min="0"
+                step="any"
             />
         </template>
     </VnTable>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 7529d4908..e86f60d0a 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -94,25 +94,32 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('ticketSale.id'),
+        label: t('globals.id'),
         name: 'itemFk',
     },
     {
         align: 'left',
-        label: t('ticketSale.quantity'),
+        label: t('globals.quantity'),
         name: 'quantity',
         format: (row) => toCurrency(row.quantity),
     },
     {
         align: 'left',
-        label: t('ticketSale.item'),
+        label: t('globals.item'),
         name: 'item',
         format: (row) => row?.item?.name,
         columnClass: 'expand',
     },
     {
         align: 'left',
-        label: t('ticketSale.price'),
+        label: t('globals.size'),
+        name: 'size',
+        format: (row) => row?.item?.size,
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        label: t('globals.price'),
         name: 'price',
         format: (row) => toCurrency(row.price),
     },
@@ -124,7 +131,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('ticketSale.amount'),
+        label: t('globals.amount'),
         name: 'amount',
         format: (row) => parseInt(row.amount * row.quantity),
     },
@@ -583,7 +590,7 @@ watch(
                 <QBtnDropdown
                     ref="stateBtnDropdownRef"
                     color="primary"
-                    :label="t('ticketSale.state')"
+                    :label="t('ticketList.state')"
                     :disable="!isTicketEditable"
                 >
                     <VnSelect
@@ -655,7 +662,7 @@ watch(
                 }}</span>
             </QCardSection>
             <QCardSection class="justify-end text-weight-bold text-subtitle1" horizontal>
-                <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.total') }}: </span>
+                <span class="q-mr-xs color-vn-label"> {{ t('basicData.total') }}: </span>
                 <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
             </QCardSection>
         </div></QDrawer
@@ -821,7 +828,7 @@ watch(
                 >
                     <VnInput
                         v-model.number="edit.price"
-                        :label="t('ticketSale.price')"
+                        :label="t('basicData.price')"
                         type="number"
                     />
                 </TicketEditManaProxy>
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index 1083393c4..03e2336eb 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -42,19 +42,19 @@ const columns = computed(() => [
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.item'),
+        label: t('basicData.item'),
         name: 'item',
         align: 'left',
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.description'),
+        label: t('basicData.description'),
         name: 'description',
         align: 'left',
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
@@ -78,7 +78,7 @@ const columns = computed(() => [
 
 const logTableColumns = computed(() => [
     {
-        label: t('ticketSaleTracking.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
@@ -92,20 +92,20 @@ const logTableColumns = computed(() => [
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.worker'),
+        label: t('expedition.worker'),
         name: 'worker',
         align: 'left',
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.state'),
+        label: t('ticketList.state'),
         name: 'state',
         field: 'state',
         align: 'left',
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.created'),
+        label: t('expedition.created'),
         name: 'created',
         field: 'created',
         align: 'left',
@@ -116,13 +116,13 @@ const logTableColumns = computed(() => [
 
 const shelvingsTableColumns = computed(() => [
     {
-        label: t('ticketSaleTracking.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         align: 'left',
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.worker'),
+        label: t('expedition.worker'),
         name: 'worker',
         align: 'left',
         sortable: true,
@@ -140,7 +140,7 @@ const shelvingsTableColumns = computed(() => [
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.created'),
+        label: t('expedition.created'),
         name: 'created',
         field: 'created',
         align: 'left',
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 47c28a422..950e6e8be 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -77,21 +77,21 @@ const getDefaultTaxClass = async () => {
 const columns = computed(() => [
     {
         name: 'description',
-        label: t('service.description'),
+        label: t('basicData.description'),
         field: (row) => row.ticketServiceTypeFk,
         sortable: true,
         align: 'left',
     },
     {
         name: 'quantity',
-        label: t('service.quantity'),
+        label: t('basicData.quantity'),
         field: (row) => row.quantity,
         sortable: true,
         align: 'left',
     },
     {
         name: 'price',
-        label: t('service.price'),
+        label: t('basicData.price'),
         field: (row) => row.price,
         sortable: true,
         align: 'left',
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 61751357c..b55043b17 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -20,6 +20,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -116,24 +117,36 @@ function toTicketUrl(section) {
                 {{ entity.nickname }}
             </div>
         </template>
-        <template #header-right>
-            <QBtnDropdown
-                ref="stateBtnDropdownRef"
-                color="black"
-                text-color="white"
-                :label="t('globals.changeState')"
-                :disable="!isEditable()"
-            >
-                <VnSelect
-                    :options="editableStates"
-                    hide-selected
-                    option-label="name"
-                    option-value="code"
-                    hide-dropdown-icon
-                    focus-on-mount
-                    @update:model-value="changeState"
-                />
-            </QBtnDropdown>
+        <template #header-right="{ entity }">
+            <div>
+                <QBtnDropdown
+                    ref="stateBtnDropdownRef"
+                    color="black"
+                    text-color="white"
+                    :label="t('globals.changeState')"
+                    :disable="!isEditable()"
+                >
+                    <VnSelect
+                        :options="editableStates"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        hide-dropdown-icon
+                        focus-on-mount
+                        @update:model-value="changeState"
+                    />
+                </QBtnDropdown>
+                <QBtn color="white" dense flat icon="more_vert" round size="md">
+                    <QTooltip>
+                        {{ t('components.cardDescriptor.moreOptions') }}
+                    </QTooltip>
+                    <QMenu>
+                        <QList>
+                            <TicketDescriptorMenu :ticket="entity" />
+                        </QList>
+                    </QMenu>
+                </QBtn>
+            </div>
         </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
@@ -141,7 +154,7 @@ function toTicketUrl(section) {
                     :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
-                <VnLv v-if="entity.ticketState" :label="t('ticket.summary.state')">
+                <VnLv v-if="entity.ticketState" :label="t('globals.state')">
                     <template #value>
                         <QBadge
                             text-color="black"
@@ -151,7 +164,7 @@ function toTicketUrl(section) {
                         </QBadge>
                     </template>
                 </VnLv>
-                <VnLv :label="t('ticket.summary.salesPerson')">
+                <VnLv :label="t('globals.salesPerson')">
                     <template #value>
                         <VnUserLink
                             :name="entity.client?.salesPersonUser?.name"
@@ -159,10 +172,7 @@ function toTicketUrl(section) {
                         />
                     </template>
                 </VnLv>
-                <VnLv
-                    :label="t('ticket.summary.agency')"
-                    :value="entity.agencyMode?.name"
-                />
+                <VnLv :label="t('globals.agency')" :value="entity.agencyMode?.name" />
                 <VnLv :label="t('ticket.summary.zone')">
                     <template #value>
                         <span class="link" @click.stop>
@@ -171,10 +181,7 @@ function toTicketUrl(section) {
                         </span>
                     </template>
                 </VnLv>
-                <VnLv
-                    :label="t('ticket.summary.warehouse')"
-                    :value="entity.warehouse?.name"
-                />
+                <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
                 <VnLv
                     v-if="ticket?.ticketCollections?.length > 0"
                     :label="t('ticket.summary.collection')"
@@ -209,10 +216,7 @@ function toTicketUrl(section) {
                         </span>
                     </template>
                 </VnLv>
-                <VnLv
-                    :label="t('ticket.summary.weight')"
-                    :value="dashIfEmpty(entity.weight)"
-                />
+                <VnLv :label="t('globals.weight')" :value="dashIfEmpty(entity.weight)" />
             </QCard>
             <QCard class="vn-one" style="flex: 2 1">
                 <VnTitle
@@ -223,10 +227,7 @@ function toTicketUrl(section) {
                     :label="t('ticket.summary.shipped')"
                     :value="toDate(entity.shipped)"
                 />
-                <VnLv
-                    :label="t('ticket.summary.landed')"
-                    :value="toDate(entity.landed)"
-                />
+                <VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
                 <VnLv :label="t('globals.packages')" :value="entity.packages" />
                 <VnLv :value="entity.address.phone">
                     <template #label>
@@ -293,11 +294,11 @@ function toTicketUrl(section) {
                 <VnTitle :text="t('ticket.summary.summaryAmount')" />
                 <div class="bodyCard">
                     <VnLv
-                        :label="t('ticket.summary.subtotal')"
+                        :label="t('globals.subtotal')"
                         :value="toCurrency(entity.totalWithoutVat)"
                     />
                     <VnLv
-                        :label="t('ticket.summary.vat')"
+                        :label="t('globals.vat')"
                         :value="toCurrency(entity.totalWithVat - entity.totalWithoutVat)"
                     />
                     <VnLv
@@ -319,12 +320,12 @@ function toTicketUrl(section) {
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width></QTh>
-                            <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.visible') }}</QTh>
+                            <QTh auto-width>{{ t('globals.item') }}</QTh>
+                            <QTh auto-width>{{ t('globals.visible') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.available') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
+                            <QTh auto-width>{{ t('globals.price') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.discount') }}</QTh>
                             <QTh auto-width>{{ t('globals.amount') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.packing') }}</QTh>
@@ -376,7 +377,7 @@ function toTicketUrl(section) {
                                     size="xs"
                                 >
                                     <QTooltip>
-                                        {{ t('ticket.summary.visible') }}:
+                                        {{ t('globals.visible') }}:
                                         {{ props.row.visible }}
                                     </QTooltip>
                                 </QIcon>
@@ -483,9 +484,9 @@ function toTicketUrl(section) {
                 <QTable :rows="ticket.packagings" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
-                            <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
+                            <QTh auto-width>{{ t('globals.created') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.package') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                         </QTr>
                     </template>
                     <template #body="props">
@@ -505,9 +506,9 @@ function toTicketUrl(section) {
                 <QTable :rows="ticket.services" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
-                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
+                            <QTh auto-width>{{ t('globals.price') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.taxClass') }}</QTh>
                             <QTh auto-width>{{ t('globals.amount') }}</QTh>
                         </QTr>
@@ -533,13 +534,13 @@ function toTicketUrl(section) {
                 <QTable :rows="ticket.requests" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
-                            <QTh auto-width>{{ t('ticket.summary.description') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
+                            <QTh auto-width>{{ t('globals.description') }}</QTh>
+                            <QTh auto-width>{{ t('globals.created') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.requester') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.attender') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
+                            <QTh auto-width>{{ t('globals.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('globals.price') }}</QTh>
+                            <QTh auto-width>{{ t('globals.item') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.ok') }}</QTh>
                         </QTr>
                     </template>
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 00b517765..f5ed03b0d 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -52,19 +52,19 @@ const paginateFilter = reactive({
 
 const columns = computed(() => [
     {
-        label: t('tracking.state'),
+        label: t('ticketList.state'),
         name: 'state',
         field: 'state',
         align: 'left',
         format: (val) => val.name,
     },
     {
-        label: t('tracking.worker'),
+        label: t('expedition.worker'),
         name: 'worker',
         align: 'left',
     },
     {
-        label: t('tracking.created'),
+        label: t('expedition.created'),
         name: 'created',
         field: 'created',
         align: 'left',
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index e1a011a84..d7aff3ef7 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -33,19 +33,19 @@ const _transfer = ref();
 
 const transferLinesColumns = computed(() => [
     {
-        label: t('ticketSale.id'),
+        label: t('ticketList.id'),
         name: 'itemFk',
         field: 'itemFk',
         align: 'left',
     },
     {
-        label: t('ticketSale.item'),
+        label: t('basicData.item'),
         name: 'item',
         field: 'concept',
         align: 'left',
     },
     {
-        label: t('ticketSale.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
@@ -54,26 +54,26 @@ const transferLinesColumns = computed(() => [
 
 const destinationTicketColumns = computed(() => [
     {
-        label: t('ticketSale.id'),
+        label: t('ticketList.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('ticketSale.shipped'),
+        label: t('ticketList.shipped'),
         name: 'item',
         field: 'shipped',
         align: 'left',
         format: (val) => toDateFormat(val),
     },
     {
-        label: t('ticketSale.agency'),
+        label: t('basicData.agency'),
         name: 'agency',
         field: 'agencyName',
         align: 'left',
     },
     {
-        label: t('ticketSale.address'),
+        label: t('basicData.address'),
         name: 'address',
         field: 'address',
         align: 'left',
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index edfe489d9..7aeeec952 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -39,7 +39,7 @@ const packingTypeVolume = ref([]);
 const columns = computed(() => [
     {
         align: 'left',
-        label: t('volume.item'),
+        label: t('basicData.item'),
         name: 'itemFk',
         chip: {
             condition: () => true,
@@ -48,7 +48,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('volume.description'),
+        label: t('basicData.description'),
         name: 'concept',
         columnClass: 'expand',
         cardVisible: true,
@@ -62,7 +62,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('volume.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         cardVisible: true,
     },
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index bdd980c07..8de602b37 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -72,7 +72,7 @@ const ticketColumns = computed(() => [
     },
     {
         align: 'left',
-        label: t('advanceTickets.state'),
+        label: t('ticketList.state'),
         name: 'state',
         headerClass: 'horizontal-separator',
         hidden: true,
diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
index 3cc486122..1c6a76e6e 100644
--- a/src/pages/Ticket/TicketCreate.vue
+++ b/src/pages/Ticket/TicketCreate.vue
@@ -134,7 +134,7 @@ const redirectToTicketList = (_, { id }) => {
                 <VnRow>
                     <div class="col">
                         <VnSelect
-                            :label="t('ticket.create.client')"
+                            :label="t('globals.client')"
                             v-model="data.clientId"
                             :options="clientOptions"
                             option-value="id"
@@ -188,7 +188,7 @@ const redirectToTicketList = (_, { id }) => {
                     <div class="col">
                         <VnInputDate
                             placeholder="dd-mm-aaa"
-                            :label="t('ticket.create.landed')"
+                            :label="t('globals.landed')"
                             v-model="data.landed"
                             @update:model-value="() => fetchAvailableAgencies(data)"
                         />
@@ -197,7 +197,7 @@ const redirectToTicketList = (_, { id }) => {
                 <VnRow>
                     <div class="col">
                         <VnSelect
-                            :label="t('ticket.create.warehouse')"
+                            :label="t('globals.warehouse')"
                             v-model="data.warehouseId"
                             :options="warehousesOptions"
                             option-value="id"
@@ -210,7 +210,7 @@ const redirectToTicketList = (_, { id }) => {
                 <VnRow>
                     <div class="col">
                         <VnSelect
-                            :label="t('ticket.create.agency')"
+                            :label="t('globals.agency')"
                             v-model="data.agencyModeId"
                             :options="agenciesOptions"
                             option-value="agencyModeFk"
diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
index 4138884bf..ba25a5744 100644
--- a/src/pages/Ticket/TicketCreateDialog.vue
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -128,7 +128,7 @@ const redirectToTicketList = (_, { id }) => {
             <VnRow>
                 <div class="col">
                     <VnSelect
-                        :label="t('ticket.create.client')"
+                        :label="t('globals.client')"
                         v-model="data.clientId"
                         url="Clients"
                         :fields="['id', 'name', 'defaultAddressFk']"
@@ -184,7 +184,7 @@ const redirectToTicketList = (_, { id }) => {
                 <div class="col">
                     <VnInputDate
                         placeholder="dd-mm-aaa"
-                        :label="t('ticket.create.landed')"
+                        :label="t('globals.landed')"
                         v-model="data.landed"
                         @update:model-value="() => fetchAvailableAgencies(data)"
                     />
@@ -193,7 +193,7 @@ const redirectToTicketList = (_, { id }) => {
             <VnRow>
                 <div class="col">
                     <VnSelect
-                        :label="t('ticket.create.warehouse')"
+                        :label="t('globals.warehouse')"
                         v-model="data.warehouseId"
                         :options="warehousesOptions"
                         option-value="id"
@@ -206,7 +206,7 @@ const redirectToTicketList = (_, { id }) => {
             <VnRow>
                 <div class="col">
                     <VnSelect
-                        :label="t('ticket.create.agency')"
+                        :label="t('globals.agency')"
                         v-model="data.agencyModeId"
                         :options="agenciesOptions"
                         option-value="agencyModeFk"
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 7f72f9862..6f1cac83b 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -47,7 +47,7 @@ const getGroupedStates = (data) => {
     />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 2078d0595..35c0f6eb2 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -95,7 +95,7 @@ const ticketColumns = computed(() => [
         columnFilter: null,
     },
     {
-        label: t('futureTickets.ticketId'),
+        label: t('advanceTickets.ticketId'),
         name: 'ticketId',
         align: 'center',
         sortable: true,
@@ -118,7 +118,7 @@ const ticketColumns = computed(() => [
         columnFilter: null,
     },
     {
-        label: t('futureTickets.ipt'),
+        label: t('advanceTickets.ipt'),
         name: 'ipt',
         field: 'ipt',
         align: 'left',
@@ -139,14 +139,14 @@ const ticketColumns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('futureTickets.state'),
+        label: t('ticketList.state'),
         name: 'state',
         align: 'left',
         sortable: true,
         columnFilter: null,
     },
     {
-        label: t('futureTickets.liters'),
+        label: t('advanceTickets.liters'),
         name: 'liters',
         field: 'liters',
         align: 'left',
@@ -162,7 +162,7 @@ const ticketColumns = computed(() => [
         },
     },
     {
-        label: t('futureTickets.import'),
+        label: t('advanceTickets.import'),
         field: 'import',
         name: 'import',
         align: 'left',
@@ -186,7 +186,7 @@ const ticketColumns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('futureTickets.futureId'),
+        label: t('advanceTickets.futureId'),
         name: 'futureId',
         align: 'left',
         sortable: true,
@@ -211,7 +211,7 @@ const ticketColumns = computed(() => [
     },
 
     {
-        label: t('futureTickets.futureIpt'),
+        label: t('advanceTickets.futureIpt'),
         name: 'futureIpt',
         field: 'futureIpt',
         align: 'left',
@@ -232,7 +232,7 @@ const ticketColumns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('futureTickets.futureState'),
+        label: t('advanceTickets.futureState'),
         name: 'futureState',
         align: 'right',
         sortable: true,
@@ -259,7 +259,7 @@ const moveTicketsFuture = async () => {
 
         let params = { tickets: ticketsToMove };
         await axios.post('Tickets/merge', params);
-        notify(t('futureTickets.moveTicketSuccess'), 'positive');
+        notify(t('advanceTickets.moveTicketSuccess'), 'positive');
         selectedTickets.value = [];
         arrayData.fetch({ append: false });
     } catch (error) {
@@ -333,14 +333,14 @@ onMounted(async () => {
                         colspan="8"
                         translate
                     >
-                        {{ t('futureTickets.origin') }}
+                        {{ t('advanceTickets.origin') }}
                     </QTh>
                     <QTh
                         class="horizontal-separator text-uppercase color-vn-label"
                         colspan="4"
                         translate
                     >
-                        {{ t('futureTickets.destination') }}
+                        {{ t('advanceTickets.destination') }}
                     </QTh>
                 </QTr>
                 <QTr>
@@ -409,7 +409,7 @@ onMounted(async () => {
                         size="xs"
                     >
                         <QTooltip>
-                            {{ t('futureTickets.noVisible') }}
+                            {{ t('ticketSale.noVisible') }}
                         </QTooltip>
                     </QIcon>
                     <QIcon
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 4317efb83..aae6f80a7 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -18,12 +18,13 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'src/components/FetchData.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
-import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
-import InvoiceOutDescriptorProxy from '../InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -40,16 +41,18 @@ from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
-
 const userParams = {
     from: null,
     to: null,
 };
-// Método para inicializar las variables desde la query string
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+    if (!route.query.createForm) return;
+    onClientSelected(JSON.parse(route.query.createForm));
+});
 const initializeFromQuery = () => {
     const query = route.query.table ? JSON.parse(route.query.table) : {};
-
-    // Asigna los valores a las variables correspondientes
     from.value = query.from || from.toISOString();
     to.value = query.to || to.toISOString();
     Object.assign(userParams, { from, to });
@@ -206,13 +209,19 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
-                isPrimary: true,
-                action: (row) => viewSummary(row.id, TicketSummary),
+                action: (row, evt) => {
+                    if (evt && evt.ctrlKey) {
+                        const url = router.resolve({
+                            params: { id: row.id },
+                            name: 'TicketCard',
+                        }).href;
+                        window.open(url, '_blank');
+                    } else viewSummary(row.id, TicketSummary);
+                },
             },
         ],
     },
 ]);
-
 function redirectToLines(id) {
     const url = `#/ticket/${id}/sale`;
     window.open(url, '_blank');
@@ -301,11 +310,6 @@ const getDateColor = (date) => {
     if (comparation < 0) return 'bg-success';
 };
 
-onMounted(() => {
-    initializeFromQuery();
-    stateStore.rightDrawer = true;
-});
-
 async function makeInvoice(ticket) {
     const ticketsIds = ticket.map((item) => item.id);
     const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, { ticketsIds });
@@ -454,24 +458,24 @@ function setReference(data) {
         auto-load
     />
     <VnSearchbar
-        data-key="Ticket"
+        data-key="TicketList"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
     />
     <RightMenu>
         <template #right-panel>
-            <TicketFilter data-key="Ticket" />
+            <TicketFilter data-key="TicketList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Ticket"
+        data-key="TicketList"
         url="Tickets/filter"
         :create="{
             urlCreate: 'Tickets/new',
             title: t('ticketList.createTicket'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
+            formInitialData: { clientId: null },
         }"
         default-mode="table"
         :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
@@ -573,17 +577,17 @@ function setReference(data) {
             </span>
         </template>
         <template #column-stateFk="{ row }">
-            <span v-if="getColor(row)">
-                <QChip :class="getColor(row)" dense square>
-                    {{ row.state }}
-                </QChip>
-            </span>
-            <span v-else-if="row.state === 'Entregado'">
+            <span v-if="row.refFk">
                 <span class="link" @click.stop>
                     {{ row.refFk }}
                     <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
                 </span>
             </span>
+            <span v-else-if="getColor(row)">
+                <QChip :class="getColor(row)" dense square>
+                    {{ row.state }}
+                </QChip>
+            </span>
             <span v-else>
                 {{ row.state }}
             </span>
@@ -615,6 +619,7 @@ function setReference(data) {
                     option-value="id"
                     option-label="name"
                     hide-selected
+                    required
                     @update:model-value="(client) => onClientSelected(data)"
                     :sort-by="'id ASC'"
                 >
@@ -641,6 +646,7 @@ function setReference(data) {
                     option-label="nickname"
                     hide-selected
                     map-options
+                    required
                     :disable="!data.clientId"
                     :sort-by="'isActive DESC'"
                     @update:model-value="() => fetchAvailableAgencies(data)"
@@ -674,7 +680,7 @@ function setReference(data) {
                 <div class="col">
                     <VnInputDate
                         placeholder="dd-mm-aaa"
-                        :label="t('ticket.create.landed')"
+                        :label="t('globals.landed')"
                         v-model="data.landed"
                         @update:model-value="() => fetchAvailableAgencies(data)"
                     />
@@ -685,12 +691,13 @@ function setReference(data) {
                     <VnSelect
                         url="Warehouses"
                         :sort-by="['name']"
-                        :label="t('ticket.create.warehouse')"
+                        :label="t('globals.warehouse')"
                         v-model="data.warehouseId"
                         :options="warehousesOptions"
                         option-value="id"
                         option-label="name"
                         hide-selected
+                        required
                         @update:model-value="() => fetchAvailableAgencies(data)"
                     />
                 </div>
@@ -698,13 +705,12 @@ function setReference(data) {
             <VnRow>
                 <div class="col">
                     <VnSelect
-                        :label="t('ticket.create.agency')"
+                        :label="t('globals.agency')"
                         v-model="data.agencyModeId"
                         :options="agenciesOptions"
                         option-value="agencyModeFk"
                         option-label="agencyMode"
                         hide-selected
-                        :disable="!data.clientId || !data.landed || !data.warehouseId"
                     />
                 </div>
             </VnRow>
@@ -840,7 +846,14 @@ function setReference(data) {
         </QTooltip>
     </QPageSticky>
 </template>
-
+<style scoped>
+.disabled,
+.disabled *,
+[disabled],
+[disabled] * {
+    cursor: pointer !important;
+}
+</style>
 <i18n>
 es:
     Search ticket: Buscar ticket
diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
index d68d18c24..05477d2fb 100644
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -47,7 +47,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'clientFk',
-        label: t('weeklyTickets.client'),
+        label: t('ticketList.client'),
         isTitle: true,
         cardVisible: true,
         component: 'select',
@@ -79,7 +79,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('weeklyTickets.agency'),
+        label: t('basicData.agency'),
         name: 'agencyModeFk',
         cardVisible: true,
         columnFilter: {
@@ -95,7 +95,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'warehouseFk',
-        label: t('weeklyTickets.warehouse'),
+        label: t('ticketList.warehouse'),
         cardVisible: true,
         columnFilter: {
             component: 'select',
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index a1f426c3c..797179c4b 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -2,16 +2,12 @@ card:
     search: Search tickets
     searchInfo: You can search by ticket id or alias
 volume:
-    item: Item
-    description: Description
     packingType: Packing Type
-    quantity: Quantity
     volumeQuantity: m³ per quantity
     type: Type
     volume: Volume
 ticketNotes:
     observationType: Observation type
-    description: Description
     removeNote: Remove note
     addNote: Add note
     observationTypes:
@@ -25,29 +21,18 @@ ticketNotes:
         DropOff: Drop Off
         Sustitución: Sustitution
 ticketSale:
-    id: Id
     visible: Visible
     available: Available
-    quantity: Quantity
-    item: Item
-    price: Price
     discount: Disc
-    amount: Amount
     packaging: Packaging
     subtotal: Subtotal
     tax: VAT
-    total: Total
     history: History
     claim: Claim
     reserved: Reserved
-    noVisible: Not visible
     hasComponentLack: Component lack
     ok: Ok
-    state: State
     more: More
-    shipped: Shipped
-    agency: Agency
-    address: Address
 advanceTickets:
     preparation: Preparation
     origin: Origin
@@ -56,7 +41,6 @@ advanceTickets:
     destinationAgency: 'Destination agency: {agency}'
     ticketId: ID
     ipt: IPT
-    state: State
     liters: Liters
     lines: Lines
     import: Import
@@ -81,17 +65,9 @@ advanceTickets:
     searchInfo: Search advance tickets by ID or client ID
 futureTickets:
     problems: Problems
-    ticketId: ID
     shipped: Date
-    ipt: IPT
-    state: State
-    liters: Liters
-    import: Import
     availableLines: Available lines
-    futureId: ID
     futureShipped: Date
-    futureIpt: IPT
-    futureState: State
     noVerified: No verified data
     noVisible: Not visible
     purchaseRequest: Purchase request
@@ -99,11 +75,8 @@ futureTickets:
     componentLack: Component lack
     rounding: Rounding
     risk: Risk
-    origin: Origin
-    destination: Destination
     moveTicketTitle: Move tickets
     moveTicketDialogSubtitle: 'Do you want to move {selectedTickets} tickets to the future?'
-    moveTicketSuccess: Tickets moved successfully!
     searchInfo: Search future tickets by date
     futureTicket: Future tickets
     FREE: Free
@@ -113,17 +86,14 @@ futureTickets:
     DELIVERED: Delivered
 expedition:
     id: Expedition
-    item: Item
     name: Name
     packageType: Package type
     counter: Counter
     externalId: external Id
     created: Created
-    state: State
     historyAction: Status log
     newTicketWithRoute: New ticket with route
     newTicketWithoutRoute: New ticket without route
-    landed: Landed
     routeId: Route id
     deleteExpedition: Delete expedition
     expeditionRemoved: Expedition removed
@@ -138,17 +108,12 @@ basicData:
     next: Next
     back: Back
     finalize: Finalize
-    client: Client
-    warehouse: Warehouse
     address: Address
     inactive: (Inactive)
     noDeliveryZoneAvailable: No delivery zone available for this landing date
     editAddress: Edit address
     alias: Alias
-    company: Company
     agency: Agency
-    zone: Zone
-    shipped: Shipped
     landed: Landed
     shippedHour: Shipped hour
     priceDifference: Price difference
@@ -172,37 +137,22 @@ basicData:
     unroutedTicket: The ticket has been unrouted
     currencyFk: Currency
 purchaseRequest:
-    id: Id
-    description: Description
-    created: Created
     requester: Requester
     atender: Atender
-    quantity: Quantity
-    price: Price
     saleFk: Item id
-    state: State
     newRequest: New request
 weeklyTickets:
     id: Ticket ID
-    client: Client
     shipment: Shipment
-    agency: Agency
-    warehouse: Warehouse
     salesperson: Salesperson
     search: Search weekly tickets
     searchInfo: Search weekly tickets by id or client id
 ticketSaleTracking:
     isChecked: Is checked
-    item: Item
-    description: Description
-    quantity: Quantity
     parking: Parking
     historyAction: Log states
     shelvingAction: Shelvings sale
     original: Original
-    worker: Worker
-    state: State
-    created: Created
     shelving: Shelving
     saleGroupDetail: sale group detail
     previousSelected: previous selected
@@ -211,40 +161,25 @@ ticketSaleTracking:
     checked: checked
 service:
     pay: Pay
-    description: Description
-    quantity: Quantity
-    price: Price
     removeService: Remove service
     newService: New service type
     addService: Add service
     quantityInfo: To create services with negative amounts mark the service on the source ticket and press the pay button.
     createRefundSuccess: 'The following refund ticket have been created: { ticketId }'
 ticketComponents:
-    item: Item
-    description: Description
-    quantity: Quantity
     serie: Serie
     components: Components
-    import: Import
-    total: Total
     baseToCommission: Base to commission
     totalWithoutVat: Total without VAT
     zoneBreakdown: Zone breakdown
-    price: Price
     bonus: Bonus
-    zone: Zone
-    volume: Volume
     theoricalCost: Theorical cost
     totalPrice: Total price
     packages: Packages
 tracking:
-    state: State
-    worker: Worker
-    created: Created
     addState: Add state
 package:
     package: Package
-    quantity: Quantity
     added: Added
     addPackage: Add package
     removePackage: Remove package
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index a13d07566..2b0bb516b 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,32 +1,22 @@
 service:
     pay: Abonar
-    description: Descripción
-    quantity: Cantidad
-    price: Precio
     removeService: Quitar servicio
     newService: Nuevo tipo de servicio
     addService: Añadir servicio
     quantityInfo: Para crear sevicios con cantidades negativas marcar servicio en el ticket origen y apretar el boton abonar.
     createRefundSuccess: 'Se ha creado siguiente ticket de abono: { ticketId }'
 tracking:
-    state: Estado
-    worker: Trabajador
-    created: Fecha creación
     addState: Añadir estado
 card:
     search: Buscar tickets
     searchInfo: Buscar tickets por identificador o alias
 volume:
-    item: Artículo
-    description: Descripción
     packingType: Encajado
-    quantity: Cantidad
     volumeQuantity: m³ por cantidad
     type: Tipo
     volume: Volumen
 ticketNotes:
     observationType: Tipo de observación
-    description: Descripción
     removeNote: Quitar nota
     addNote: Añadir nota
     observationTypes:
@@ -42,31 +32,20 @@ ticketNotes:
         Accepted: Aceptado
         Denied: Denegado
 purchaseRequest:
-    Id: Id
-    description: Descripción
-    created: Fecha creación
     requester: Solicitante
     atender: Comprador
-    quantity: Cantidad
-    price: Precio
     saleFk: Id artículo
-    state: Estado
     newRequest: Crear petición
 basicData:
     next: Siguiente
     back: Anterior
     finalize: Finalizar
-    client: Cliente
-    warehouse: Almacén
     address: Consignatario
     inactive: (Inactivo)
     noDeliveryZoneAvailable: No hay una zona de reparto disponible para la fecha de envío seleccionada
     editAddress: Editar dirección
     alias: Alias
-    company: Empresa
     agency: Agencia
-    zone: Zona
-    shipped: F. Envío
     landed: F. Entrega
     shippedHour: Hora de envío
     priceDifference: Diferencia de precio
@@ -91,10 +70,7 @@ basicData:
     currencyFk: Moneda
 weeklyTickets:
     id: ID Ticket
-    client: Cliente
     shipment: Salida
-    agency: Agencia
-    warehouse: Almacén
     salesperson: Comercial
     search: Buscar por tickets programados
     searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
@@ -106,7 +82,6 @@ advanceTickets:
     destinationAgency: 'Agencia destino: {agency}'
     ticketId: ID
     ipt: IPT
-    state: Estado
     liters: Litros
     lines: Líneas
     import: Importe
@@ -131,29 +106,17 @@ advanceTickets:
     searchInfo: Buscar tickets adelantados por el identificador o el identificador del cliente
 futureTickets:
     problems: Problemas
-    ticketId: ID
     shipped: Fecha
-    ipt: IPT
-    state: Estado
-    liters: Litros
-    import: Importe
     availableLines: Líneas disponibles
-    futureId: ID
     futureShipped: Fecha
-    futureIpt: IPT
-    futureState: Estado
     noVerified: Sin datos comprobados
-    noVisible: No visible
     purchaseRequest: Petición de compra
     clientFrozen: Cliente congelado
     risk: Riesgo
     componentLack: Faltan componentes
     rounding: Redondeo
-    origin: Origen
-    destination: Destino
     moveTicketTitle: Mover tickets
     moveTicketDialogSubtitle: '¿Desea mover {selectedTickets} tickets hacia el futuro?'
-    moveTicketSuccess: Tickets movidos correctamente
     searchInfo: Buscar tickets por fecha
     futureTicket: Tickets a futuro
     FREE: Libre
@@ -162,60 +125,41 @@ futureTickets:
     PACKED: Encajado
     DELIVERED: Servido
 ticketSale:
-    id: Id
     visible: Visible
     available: Disponible
-    quantity: Cantidad
-    item: Artículo
-    price: Precio
     discount: Dto
-    amount: Importe
     packaging: Encajado
     subtotal: Subtotal
     tax: IVA
-    total: Total
     history: Historial
     claim: Reclamación
     reserved: Reservado
     noVisible: No visible
     hasComponentLack: Faltan componentes
     ok: Ok
-    state: Estado
     more: Más
-    shipped: F. Envío
-    agency: Agencia
     address: Consignatario
+    size: Medida
 ticketComponents:
-    item: Artículo
-    description: Descripción
-    quantity: Cantidad
     serie: Serie
     components: Componentes
-    import: Importe
-    total: Total
     baseToCommission: Base comisionable
     totalWithoutVat: Total sin IVA
     zoneBreakdown: Desglose zona
-    price: Precio
     bonus: Bonificación
-    zone: Zona
-    volume: Volúmen
     theoricalCost: Porte teórico
     totalPrice: Precio total
     packages: Bultos
 expedition:
     id: Expedición
-    item: Artículo
     name: Nombre
     packageType: Embalaje
     counter: Contador
     externalId: ID externo
     created: Fecha creación
-    state: Estado
     historyAction: Historial de estados
     newTicketWithRoute: Nuevo ticket con ruta
     newTicketWithoutRoute: Nuevo ticket sin ruta
-    landed: F. entrega
     routeId: Id ruta
     deleteExpedition: Eliminar expedición
     expeditionRemoved: Expedición eliminada
@@ -228,22 +172,15 @@ expedition:
     removeExpedition: Eliminar expedición
 package:
     package: Embalaje
-    quantity: Cantidad
     added: Añadido
     addPackage: Añadir embalaje
     removePackage: Quitar embalaje
 ticketSaleTracking:
     isChecked: Comprobado
-    item: Artículo
-    description: Descripción
-    quantity: Cantidad
     parking: Parking
     historyAction: Historial estados
     shelvingAction: Carros línea
     original: Original
-    worker: Trabajador
-    state: Estado
-    created: Fecha creación
     shelving: Matrícula
     saleGroupDetail: detalle grupo líneas
     previousSelected: previa seleccionado
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index 8d6b54cc8..faf408989 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -24,9 +24,9 @@ const agenciesOptions = ref([]);
     <FormModel :url-update="`Travels/${route.params.id}`" model="Travel" auto-load>
         <template #form="{ data }">
             <VnRow>
-                <VnInput v-model="data.ref" :label="t('travel.basicData.reference')" />
+                <VnInput v-model="data.ref" :label="t('globals.reference')" />
                 <VnSelect
-                    :label="t('travel.basicData.agency')"
+                    :label="t('globals.agency')"
                     v-model="data.agencyModeFk"
                     :options="agenciesOptions"
                     option-value="id"
@@ -36,18 +36,12 @@ const agenciesOptions = ref([]);
                 />
             </VnRow>
             <VnRow>
-                <VnInputDate
-                    v-model="data.shipped"
-                    :label="t('travel.basicData.shipped')"
-                />
-                <VnInputDate
-                    v-model="data.landed"
-                    :label="t('travel.basicData.landed')"
-                />
+                <VnInputDate v-model="data.shipped" :label="t('globals.shipped')" />
+                <VnInputDate v-model="data.landed" :label="t('globals.landed')" />
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('travel.basicData.warehouseOut')"
+                    :label="t('globals.warehouseOut')"
                     v-model="data.warehouseOutFk"
                     :options="agenciesOptions"
                     option-value="id"
@@ -56,7 +50,7 @@ const agenciesOptions = ref([]);
                     hide-selected
                 />
                 <VnSelect
-                    :label="t('travel.basicData.warehouseIn')"
+                    :label="t('globals.warehouseIn')"
                     v-model="data.warehouseInFk"
                     :options="agenciesOptions"
                     option-value="id"
@@ -81,11 +75,11 @@ const agenciesOptions = ref([]);
             <VnRow>
                 <QCheckbox v-model="data.isRaid" :label="t('travel.basicData.isRaid')" />
                 <QCheckbox
-                    :label="t('travel.basicData.delivered')"
+                    :label="t('travel.summary.delivered')"
                     v-model="data.isDelivered"
                 />
                 <QCheckbox
-                    :label="t('travel.basicData.received')"
+                    :label="t('travel.summary.received')"
                     v-model="data.isReceived"
                 />
             </VnRow>
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 1f68cb21a..4d4b7c5f2 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -43,8 +43,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
             <TravelDescriptorMenuItems :travel="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('globals.wareHouseIn')" :value="entity.warehouseIn?.name" />
-            <VnLv :label="t('globals.wareHouseOut')" :value="entity.warehouseOut?.name" />
+            <VnLv :label="t('globals.warehouseIn')" :value="entity.warehouseIn.name" />
+            <VnLv :label="t('globals.warehouseOut')" :value="entity.warehouseOut.name" />
             <VnLv :label="t('globals.shipped')" :value="toDate(entity.shipped)" />
             <VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
             <VnLv :label="t('globals.totalEntries')" :value="entity.totalEntries" />
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 6c98d18b8..ed0c7e75d 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -33,7 +33,7 @@ const warehouses = ref([]);
 const entriesTableColumns = computed(() => {
     return [
         {
-            label: t('travel.summary.confirmed'),
+            label: t('globals.confirmed'),
             field: 'isConfirmed',
             name: 'isConfirmed',
             align: 'left',
@@ -110,7 +110,7 @@ const entriesTableColumns = computed(() => {
 const thermographsTableColumns = computed(() => {
     return [
         {
-            label: t('travel.thermographs.code'),
+            label: t('globals.code'),
             field: 'thermographFk',
             name: 'thermographFk',
             align: 'left',
@@ -136,7 +136,7 @@ const thermographsTableColumns = computed(() => {
             format: (val) => (val ? `${val}°` : ''),
         },
         {
-            label: t('travel.thermographs.state'),
+            label: t('globals.state'),
             field: 'result',
             name: 'result',
             align: 'left',
@@ -150,7 +150,7 @@ const thermographsTableColumns = computed(() => {
                 warehouses.value.find((warehouse) => warehouse.id === val)?.name,
         },
         {
-            label: t('travel.thermographs.created'),
+            label: t('globals.created'),
             field: 'created',
             name: 'created',
             align: 'left',
@@ -265,7 +265,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 </QCardSection>
                 <VnLv :label="t('globals.shipped')" :value="toDate(travel.shipped)" />
                 <VnLv
-                    :label="t('globals.wareHouseOut')"
+                    :label="t('globals.warehouseOut')"
                     :value="travel.warehouseOut?.name"
                 />
                 <QCheckbox
@@ -288,7 +288,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 </QCardSection>
                 <VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" />
                 <VnLv
-                    :label="t('globals.wareHouseIn')"
+                    :label="t('globals.warehouseIn')"
                     :value="travel.warehouseIn?.name"
                 />
                 <VnLv
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index e308243e3..d08f917c1 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -19,7 +19,7 @@ const router = useRouter();
 const { t } = useI18n();
 const { notify } = useNotify();
 
-const thermographPaginateRef = ref(null);
+const thermographPaginateRef = ref();
 const warehouses = ref([]);
 
 const thermographFilter = {
@@ -36,7 +36,7 @@ const thermographFilter = {
 const TableColumns = computed(() => {
     return [
         {
-            label: t('travel.thermographs.code'),
+            label: t('globals.code'),
             field: 'thermographFk',
             name: 'thermographFk',
             align: 'left',
@@ -62,7 +62,7 @@ const TableColumns = computed(() => {
             format: (val) => (val ? `${val}°` : ''),
         },
         {
-            label: t('travel.thermographs.state'),
+            label: t('globals.state'),
             field: 'result',
             name: 'result',
             align: 'left',
@@ -76,7 +76,7 @@ const TableColumns = computed(() => {
                 warehouses.value.find((warehouse) => warehouse.id === val)?.name,
         },
         {
-            label: t('travel.thermographs.created'),
+            label: t('globals.created'),
             field: 'created',
             name: 'created',
             align: 'left',
@@ -145,7 +145,6 @@ const removeThermograph = async (id) => {
         data-key="TravelThermographs"
         url="TravelThermographs"
         :filter="thermographFilter"
-        :params="{ travelFk: id }"
         auto-load
     >
         <template #body="{ rows }">
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index f56ef1eda..e89ed7032 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -205,6 +205,7 @@ const onThermographCreated = async (data) => {
                         }"
                         sort-by="thermographFk ASC"
                         option-label="thermographFk"
+                        option-filter-value="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
                         :roles-allowed-to-create="['logistic']"
@@ -217,16 +218,16 @@ const onThermographCreated = async (data) => {
                     </VnSelectDialog>
                     <VnInput
                         v-model="thermographForm.state"
-                        :label="t('travel.thermographs.state')"
+                        :label="t('globals.state')"
                     />
                 </VnRow>
                 <VnRow>
                     <VnInput
                         v-model="thermographForm.reference"
-                        :label="t('travel.thermographs.reference')"
+                        :label="t('globals.reference')"
                     />
                     <VnSelect
-                        :label="t('travel.thermographs.type')"
+                        :label="t('globals.type')"
                         v-model="thermographForm.dmsTypeId"
                         :options="dmsTypesOptions"
                         option-value="id"
@@ -235,14 +236,14 @@ const onThermographCreated = async (data) => {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('travel.thermographs.company')"
+                        :label="t('globals.company')"
                         v-model="thermographForm.companyId"
                         :options="companiesOptions"
                         option-value="id"
                         option-label="code"
                     />
                     <VnSelect
-                        :label="t('travel.thermographs.warehouse')"
+                        :label="t('globals.warehouse')"
                         v-model="thermographForm.warehouseId"
                         :options="warehousesOptions"
                         option-value="id"
@@ -280,7 +281,7 @@ const onThermographCreated = async (data) => {
                 <VnRow>
                     <QFile
                         ref="inputFileRef"
-                        :label="t('travel.thermographs.file')"
+                        :label="t('globals.file')"
                         multiple
                         :accept="allowedContentTypes"
                         v-model="thermographForm.files"
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 4dc7eb052..d45fae5a6 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -220,7 +220,7 @@ const columns = computed(() => [
         sortable: true,
     },
     {
-        label: t('globals.wareHouseOut'),
+        label: t('globals.warehouseOut'),
         field: 'warehouseOutName',
         name: 'warehouseOutName',
         align: 'left',
@@ -237,7 +237,7 @@ const columns = computed(() => [
         format: (value) => toDate(value),
     },
     {
-        label: t('globals.wareHouseIn'),
+        label: t('globals.wareHhuseIn'),
         field: 'warehouseInName',
         name: 'warehouseInName',
         align: 'left',
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 6fb3274e4..72c34aad8 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -74,7 +74,7 @@ const redirectToTravelBasicData = (_, { id }) => {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('globals.wareHouseOut')"
+                        :label="t('globals.warehouseOut')"
                         v-model="data.warehouseOutFk"
                         :options="warehousesOptions"
                         option-value="id"
@@ -82,7 +82,7 @@ const redirectToTravelBasicData = (_, { id }) => {
                         hide-selected
                     />
                     <VnSelect
-                        :label="t('globals.wareHouseIn')"
+                        :label="t('globals.warehouseIn')"
                         v-model="data.warehouseInFk"
                         :options="warehousesOptions"
                         option-value="id"
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index c91146257..1ac83b9e0 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -24,7 +24,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="warehouses" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index d6dfd0368..852003a95 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -52,7 +52,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
-        label: t('travel.travelList.tableVisibleColumns.id'),
+        label: t('globals.id'),
         isId: true,
         cardVisible: true,
     },
@@ -70,7 +70,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'agencyModeFk',
-        label: t('travel.travelList.tableVisibleColumns.agency'),
+        label: t('globals.agency'),
         component: 'select',
         attrs: {
             url: 'agencyModes',
@@ -86,7 +86,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'warehouseInFk',
-        label: t('travel.travelList.tableVisibleColumns.warehouseIn'),
+        label: t('globals.warehouseIn'),
         component: 'select',
         attrs: {
             url: 'warehouses',
@@ -104,7 +104,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'shipped',
-        label: t('travel.travelList.tableVisibleColumns.shipped'),
+        label: t('globals.shipped'),
         component: 'date',
         columnField: {
             component: null,
@@ -122,7 +122,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'warehouseOutFk',
-        label: t('travel.travelList.tableVisibleColumns.warehouseOut'),
+        label: t('globals.warehouseOut'),
         component: 'select',
         attrs: {
             url: 'warehouses',
@@ -138,7 +138,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'landed',
-        label: t('travel.travelList.tableVisibleColumns.landed'),
+        label: t('globals.landed'),
         component: 'date',
         columnField: {
             component: null,
diff --git a/src/pages/Wagon/Type/WagonTypeEdit.vue b/src/pages/Wagon/Type/WagonTypeEdit.vue
index eb8205d72..3de115fc0 100644
--- a/src/pages/Wagon/Type/WagonTypeEdit.vue
+++ b/src/pages/Wagon/Type/WagonTypeEdit.vue
@@ -95,7 +95,7 @@ watch(
                     <VnInput
                         filled
                         v-model="data.name"
-                        :label="t('wagon.type.name')"
+                        :label="t('globals.name')"
                         :rules="[(val) => !!val || t('wagon.warnings.nameNotEmpty')]"
                     />
                     <QCheckbox
diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
index 411c36632..ac2aab6ce 100644
--- a/src/pages/Wagon/WagonCreate.vue
+++ b/src/pages/Wagon/WagonCreate.vue
@@ -103,7 +103,7 @@ function filterType(val, update) {
                     <VnInput
                         filled
                         v-model="wagon.plate"
-                        :label="t('wagon.create.plate')"
+                        :label="t('wagon.list.plate')"
                         :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
                     />
                 </div>
@@ -111,12 +111,10 @@ function filterType(val, update) {
                     <QInput
                         filled
                         v-model="wagon.volume"
-                        :label="t('wagon.create.volume')"
+                        :label="t('wagon.list.volume')"
                         type="number"
                         min="0"
-                        :rules="[
-                            (val) => !!val || t('wagon.warnings.volumeNotEmpty'),
-                        ]"
+                        :rules="[(val) => !!val || t('wagon.warnings.volumeNotEmpty')]"
                     />
                     <QSelect
                         filled
@@ -129,7 +127,7 @@ function filterType(val, update) {
                         option-value="id"
                         emit-value
                         map-options
-                        :label="t('wagon.create.type')"
+                        :label="t('globals.type')"
                         :options="filteredWagonTypes"
                         :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
                         @filter="filterType"
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 02e3b6d16..893b058ea 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -46,7 +46,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'name',
-        label: t('wagon.list.type'),
+        label: t('globals.type'),
         cardVisible: true,
         format: (row) => row?.type?.name,
     },
@@ -123,13 +123,13 @@ async function remove(row) {
                 <VnInput
                     filled
                     v-model="data.plate"
-                    :label="t('wagon.create.plate')"
+                    :label="t('wagon.list.plate')"
                     :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
                 />
                 <VnInput
                     filled
                     v-model="data.volume"
-                    :label="t('wagon.create.volume')"
+                    :label="t('wagon.list.volume')"
                     type="number"
                     min="0"
                     :rules="[(val) => !!val || t('wagon.warnings.volumeNotEmpty')]"
@@ -146,7 +146,7 @@ async function remove(row) {
                     option-value="id"
                     emit-value
                     map-options
-                    :label="t('wagon.create.type')"
+                    :label="t('globals.type')"
                     :options="filteredWagonTypes"
                     :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
                     @filter="filterType"
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 428731a5c..d66bd2608 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -14,6 +14,7 @@ import WorkerFilter from '../WorkerFilter.vue';
             url: 'Workers/filter',
             label: 'Search worker',
             info: 'You can search by worker id or name',
+            order: 'id DESC',
         }"
         :redirect-on-error="true"
     />
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index e3eb9ab82..9112d1d00 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -143,9 +143,9 @@ const handlePhotoUpdated = (evt = false) => {
             </div>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('worker.card.user')" :value="entity.user?.name" />
+            <VnLv :label="t('globals.user')" :value="entity.user?.name" />
             <VnLv
-                :label="t('worker.card.email')"
+                :label="t('globals.params.email')"
                 :value="entity.user?.emailUser?.email"
                 copy
             />
@@ -155,7 +155,7 @@ const handlePhotoUpdated = (evt = false) => {
             />
             <VnLv :value="entity.phone">
                 <template #label>
-                    {{ t('worker.card.phone') }}
+                    {{ t('globals.phone') }}
                     <VnLinkPhone :phone-number="entity.phone" />
                 </template>
             </VnLv>
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 596691d2e..6fd5a4eae 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -77,7 +77,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'amount',
-        label: t('worker.formation.tableVisibleColumns.amount'),
+        label: t('globals.amount'),
         component: 'input',
         field: 'amount',
         create: true,
diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index 9620c23c2..c220df76a 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -12,7 +12,7 @@ const columns = [
     {
         align: 'left',
         name: 'date',
-        label: t('worker.medical.tableVisibleColumns.date'),
+        label: t('globals.date'),
         create: true,
         component: 'date',
     },
@@ -47,7 +47,7 @@ const columns = [
     {
         align: 'left',
         name: 'amount',
-        label: t('worker.medical.tableVisibleColumns.amount'),
+        label: t('globals.amount'),
         create: true,
         component: 'input',
     },
diff --git a/src/pages/Worker/Card/WorkerNotificationsManager.vue b/src/pages/Worker/Card/WorkerNotificationsManager.vue
index d6e87f352..27c71e6d4 100644
--- a/src/pages/Worker/Card/WorkerNotificationsManager.vue
+++ b/src/pages/Worker/Card/WorkerNotificationsManager.vue
@@ -70,7 +70,7 @@ function setNotifications(data) {
         :default-reset="false"
         :default-remove="false"
         :default-save="false"
-        @on-fetch="setNotifications"
+        @on-fetch="(data) => data && setNotifications(data)"
         search-url="notifications"
     >
         <template #body>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 0a0694fdf..93866b79f 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -44,8 +44,8 @@ onBeforeMount(async () => {
         </template>
         <template #body="{ entity: worker }">
             <QCard class="vn-one">
-                <VnTitle :url="basicDataUrl" :text="t('worker.summary.basicData')" />
-                <VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
+                <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
+                <VnLv :label="t('globals.name')" :value="worker.user?.nickname" />
                 <VnLv :label="t('worker.list.department')">
                     <template #value>
                         <span class="link" v-text="worker.department?.department?.name" />
@@ -83,7 +83,7 @@ onBeforeMount(async () => {
                 </VnLv>
             </QCard>
             <QCard class="vn-one" v-if="advancedSummary">
-                <VnTitle :url="basicDataUrl" :text="t('worker.summary.basicData')" />
+                <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
                 <VnLv
                     :label="t('worker.summary.fiDueDate')"
                     :value="toDate(worker.fiDueDate)"
@@ -117,9 +117,9 @@ onBeforeMount(async () => {
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('worker.summary.userData')" />
-                <VnLv :label="t('worker.card.name')" :value="worker?.user?.nickname" />
+                <VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
                 <VnLv
-                    :label="t('worker.list.email')"
+                    :label="t('globals.params.email')"
                     :value="worker.user?.emailUser?.email"
                     copy
                 />
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index b51209879..5676837dd 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -111,7 +111,7 @@ async function autofillBic(worker) {
                 <VnRow>
                     <VnInput
                         v-model="data.firstName"
-                        :label="t('worker.create.name')"
+                        :label="t('globals.name')"
                         :rules="validate('Worker.firstName')"
                         @update:model-value="generateCodeUser(data)"
                     />
@@ -141,7 +141,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('worker.create.company')"
+                        :label="t('globals.company')"
                         v-model="data.companyFk"
                         :options="companiesOptions"
                         option-value="id"
@@ -150,7 +150,7 @@ async function autofillBic(worker) {
                         :rules="validate('Worker.company')"
                     />
                     <VnSelect
-                        :label="t('worker.create.boss')"
+                        :label="t('worker.summary.boss')"
                         v-model="data.bossFk"
                         url="Workers/search"
                         option-value="id"
@@ -185,7 +185,7 @@ async function autofillBic(worker) {
                     />
                     <VnInput
                         v-model="data.phone"
-                        :label="t('worker.create.phone')"
+                        :label="t('globals.phone')"
                         :rules="validate('Worker.phone')"
                         :disable="formData.isFreelance"
                     />
@@ -201,7 +201,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnInput
-                        :label="t('worker.create.street')"
+                        :label="t('globals.street')"
                         v-model="data.street"
                         :rules="validate('Worker.street')"
                         :disable="formData.isFreelance"
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 022cecdc6..02bea0231 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -233,7 +233,7 @@ async function autofillBic(worker) {
                     <VnInput
                         next
                         v-model="data.firstName"
-                        :label="t('worker.create.name')"
+                        :label="t('globals.name')"
                         @update:model-value="generateCodeUser(data)"
                     />
                     <VnInput
@@ -253,7 +253,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('worker.create.company')"
+                        :label="t('globals.company')"
                         v-model="data.companyFk"
                         :options="companiesOptions"
                         option-value="id"
@@ -261,7 +261,7 @@ async function autofillBic(worker) {
                         hide-selected
                     />
                     <VnSelect
-                        :label="t('worker.create.boss')"
+                        :label="t('worker.summary.boss')"
                         v-model="data.bossFk"
                         url="Workers/search"
                         option-value="id"
@@ -290,7 +290,7 @@ async function autofillBic(worker) {
                     />
                     <VnInput
                         v-model="data.phone"
-                        :label="t('worker.create.phone')"
+                        :label="t('globals.phone')"
                         :disable="data.isFreelance"
                     />
                 </VnRow>
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index d61c61abf..8ad25b80f 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -20,12 +20,13 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
 <template>
     <VnCard
         data-key="zone"
-        base-url="Zones"
+        :base-url="notIsLocations('Zones', undefined)"
         :descriptor="ZoneDescriptor"
-        :filter-panel="ZoneFilterPanel"
-        :search-data-key="notIsLocations('ZoneList', 'ZoneLocations')"
+        :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
+        :search-data-key="notIsLocations('ZoneList', undefined)"
+        :custom-url="`Zones/${route.params?.id}/getLeaves`"
         :searchbar-props="{
-            url: 'Zones',
+            url: notIsLocations('Zones', 'ZoneLocations'),
             label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),
             info: t('list.searchInfo'),
             whereFilter: notIsLocations((value) => {
diff --git a/src/pages/Zone/Card/ZoneCreateWarehouse.vue b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
index 86c4dcc72..a46ec2e6c 100644
--- a/src/pages/Zone/Card/ZoneCreateWarehouse.vue
+++ b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
@@ -32,7 +32,7 @@ const warehousesOptions = ref([]);
             <VnRow>
                 <div class="col">
                     <VnSelect
-                        :label="t('warehouses.warehouse')"
+                        :label="t('list.warehouse')"
                         v-model="ZoneWarehouseFormData.warehouseFk"
                         :options="warehousesOptions"
                         option-value="id"
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 04fb22ba5..f991818fb 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -57,11 +57,11 @@ const setData = (entity) => {
             <ZoneDescriptorMenuItems :zone="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('summary.agency')" :value="entity.agencyMode.name" />
-            <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(entity.hour)" />
-            <VnLv :label="t('summary.travelingDays')" :value="entity.travelingDays" />
-            <VnLv :label="t('summary.price')" :value="toCurrency(entity.price)" />
-            <VnLv :label="t('summary.bonus')" :value="toCurrency(entity.bonus)" />
+            <VnLv :label="t('list.agency')" :value="entity.agencyMode.name" />
+            <VnLv :label="t('zone.closing')" :value="toTimeFormat(entity.hour)" />
+            <VnLv :label="t('zone.travelingDays')" :value="entity.travelingDays" />
+            <VnLv :label="t('list.price')" :value="toCurrency(entity.price)" />
+            <VnLv :label="t('zone.bonus')" :value="toCurrency(entity.bonus)" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 215c12f46..72c02a5cd 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -186,8 +186,8 @@ onMounted(() => {
                 class="q-mr-sm"
                 @click="
                     openConfirmationModal(
-                        t('eventsPanel.deleteTitle'),
-                        t('eventsPanel.deleteSubtitle'),
+                        t('zone.deleteTitle'),
+                        t('zone.deleteSubtitle'),
                         () => deleteEvent()
                     )
                 "
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index 66e41607f..8b1645426 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -153,7 +153,7 @@ onMounted(() => {
                 <div class="col flex justify-center">
                     <VnInputDate
                         v-if="inclusionType === 'day'"
-                        :label="t('eventsInclusionForm.day')"
+                        :label="t('eventsExclusionForm.day')"
                         v-model="eventInclusionFormData.dated"
                         class="full-width"
                     />
@@ -176,11 +176,11 @@ onMounted(() => {
             <VnRow>
                 <VnInputTime
                     v-model="eventInclusionFormData.hour"
-                    :label="t('eventsInclusionForm.closing')"
+                    :label="t('zone.closing')"
                 />
                 <VnInput
                     v-model="eventInclusionFormData.travelingDays"
-                    :label="t('eventsInclusionForm.travelingDays')"
+                    :label="t('zone.travelingDays')"
                     type="number"
                     min="0"
                 />
@@ -188,13 +188,13 @@ onMounted(() => {
             <VnRow>
                 <VnInput
                     v-model="eventInclusionFormData.price"
-                    :label="t('eventsInclusionForm.price')"
+                    :label="t('list.price')"
                     type="number"
                     min="0"
                 />
                 <VnInput
                     v-model="eventInclusionFormData.bonus"
-                    :label="t('eventsInclusionForm.bonus')"
+                    :label="t('zone.bonus')"
                     type="number"
                     min="0"
                 />
@@ -202,7 +202,7 @@ onMounted(() => {
             <VnRow>
                 <VnInput
                     v-model="eventInclusionFormData.m3Max"
-                    :label="t('eventsInclusionForm.m3Max')"
+                    :label="t('zone.m3Max')"
                     type="number"
                     min="0"
                 />
@@ -224,8 +224,8 @@ onMounted(() => {
                 class="q-mr-sm"
                 @click="
                     openConfirmationModal(
-                        t('eventsPanel.deleteTitle'),
-                        t('eventsPanel.deleteSubtitle'),
+                        t('zone.deleteTitle'),
+                        t('zone.deleteSubtitle'),
                         () => deleteEvent()
                     )
                 "
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index 2cfa98246..55bc27ebe 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -150,31 +150,31 @@ onMounted(async () => {
                         </span>
                     </div>
                     <span class="color-vn-label">
-                        {{ t('eventsPanel.closing') }}:
+                        {{ t('zone.closing') }}:
                         <span class="color-vn-text q-ml-xs">
                             {{ dashIfEmpty(toTimeFormat(event.hour)) }}
                         </span>
                     </span>
                     <span class="color-vn-label">
-                        {{ t('eventsPanel.travelingDays') }}:
+                        {{ t('zone.travelingDays') }}:
                         <span class="color-vn-text">
                             {{ dashIfEmpty(event.travelingDays) }}
                         </span>
                     </span>
                     <span class="color-vn-label">
-                        {{ t('eventsPanel.price') }}:
+                        {{ t('list.price') }}:
                         <span class="color-vn-text">
                             {{ dashOrCurrency(event.price)() }}</span
                         >
                     </span>
                     <span class="color-vn-label">
-                        {{ t('eventsPanel.bonus') }}:
+                        {{ t('zone.bonus') }}:
                         <span class="color-vn-text">
                             {{ dashOrCurrency(event.bonus)() }}</span
                         >
                     </span>
                     <span class="color-vn-label">
-                        {{ t('eventsPanel.m3Max') }}:
+                        {{ t('zone.m3Max') }}:
                         <span class="color-vn-text"> {{ dashIfEmpty(event.m3Max) }}</span>
                     </span>
                 </QItemSection>
@@ -187,8 +187,8 @@ onMounted(async () => {
                         color="primary"
                         @click.stop="
                             openConfirmationModal(
-                                t('eventsPanel.deleteTitle'),
-                                t('eventsPanel.deleteSubtitle'),
+                                t('zone.deleteTitle'),
+                                t('zone.deleteSubtitle'),
                                 () => deleteEvent(event.id)
                             )
                         "
diff --git a/src/pages/Zone/Card/ZoneLocations.vue b/src/pages/Zone/Card/ZoneLocations.vue
index f357e9e5b..321748f00 100644
--- a/src/pages/Zone/Card/ZoneLocations.vue
+++ b/src/pages/Zone/Card/ZoneLocations.vue
@@ -23,7 +23,7 @@ const onSelected = async (val, node) => {
 <template>
     <QPage class="column items-center q-pa-md">
         <QCard class="full-width q-pa-md" style="max-width: 800px">
-            <ZoneLocationsTree :root-label="t('zoneLocations.locations')">
+            <ZoneLocationsTree :root-label="t('zone.pageTitles.locations')">
                 <template #content="{ node }">
                     <span v-if="!node.id">{{ node.name }}</span>
                     <QCheckbox
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 6b3934df7..b0a97b2f6 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -5,6 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const props = defineProps({
     rootLabel: {
@@ -33,22 +34,23 @@ const state = useState();
 const treeRef = ref();
 const expanded = ref([]);
 
-const arrayData = useArrayData('ZoneLocations', {
-    url: `Zones/${route.params.id}/getLeaves`,
+const datakey = 'ZoneLocations';
+const url = computed(() => `Zones/${route.params.id}/getLeaves`);
+const arrayData = useArrayData(datakey, {
+    url: url.value,
 });
 const { store } = arrayData;
 const storeData = computed(() => store.data);
 
-const nodes = ref([
-    {
-        id: null,
-        name: props.rootLabel,
-        sons: true,
-        tickable: false,
-        noTick: true,
-        children: [{}],
-    },
-]);
+const defaultNode = {
+    id: null,
+    name: props.rootLabel,
+    sons: true,
+    tickable: false,
+    noTick: true,
+    children: [{}],
+};
+const nodes = ref([defaultNode]);
 
 const _tickedNodes = computed({
     get: () => props.tickedNodes,
@@ -128,6 +130,7 @@ function getNodeIds(node) {
 
 watch(storeData, async (val) => {
     // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
+    if (!nodes.value[0]) nodes.value = [defaultNode];
     nodes.value[0].childs = [...val];
     const fetchedNodeKeys = val.flatMap(getNodeIds);
     state.set('Tree', [...fetchedNodeKeys]);
@@ -193,6 +196,7 @@ onUnmounted(() => {
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
         </template>
     </VnInput>
+    <VnSearchbar :data-key="datakey" :url="url" :redirect="false" />
     <QTree
         ref="treeRef"
         :nodes="nodes"
diff --git a/src/pages/Zone/Card/ZoneSearchbar.vue b/src/pages/Zone/Card/ZoneSearchbar.vue
index 06168eb62..f7a59e97f 100644
--- a/src/pages/Zone/Card/ZoneSearchbar.vue
+++ b/src/pages/Zone/Card/ZoneSearchbar.vue
@@ -26,7 +26,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="Zones"
+        data-key="ZonesList"
         url="Zones"
         :filter="{
             include: { relation: 'agencyMode', scope: { fields: ['name'] } },
diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index d46282c10..384ee1fe9 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -40,7 +40,7 @@ const filter = computed(() => {
 
 const columns = computed(() => [
     {
-        label: t('summary.name'),
+        label: t('list.name'),
         name: 'name',
         field: 'warehouse',
         align: 'left',
@@ -82,22 +82,22 @@ onMounted(async () => {
         <template #body="{ entity: zone }">
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
-                <VnLv :label="t('summary.agency')" :value="zone.agencyMode?.name" />
-                <VnLv :label="t('summary.price')" :value="toCurrency(zone.price)" />
-                <VnLv :label="t('summary.bonus')" :value="toCurrency(zone.bonus)" />
+                <VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
+                <VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
+                <VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
                 <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(zone.hour)" />
-                <VnLv :label="t('summary.travelingDays')" :value="zone.travelingDays" />
+                <VnLv :label="t('zone.travelingDays')" :value="zone.travelingDays" />
                 <QCheckbox
-                    :label="t('summary.volumetric')"
+                    :label="t('zone.volumetric')"
                     v-model="zone.isVolumetric"
                     :disable="true"
                 />
             </QCard>
             <QCard class="full-width">
-                <VnTitle :url="zoneUrl + `warehouses`" :text="t('summary.warehouse')" />
+                <VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
                 <QTable
                     :columns="columns"
                     :rows="warehouses"
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 98e446797..d3b1d7a1c 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -82,14 +82,14 @@ const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
                                         color="primary"
                                         @click="
                                             openConfirmationModal(
-                                                t('warehouses.deleteTitle'),
-                                                t('warehouses.deleteSubtitle'),
+                                                t('zone.deleteTitle'),
+                                                t('zone.deleteSubtitle'),
                                                 () => deleteWarehouse(row, rows, rowIndex)
                                             )
                                         "
                                     >
                                         <QTooltip>
-                                            {{ t('warehouses.delete') }}
+                                            {{ t('eventsPanel.delete') }}
                                         </QTooltip>
                                     </QIcon>
                                 </QTd>
diff --git a/src/pages/Zone/ZoneClosingTable.vue b/src/pages/Zone/ZoneClosingTable.vue
index ce0c91af7..049f82271 100644
--- a/src/pages/Zone/ZoneClosingTable.vue
+++ b/src/pages/Zone/ZoneClosingTable.vue
@@ -23,28 +23,28 @@ defineProps({
 
 const columns = computed(() => [
     {
-        label: t('zoneClosingTable.id'),
+        label: t('list.id'),
         name: 'id',
         field: 'id',
         sortable: true,
         align: 'left',
     },
     {
-        label: t('zoneClosingTable.name'),
+        label: t('list.name'),
         name: 'name',
         field: 'name',
         sortable: true,
         align: 'left',
     },
     {
-        label: t('zoneClosingTable.agency'),
+        label: t('list.agency'),
         name: 'agency',
         field: 'agencyModeName',
         sortable: true,
         align: 'left',
     },
     {
-        label: t('zoneClosingTable.closing'),
+        label: t('zone.closing'),
         name: 'close',
         field: 'hour',
         sortable: true,
@@ -52,7 +52,7 @@ const columns = computed(() => [
         format: (val) => toTimeFormat(val),
     },
     {
-        label: t('zoneClosingTable.price'),
+        label: t('list.price'),
         name: 'price',
         field: 'price',
         sortable: true,
@@ -73,7 +73,7 @@ const redirectToZoneSummary = (id) => {
 <template>
     <div>
         <div class="header">
-            <span>{{ t('zoneClosingTable.zones') }}</span>
+            <span>{{ t('zone.pageTitles.zones') }}</span>
         </div>
         <QTable
             :rows="rows"
diff --git a/src/pages/Zone/ZoneCreate.vue b/src/pages/Zone/ZoneCreate.vue
index 7d7fa24a3..6db83c51d 100644
--- a/src/pages/Zone/ZoneCreate.vue
+++ b/src/pages/Zone/ZoneCreate.vue
@@ -54,13 +54,13 @@ const redirectToZoneLocations = (_, { id }) => {
                 <VnRow>
                     <VnInput
                         v-model="data.name"
-                        :label="t('create.name')"
+                        :label="t('list.name')"
                         :required="true"
                     />
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('create.warehouse')"
+                        :label="t('list.warehouse')"
                         :options="warehousesOptions"
                         hide-selected
                         option-label="name"
@@ -68,7 +68,7 @@ const redirectToZoneLocations = (_, { id }) => {
                         v-model="data.warehouseFk"
                     />
                     <VnSelect
-                        :label="t('create.agency')"
+                        :label="t('list.agency')"
                         :options="agencyOptions"
                         hide-selected
                         option-label="name"
@@ -80,7 +80,7 @@ const redirectToZoneLocations = (_, { id }) => {
                 <VnRow>
                     <VnInput
                         v-model="data.travelingDays"
-                        :label="t('create.travelingDays')"
+                        :label="t('zone.travelingDays')"
                         type="number"
                         min="0"
                     />
@@ -90,20 +90,20 @@ const redirectToZoneLocations = (_, { id }) => {
                 <VnRow>
                     <VnInput
                         v-model="data.price"
-                        :label="t('create.price')"
+                        :label="t('list.price')"
                         type="number"
                         min="0"
                     />
                     <VnInput
                         v-model="data.bonus"
-                        :label="t('create.bonus')"
+                        :label="t('zone.bonus')"
                         type="number"
                         min="0"
                     />
                 </VnRow>
                 <VnRow>
                     <QCheckbox
-                        :label="t('create.volumetric')"
+                        :label="t('zone.volumetric')"
                         v-model="data.isVolumetric"
                         :toggle-indeterminate="false"
                     />
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 7667f60dc..255c891a1 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -105,11 +105,14 @@ watch(
                 <template #option="{ itemProps, opt }">
                     <QItem v-bind="itemProps">
                         <QItemSection v-if="opt.code">
-                            <QItemLabel>{{ opt.code }}</QItemLabel>
-                            <QItemLabel caption
-                                >{{ opt.town?.province?.name }},
-                                {{ opt.town?.province?.country?.name }}</QItemLabel
-                            >
+                            <QItemLabel>
+                                {{ `${opt.code}, ${opt.town?.name}` }}
+                            </QItemLabel>
+                            <QItemLabel caption>
+                                {{
+                                    `${opt.town?.province?.name}, ${opt.town?.province?.country?.name}`
+                                }}
+                            </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>
@@ -117,7 +120,7 @@ watch(
             <VnSelect
                 data-key="delivery"
                 v-if="deliveryMethodFk == 'delivery'"
-                :label="t('deliveryPanel.agency')"
+                :label="t('list.agency')"
                 v-model="formData.agencyModeFk"
                 url="AgencyModes/isActive"
                 :fields="['id', 'name']"
@@ -132,7 +135,7 @@ watch(
             />
             <VnSelect
                 v-else
-                :label="t('deliveryPanel.warehouse')"
+                :label="t('list.warehouse')"
                 v-model="formData.agencyModeFk"
                 url="AgencyModes/isActive"
                 :fields="['id', 'name']"
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 25c55d75c..55d21756d 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -22,12 +22,16 @@ const agencies = ref([]);
 </script>
 
 <template>
-    <FetchData url="agencies" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData
+        url="AgencyModes"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (agencies = data)"
+        auto-load
+    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
-        search-url="table"
     >
         <template #tags="{ tag }">
             <div class="q-gutter-x-xs">
@@ -38,11 +42,7 @@ const agencies = ref([]);
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('filterPanel.name')"
-                        v-model="params.name"
-                        is-outlined
-                    />
+                    <VnInput :label="t('list.name')" v-model="params.name" is-outlined />
                 </QItemSection>
             </QItem>
             <QItem>
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 89f2dd42c..357ef871e 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -73,6 +73,7 @@ const columns = computed(() => [
             inWhere: true,
             attrs: {
                 url: 'AgencyModes',
+                fields: ['id', 'name'],
             },
         },
         columnField: {
@@ -138,12 +139,12 @@ onMounted(() => (stateStore.rightDrawer = true));
     <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
-            <ZoneFilterPanel data-key="Zones" />
+            <ZoneFilterPanel data-key="ZonesList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Zones"
+        data-key="ZonesList"
         url="Zones"
         :create="{
             urlCreate: 'Zones',
@@ -174,13 +175,13 @@ onMounted(() => (stateStore.rightDrawer = true));
             />
             <VnInput
                 v-model="data.bonus"
-                :label="t('list.bonus')"
+                :label="t('zone.bonus')"
                 min="0"
                 type="number"
             />
             <VnInput
                 v-model="data.travelingDays"
-                :label="t('list.travelingDays')"
+                :label="t('zone.travelingDays')"
                 type="number"
                 min="0"
             />
diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index ecf82bf4f..c74ae6078 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -22,13 +22,13 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('upcomingDeliveries.closing'),
+        label: t('zone.closing'),
         name: 'closing',
         field: 'hour',
         align: 'left',
     },
     {
-        label: t('upcomingDeliveries.id'),
+        label: t('list.id'),
         name: 'id',
         field: 'zoneFk',
         align: 'left',
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 2608c071c..bf7d8f0de 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -8,6 +8,13 @@ zone:
         upcomingDeliveries: Upcoming deliveries
         warehouses: Warehouses
         calendar: Calendar
+    m3Max: Max m³
+    deleteTitle: This item will be deleted
+    deleteSubtitle: Are you sure you want to continue?
+    volumetric: Volumetric
+    bonus: Bonus
+    closing: Closing
+    travelingDays: Traveling days
 list:
     clone: Clone
     id: Id
@@ -22,74 +29,38 @@ list:
     searchInfo: Search zone by id or name
     confirmCloneTitle: All it's properties will be copied
     confirmCloneSubtitle: Do you want to clone this zone?
-    travelingDays: Traveling days
     warehouse: Warehouse
-    bonus: Bonus
-    isVolumetric: Volumetric
     createZone: Create zone
     zoneSummary: Summary
 create:
     name: Name
-    warehouse: Warehouse
-    agency: Agency
-    travelingDays: Traveling days
     closingHour: Closing hour
-    price: Price
-    bonus: Bonus
-    volumetric: Volumetric
     itemMaxSize: Max m³
     inflation: Inflation
 summary:
-    agency: Agency
-    price: Price
     basicData: Basic data
-    bonus: Bonus
     closeHour: Close hour
-    travelingDays: Traveling days
-    volumetric: Volumetric
-    warehouse: Warehouse
-    name: Name
 filterPanel:
-    name: Name
     agencyModeFk: Agency
-zoneLocations:
-    locations: Locations
 deliveryPanel:
     pickup: Pick up
     delivery: Delivery
     postcode: Postcode
-    agency: Agency
-    warehouse: Warehouse
     query: Query
     noEventsWarning: No service for the specified zone
 zoneClosingTable:
-    id: Id
-    name: Name
-    agency: Agency
-    closing: Closing
-    price: Price
     preview: Preview
-    zones: Zones
 warehouses:
-    delete: Delete
     deleteTitle: This item will be deleted
     deleteSubtitle: Are you sure you want to continue?
-    warehouse: Warehouse
     add: Add
 eventsPanel:
     editMode: Edit mode
     include: Include
     exclude: Exclude
     events: Events
-    closing: Closing
-    travelingDays: Traveling days
-    price: Price
-    bonus: Bonus
-    m3Max: Max m³
     everyday: Everyday
     delete: Delete
-    deleteTitle: This item will be deleted
-    deleteSubtitle: Are you sure you want to continue?
 eventsExclusionForm:
     addExclusion: Add exclusion
     editExclusion: Edit exclusion
@@ -103,15 +74,8 @@ eventsInclusionForm:
     oneDay: One day
     indefinitely: Indefinitely
     rangeOfDates: Range of dates
-    day: Day
-    closing: Closing
-    travelingDays: Traveling days
-    price: Price
-    bonus: Bonus
-    m3Max: Max m³
     from: From
     to: To
 upcomingDeliveries:
     province: Province
     closing: Closing
-    id: Id
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 7ecfb580d..91541bea3 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -8,6 +8,13 @@ zone:
         upcomingDeliveries: Próximos repartos
         warehouses: Almacenes
         calendar: Calendario
+    m3Max: Medida máxima
+    deleteTitle: Este elemento será eliminado
+    deleteSubtitle: ¿Seguro que quieres continuar?
+    volumetric: Volumétrico
+    bonus: Bonificación
+    closing: Cierre
+    travelingDays: Días de viaje
 list:
     clone: Clonar
     id: Id
@@ -22,76 +29,38 @@ list:
     searchInfo: Buscar zonas por identificador o nombre
     confirmCloneTitle: Todas sus propiedades serán copiadas
     confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
-    travelingDays: Días de viaje
     warehouse: Almacén
-    bonus: Bonus
     isVolumetric: Volumétrico
     createZone: Crear zona
     zoneSummary: Resumen
 create:
-    name: Nombre
-    warehouse: Almacén
-    agency: Agencia
-    travelingDays: Días de viaje
     closingHour: Hora de cierre
-    price: Precio
-    bonus: Bonificación
-    volumetric: Volumétrico
     itemMaxSize: Medida máxima
     inflation: Inflación
 summary:
-    agency: Agencia
-    price: Precio
     basicData: Datos básicos
-    bonus: Bonificación
     closeHour: Hora de cierre
-    travelingDays: Días de viaje
-    volumetric: Volumétrico
-    warehouse: Almacén
-    name: Nombre
 filterPanel:
-    name: Nombre
     agencyModeFk: Agencia
-zoneLocations:
-    locations: Localizaciones
 deliveryPanel:
     pickup: Recogida
     delivery: Entrega
     postcode: Código postal
-    agency: Agencia
-    warehouse: Almacén
     query: Consultar
     noEventsWarning: No hay servicio para la zona especificada
 zoneClosingTable:
-    id: Id
-    name: Nombre
-    agency: Agencia
-    closing: Cierre
     preview: Vista previa
-    price: Precio
-    zones: Zonas
 Search zones: Buscar zonas
 You can search by zone reference: Puedes buscar por referencia de la zona
 warehouses:
-    delete: Eliminar
-    deleteTitle: Este elemento será eliminado
-    deleteSubtitle: ¿Seguro que quieres continuar?
-    warehouse: Almacén
     add: Añadir
 eventsPanel:
     editMode: Modo edición
     include: Incluir
     exclude: Excluir
     events: Eventos
-    closing: Cierre
-    travelingDays: Días de viaje
-    price: Precio
-    bonus: Bonificación
-    m3Max: Medida máxima
     everyday: Todos los días
     delete: Eliminar
-    deleteTitle: Este elemento será eliminado
-    deleteSubtitle: ¿Seguro que quieres continuar?
 eventsExclusionForm:
     addExclusion: Añadir exclusión
     editExclusion: Editar exclusión
@@ -105,15 +74,7 @@ eventsInclusionForm:
     oneDay: Un día
     indefinitely: Indefinido
     rangeOfDates: Rango de fechas
-    day: Día
-    closing: Cierre
-    travelingDays: Días de viaje
-    price: Precio
-    bonus: Bonificación
-    m3Max: Medida máxima
     from: Desde
     to: Hasta
 upcomingDeliveries:
     province: Provincia
-    closing: Cierre
-    id: Id
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 143d7c824..c08fb5961 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -113,7 +113,7 @@ export default {
                     name: 'SupplierAccounts',
                     meta: {
                         title: 'accounts',
-                        icon: 'vn:account',
+                        icon: 'vn:credit',
                     },
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierAccounts.vue'),
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index 35f834f3d..332494aa8 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -162,6 +162,15 @@ export const useInvoiceOutGlobalStore = defineStore({
                 );
                 throw new Error('Invalid Serial Type');
             }
+
+            if (clientsToInvoice === 'all' && params.serialType !== 'global') {
+                notify(
+                    'invoiceOut.globalInvoices.errors.invalidSerialTypeForAll',
+                    'negative'
+                );
+                throw new Error('For "all" clients, the serialType must be "global"');
+            }
+
             if (!params.companyFk) {
                 notify('invoiceOut.globalInvoices.errors.chooseValidCompany', 'negative');
                 throw new Error('Invalid company');
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index ea029bc12..6a0e7dfa8 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -8,7 +8,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         userFilter: {},
         userParams: {},
         url: '',
-        limit: 10,
+        limit: 20,
         skip: 0,
         order: '',
         isLoading: false,
diff --git a/test/vitest/__tests__/composables/useArrayData.spec.js b/test/vitest/__tests__/composables/useArrayData.spec.js
index 21323395b..d4c5d0949 100644
--- a/test/vitest/__tests__/composables/useArrayData.spec.js
+++ b/test/vitest/__tests__/composables/useArrayData.spec.js
@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
 
 describe('useArrayData', () => {
-    const filter = '{"limit":10,"skip":0}';
+    const filter = '{"limit":20,"skip":0}';
     const params = { supplierFk: 2 };
     beforeEach(() => {
         vi.spyOn(useRouter(), 'replace');