diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7797f810..fbe18a10a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,157 @@
+# Version 25.04 - 2025-01-28
+
+### Added 🆕
+
+- chore: add task comment  by:jorgep
+- chore: refs #8198 rollback  by:jorgep
+- chore: refs #8322 unnecessary prop  by:alexm
+- feat: refs #7055 added new test case  by:provira
+- feat: refs #7055 created FilterItemForm test  by:provira
+- feat: refs #7077 created test for VnInputTime  by:provira
+- feat: refs #7078 created test for VnJsonValue  by:provira
+- feat: refs #7087 added more test cases  by:provira
+- feat: refs #7087 added new test  by:provira
+- feat: refs #7087 created CardSummary test  by:provira
+- feat: refs #7088 created test for FetchedTags  by:provira
+- feat: refs #7202 added new field  by:Jon
+- feat: refs #7882 Added coords to create a address  by:guillermo
+- feat: refs #7957 add tooltip and i18n support for search link in VnSearchbar component  by:jorgep
+- feat: refs #7957 enhance search functionality and improve data filtering logic  by:jorgep
+- feat: refs #7957 open in new tab  by:jorgep
+- feat: refs #7957 simplify fn to  by:jorgep
+- feat: refs #7957 update VnSearchbar component with improved search URL handling and styling enhancements  by:jorgep
+- feat: refs #8117 filters and values added as needed  by:jtubau
+- feat: refs #8197 useHasContent and use in VnSection and RightMenu  by:alexm
+- feat: refs #8219 added invoice out e2e tests  by:Jon
+- feat: refs #8219 global invoicing e2e  by:Jon
+- feat: refs #8220 added barcodes e2e test  by:Jon
+- feat: refs #8220 created items e2e  by:Jon
+- feat: refs #8220 modified create item form and added respective e2e  by:Jon
+- feat: refs #8225 added account and invoiceOut modules  by:Jon
+- feat: refs #8225 added entry module and fixed translations  by:Jon
+- feat: refs #8225 added invoiceIn and travel module  by:Jon
+- feat: refs #8225 added moreOptions and use it in customer and ticket summary  by:Jon
+- feat: refs #8225 added route and shelving module  by:Jon
+- feat: refs #8225 added worker and zone modules  by:Jon
+- feat: refs #8225 use it in claim, item and order modules  by:Jon
+- feat: refs #8258 added button to pass to uppercase  by:provira
+- feat: refs #8258 added uppercase option to VnInput  by:provira
+- feat: refs #8258 added uppercase validation on supplier create  by:provira
+- feat: refs #8298 add price optimum input and update translations for bonus and price optimum  by:jgallego
+- feat: refs #8316 add entryFilter prop to VnTable component in EntryList  by:jtubau
+- feat: refs #8322 added department changes  by:provira
+- feat: refs #8372 workerPBX  by:robert
+- feat: refs #8381 add initial and final temperature fields to entry forms and summaries  by:jgallego
+- feat: refs #8381 add initial and final temperature labels in English and Spanish locales  by:jgallego
+- feat: refs #8381 add toCelsius filter and update temperature fields in entry forms and summaries  by:jgallego
+- feat: skip tests  by:jorgep
+- style: refs #7957 update VnSearchbar padding for improved layout  by:jorgep
+
+### Changed 📦
+
+- perf: refs #8219 #8219 minor change  by:Javier Segarra
+- perf: refs #8220 on-fetch and added missing translations  by:Jon
+- perf: refs #8220 on-fetch  by:Jon
+- perf: refs #8220 translations  by:Jon
+- perf: refs #8220 use searchbar selector in e2e tests  by:Jon
+- perf: remove warning default value  by:Javier Segarra
+- refactor: redirect using  params  by:Jon
+- refactor: refs #7077 removed some comments  by:provira
+- refactor: refs #7087 removed unused imports  by:provira
+- refactor: refs #7100 added const mockData  by:jtubau
+- refactor: refs #7100 delete unnecesary set prop  by:jtubau
+- refactor: refs #7100 refactorized with methods  by:jtubau
+- refactor: refs #7957 remove blank  by:jorgep
+- refactor: refs #8198 simplify data fetching and filtering logic  by:jorgep
+- refactor: refs #8198 simplify state management and data fetching in ItemDiary component  by:jorgep
+- refactor: refs #8219 modified e2e tests and fixed some translations  by:Jon
+- refactor: refs #8219 modified list test, created cypress download folder and added to gitignore  by:Jon
+- refactor: refs #8219 requested changes  by:Jon
+- refactor: refs #8219 use checkNotification command  by:Jon
+- refactor: refs #8220 added data-cy for e2e tests  by:Jon
+- refactor: refs #8220 requested changes  by:Jon
+- refactor: refs #8220 skip failling test and modifed tag test  by:Jon
+- refactor: refs #8225 requested changes  by:Jon
+- refactor: refs #8247 use new acl for sysadmin  by:Jon
+- refactor: refs #8316 added claimFilter  by:jtubau
+- refactor: refs #8316 added entryFilter  by:jtubau
+- refactor: refs #8316 add new localization keys and update existing ones for entry components  by:jtubau
+- refactor: refs #8316 moved localizations to local locale  by:jtubau
+- refactor: refs #8316 move order localization  by:jtubau
+- refactor: refs #8316 remove unused OrderSearchbar component  by:jtubau
+- refactor: refs #8316 update EntryCard to use user-filter prop and remove exprBuilder from EntryList  by:jtubau
+- refactor: refs #8316 used VnSection and VnCardBeta  by:jtubau
+- refactor: refs #8322 changed translations  by:provira
+- refactor: refs #8322 changed Worker component to use VnSection/VnCardBeta  by:provira
+- refactor: refs #8322 set department inside worker  by:alexm
+- refactor: skip intermitent failing test  by:Jon
+
+### Fixed 🛠️
+
+- feat: refs #8225 added entry module and fixed translations  by:Jon
+- fix: added missing translations in InvoiceIn  by:provira
+- fix: changed invoiceIn for InvoiceIn  by:provira
+- fix: changed translations to only use "invoicein"  by:provira
+- fix: department descriptor link  by:Jon
+- fix: e2e tests  by:Jon
+- fix: entry summary view and build warnings  by:Jon
+- fix: fixed InvoiceIn filter translations  by:provira
+- fix: modified setData in customerDescriptor to show the icons  by:Jon
+- fix: redirect to TicketSale from OrderLines  (origin/Fix-RedirectToTicketSale) by:Jon
+- fix: redirect when confirming lines  by:Jon
+- fix: refs #7055 #7055 #7055 fixed some tests  by:provira
+- fix: refs #7077 removed unused imports  by:provira
+- fix: refs #7078 added missing case with array  by:provira
+- fix: refs #7087 fixed some tests  by:provira
+- fix: refs #7088 changed "vm.vm" to "vm"  by:provira
+- fix: refs #7088 changed wrapper to vm  by:provira
+- fix: refs #7699 add icons and hint  by:carlossa
+- fix: refs #7699 add pwd vnInput  by:carlossa
+- fix: refs #7699 fix component  by:carlossa
+- fix: refs #7699 fix password visibility  by:carlossa
+- fix: refs #7699 fix tfront clean code  by:carlossa
+- fix: refs #7699 fix vnChangePassword, clean VnInput  by:carlossa
+- fix: refs #7699 fix vnInputPassword  by:carlossa
+- fix: refs #7957 add missing closing brace  by:jorgep
+- fix: refs #7957 css  by:jorgep
+- fix: refs #7957 rollback  by:jorgep
+- fix: refs #7957 update data-cy  by:jorgep
+- fix: refs #7957 update visibility handling for clear icon in VnInput component  by:jorgep
+- fix: refs #7957 vn-searchbar test  by:jorgep
+- fix: refs #8117 update salesPersonFk filter options and URL for improved data retrieval  by:jtubau
+- fix: refs #8197 not use yet  by:alexm
+- fix: refs #8198 update query param  by:jorgep
+- fix: refs #8219 fixed e2e tests  by:Jon
+- fix: refs #8219 fixed summary and global tests  by:Jon
+- fix: refs #8219 forgotten dataCy  by:Jon
+- fix: refs #8219 global e2e  by:Jon
+- fix: refs #8219 requested changes  by:Jon
+- fix: refs #8220 itemTag test  by:Javier Segarra
+- fix: refs #8225 invoice in translations  by:Jon
+- fix: refs #8243 fixed SkeletonSummary  by:provira
+- fix: refs #8247 conflicts  by:Jon
+- fix: refs #8247 fixed acls and added lost options  by:Jon
+- fix: refs #8316 ref="claimFilterRef"  by:alexm
+- fix: refs #8316 userFilter  by:alexm
+- fix: refs #8316 use rightMenu  by:alexm
+- fix: refs #8316 use section-searchbar  by:alexm
+- fix: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice  by:jtubau
+- fix: refs #8322 unnecessary section  by:alexm
+- fix: refs #8338 fixed VnTable translations  by:provira
+- fix: refs #8338 removed chipLocale property/added more translations  by:provira
+- fix: refs #8448 e2e  by:Jon
+- fix: refs #8448 not use croppie  by:alexm
+- fix: remove departmentCode  by:Javier Segarra
+- fix: removed unused searchbar  by:PAU ROVIRA ROSALENY
+- fix: skip failling e2e  by:Jon
+- fix: sort by name in description  by:Jon
+- fix: translations  by:Jon
+- fix: use entryFilter  by:alexm
+- fix(VnCardBeta): add userFilter  by:alexm
+- refactor: refs #8219 modified e2e tests and fixed some translations  by:Jon
+- revert: revert header  by:alexm
+- test: fix expedition e2e  by:alexm
+
 # Version 25.00 - 2025-01-14
 
 ### Added 🆕
diff --git a/cypress.config.js b/cypress.config.js
index e9aeb547a..c21fd5819 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -11,6 +11,7 @@ module.exports = defineConfig({
         screenshotsFolder: 'test/cypress/screenshots',
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
+        downloadsFolder: 'test/cypress/downloads',
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,
@@ -33,5 +34,7 @@ module.exports = defineConfig({
             require('cypress-mochawesome-reporter/plugin')(on);
             // implement node event listeners here
         },
+        viewportWidth: 1280,
+        viewportHeight: 720,
     },
 });
diff --git a/package.json b/package.json
index 6259f4acd..9d14e8727 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.02.0",
+    "version": "25.04.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 26b79b1bc..39ebfe540 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -62,6 +62,7 @@ async function setProvince(id, data) {
     postcodeFormData.provinceFk = id;
     await fetchTowns();
 }
+
 async function onProvinceCreated(data) {
     postcodeFormData.provinceFk = data.id;
 }
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index ea1ea53f2..2e580257c 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -198,6 +198,7 @@ async function fetch() {
     } catch (e) {
         state.set(modelValue, {});
         originalData.value = {};
+        throw e;
     }
 }
 
diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
index f34386fc4..91a2e5d39 100644
--- a/src/components/RegularizeStockForm.vue
+++ b/src/components/RegularizeStockForm.vue
@@ -44,7 +44,7 @@ const onDataSaved = (data) => {
     <FormModelPopup
         url-create="Items/regularize"
         model="Items"
-        :title="t('Regularize stock')"
+        :title="t('item.regularizeStock')"
         :form-initial-data="regularizeFormData"
         @on-data-saved="onDataSaved($event)"
     >
@@ -55,6 +55,7 @@ const onDataSaved = (data) => {
                     v-model.number="data.quantity"
                     type="number"
                     autofocus
+                    data-cy="regularizeStockInput"
                 />
             </VnRow>
             <VnRow>
diff --git a/src/components/VnTable/VnTableFilter.vue b/src/components/VnTable/VnTableFilter.vue
index f23c657cf..8632842f4 100644
--- a/src/components/VnTable/VnTableFilter.vue
+++ b/src/components/VnTable/VnTableFilter.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
 
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnFilter from 'components/VnTable/VnFilter.vue';
@@ -11,16 +10,11 @@ defineProps({
         type: Array,
         required: true,
     },
-    chipLocale: {
-        type: String,
-        default: null,
-    },
     searchUrl: {
         type: [String, Boolean],
         default: 'table',
     },
 });
-const { t } = useI18n();
 
 const tableFilterRef = ref([]);
 
@@ -62,9 +56,9 @@ function columnName(col) {
                 :columns="columns"
             />
         </template>
-        <template #tags="{ tag, formatFn }" v-if="chipLocale">
+        <template #tags="{ tag, formatFn, getLocale }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(`${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
diff --git a/src/components/__tests__/FilterItemForm.spec.js b/src/components/__tests__/FilterItemForm.spec.js
new file mode 100644
index 000000000..210d6bf02
--- /dev/null
+++ b/src/components/__tests__/FilterItemForm.spec.js
@@ -0,0 +1,82 @@
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import FilterItemForm from 'src/components/FilterItemForm.vue';
+import { vi, beforeAll, describe, expect, it } from 'vitest';
+
+describe('FilterItemForm', () => {
+    let vm;
+    let wrapper;
+
+    beforeAll(() => {
+        wrapper = createWrapper(FilterItemForm, {
+            props: {
+                url: 'Items/withName',
+            },
+        });
+        vm = wrapper.vm;
+        wrapper = wrapper.wrapper;
+
+        vi.spyOn(axios, 'get').mockResolvedValue({
+            data: [
+                {
+                    id: 999996,
+                    name: 'bolas de madera',
+                    size: 2,
+                    inkFk: null,
+                    producerFk: null,
+                },
+            ],
+        });
+    });
+
+    it('should filter data and populate tableRows for table display', async () => {
+        vm.itemFilterParams.name = 'bolas de madera';
+
+        await vm.onSubmit();
+
+        const expectedFilter = {
+            include: [
+                { relation: 'producer', scope: { fields: ['name'] } },
+                { relation: 'ink', scope: { fields: ['name'] } },
+            ],
+            where: {"name":{"like":"%bolas de madera%"}},
+        };
+        
+        expect(axios.get).toHaveBeenCalledWith('Items/withName', {
+            params: { filter: JSON.stringify(expectedFilter) },
+        });
+
+        expect(vm.tableRows).toEqual([
+            {
+                id: 999996,
+                name: 'bolas de madera',
+                size: 2,
+                inkFk: null,
+                producerFk: null,
+            },
+        ]);
+    });
+
+    it('should handle an empty itemFilterParams correctly', async () => {
+        vm.itemFilterParams.name = null;
+        vm.itemFilterParams = {};
+
+        await vm.onSubmit();
+
+        const expectedFilter = {
+            include: [
+                { relation: 'producer', scope: { fields: ['name'] } },
+                { relation: 'ink', scope: { fields: ['name'] } },
+            ],
+            where: {},
+        };
+
+        expect(axios.get).toHaveBeenCalledWith('Items/withName', {
+            params: { filter: JSON.stringify(expectedFilter) },
+        });
+    });
+
+    it('should emit "itemSelected" with the correct id and close the form', () => {
+        vm.selectItem({ id: 12345 });
+        expect(wrapper.emitted('itemSelected')[0]).toEqual([12345]);
+    });
+});
\ No newline at end of file
diff --git a/src/components/common/RightMenu.vue b/src/components/common/RightMenu.vue
index 32dc2874d..9512d32d4 100644
--- a/src/components/common/RightMenu.vue
+++ b/src/components/common/RightMenu.vue
@@ -1,29 +1,17 @@
 <script setup>
-import { ref, onMounted, useSlots } from 'vue';
+import { onMounted, useSlots } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { useQuasar } from 'quasar';
+import { useHasContent } from 'src/composables/useHasContent';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const stateStore = useStateStore();
 const slots = useSlots();
-const hasContent = ref(false);
-const rightPanel = ref(null);
+const hasContent = useHasContent('#right-panel');
 
 onMounted(() => {
-    rightPanel.value = document.querySelector('#right-panel');
-    if (!rightPanel.value) return;
-
-    const observer = new MutationObserver(() => {
-        hasContent.value = rightPanel.value.childNodes.length;
-    });
-
-    observer.observe(rightPanel.value, {
-        subtree: true,
-        childList: true,
-        attributes: true,
-    });
     if ((!slots['right-panel'] && !hasContent.value) || quasar.platform.is.mobile)
         stateStore.rightDrawer = false;
 });
diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 349956be9..a1f07ff17 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -12,6 +12,7 @@ const props = defineProps({
     baseUrl: { type: String, default: undefined },
     customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
+    userFilter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
@@ -32,6 +33,7 @@ const url = computed(() => {
 const arrayData = useArrayData(props.dataKey, {
     url: url.value,
     filter: props.filter,
+    userFilter: props.userFilter,
 });
 
 onBeforeMount(async () => {
diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index 79784f3c5..d8374498f 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -2,9 +2,9 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnRow from '../ui/VnRow.vue';
-import VnInput from './VnInput.vue';
 import FetchData from '../FetchData.vue';
 import useNotify from 'src/composables/useNotify';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const props = defineProps({
     submitFn: { type: Function, default: () => {} },
@@ -70,19 +70,19 @@ defineExpose({ show: () => changePassDialog.value.show() });
             </QCardSection>
             <QForm ref="form">
                 <QCardSection>
-                    <VnInput
+                    <VnInputPassword
                         v-if="props.askOldPass"
                         :label="t('Old password')"
                         v-model="passwords.oldPassword"
-                        type="password"
                         :required="true"
+                        :toggle-visibility="true"
                         autofocus
                     />
-                    <VnInput
+                    <VnInputPassword
                         :label="t('New password')"
                         v-model="passwords.newPassword"
-                        type="password"
                         :required="true"
+                        :toggle-visibility="true"
                         :info="
                             t('passwordRequirements', {
                                 length: requirements.length,
@@ -95,10 +95,10 @@ defineExpose({ show: () => changePassDialog.value.show() });
                         autofocus
                     />
 
-                    <VnInput
+                    <VnInputPassword
                         :label="t('Repeat password')"
                         v-model="passwords.repeatPassword"
-                        type="password"
+                        :toggle-visibility="true"
                     />
                 </QCardSection>
             </QForm>
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 57a495ac3..e921d8e1f 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -42,6 +42,10 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    uppercase: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const vnInputRef = ref(null);
@@ -116,6 +120,10 @@ const handleInsertMode = (e) => {
         input.setSelectionRange(cursorPos + 1, cursorPos + 1);
     });
 };
+
+const handleUppercase = () => {
+    value.value = value.value?.toUpperCase() || '';
+};
 </script>
 
 <template>
@@ -134,20 +142,23 @@ const handleInsertMode = (e) => {
             hide-bottom-space
             :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
         >
-            <template v-if="$slots.prepend" #prepend>
+            <template #prepend>
                 <slot name="prepend" />
             </template>
             <template #append>
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="
-                        hover &&
-                        value &&
-                        !$attrs.disabled &&
-                        !$attrs.readonly &&
-                        $props.clearable
-                    "
+                    :style="{
+                        visibility:
+                            hover &&
+                            value &&
+                            !$attrs.disabled &&
+                            !$attrs.readonly &&
+                            $props.clearable
+                                ? 'visible'
+                                : 'hidden',
+                    }"
                     @click="
                         () => {
                             value = null;
@@ -156,6 +167,15 @@ const handleInsertMode = (e) => {
                         }
                     "
                 ></QIcon>
+                
+                <QIcon
+                    name="match_case"
+                    size="xs"
+                    v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
+                    @click="handleUppercase"
+                    class="uppercase-icon"
+                />
+                
                 <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">
@@ -166,6 +186,7 @@ const handleInsertMode = (e) => {
         </QInput>
     </div>
 </template>
+
 <i18n>
     en:
         inputMin: Must be more than {value}
@@ -175,9 +196,4 @@ const handleInsertMode = (e) => {
         inputMin: Debe ser mayor a {value}
         maxLength: El valor excede los {value} carácteres
         inputMax: Debe ser menor a {value}
-</i18n>
-<style lang="scss">
-.q-field__append {
-    padding-inline: 0;
-}
-</style>
+</i18n>
\ No newline at end of file
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index db8e25195..a8888aad8 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -1,14 +1,12 @@
 <script setup>
 import { onMounted, watch, computed, ref, useAttrs } from 'vue';
 import { date } from 'quasar';
-import { useI18n } from 'vue-i18n';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 
 const $attrs = useAttrs();
 const { isRequired, requiredFieldRule } = useRequired($attrs);
 const model = defineModel({ type: [String, Date] });
-const { t } = useI18n();
 
 const $props = defineProps({
     isOutlined: {
diff --git a/src/components/common/VnInputPassword.vue b/src/components/common/VnInputPassword.vue
new file mode 100644
index 000000000..56981c0c3
--- /dev/null
+++ b/src/components/common/VnInputPassword.vue
@@ -0,0 +1,31 @@
+<script setup>
+import VnInput from 'src/components/common/VnInput.vue';
+import { ref } from 'vue';
+
+const model = defineModel({ type: [Number, String] });
+const $props = defineProps({
+    toggleVisibility: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+const showPassword = ref(false);
+</script>
+<template>
+    <VnInput
+        v-bind="{ ...$attrs }"
+        v-model="model"
+        :type="
+            $props.toggleVisibility ? (showPassword ? 'text' : 'password') : $attrs.type
+        "
+    >
+        <template #append v-if="toggleVisibility">
+            <QIcon
+                :name="showPassword ? 'visibility_off' : 'visibility'"
+                class="cursor-pointer"
+                @click="showPassword = !showPassword"
+            />
+        </template>
+    </VnInput>
+</template>
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index cb1f723ba..323427f5b 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,13 +1,11 @@
 <script setup>
 import { computed, ref, useAttrs } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 import VnTime from './VnTime.vue';
 import { useRequired } from 'src/composables/useRequired';
 
 const $attrs = useAttrs();
 const { isRequired, requiredFieldRule } = useRequired($attrs);
-const { t } = useI18n();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {
diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
index edd8d3dfa..510865530 100644
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@@ -2,9 +2,10 @@
 import RightMenu from './RightMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, computed } from 'vue';
+import { onBeforeMount, computed, ref } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRoute } from 'vue-router';
+import { useHasContent } from 'src/composables/useHasContent';
 
 const $props = defineProps({
     section: {
@@ -55,6 +56,8 @@ const isMainSection = computed(() => {
     }
     return isSame;
 });
+const searchbarId = 'section-searchbar';
+const hasContent = useHasContent(`#${searchbarId}`);
 
 onBeforeMount(() => {
     if ($props.dataKey)
@@ -69,14 +72,14 @@ onBeforeMount(() => {
 <template>
     <slot name="searchbar">
         <VnSearchbar
-            v-if="searchBar"
+            v-if="searchBar && !hasContent"
             v-bind="arrayDataProps"
             :data-key="dataKey"
             :label="$t(`${prefix}.search`)"
             :info="$t(`${prefix}.searchInfo`)"
         />
+        <div :id="searchbarId"></div>
     </slot>
-
     <RightMenu>
         <template #right-panel v-if="$slots['rightMenu'] || rightFilter">
             <slot name="rightMenu">
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 662e6006a..a3e85655d 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -205,10 +205,10 @@ function filter(val, options) {
         }
 
         if (!row) return;
-        const id = row[$props.optionValue];
+        const id = String(row[$props.optionValue]);
         const optionLabel = String(row[$props.optionLabel]).toLowerCase();
 
-        return id == search || optionLabel.includes(search);
+        return id.includes(search) || optionLabel.includes(search);
     });
 }
 
diff --git a/src/components/common/VnSelectWorker.vue b/src/components/common/VnSelectWorker.vue
index b0fef4443..9a8151a3d 100644
--- a/src/components/common/VnSelectWorker.vue
+++ b/src/components/common/VnSelectWorker.vue
@@ -51,6 +51,7 @@ const url = computed(() => {
         option-value="id"
         option-label="nickname"
         :fields="['id', 'name', 'nickname', 'code']"
+        :filter-options="['id', 'name', 'nickname', 'code']"
         sort-by="nickname ASC"
     >
         <template #prepend v-if="$props.hasAvatar">
@@ -71,7 +72,7 @@ const url = computed(() => {
                         {{ scope.opt.nickname }}
                     </QItemLabel>
                     <QItemLabel caption v-else>
-                        {{ scope.opt.nickname }}, {{ scope.opt.code }}
+                        #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>
diff --git a/src/components/common/__tests__/VnInputDate.spec.js b/src/components/common/__tests__/VnInputDate.spec.js
new file mode 100644
index 000000000..21ca91e96
--- /dev/null
+++ b/src/components/common/__tests__/VnInputDate.spec.js
@@ -0,0 +1,72 @@
+import { createWrapper } from 'app/test/vitest/helper.js';
+import { describe, it, expect } from 'vitest';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+let vm;
+let wrapper;
+
+function generateWrapper(date, outlined, required) {
+    wrapper = createWrapper(VnInputDate, {
+        props: {
+            modelValue: date,
+        },
+        attrs: {
+            isOutlined: outlined,
+            required: required
+        },
+    });
+    wrapper = wrapper.wrapper;
+    vm = wrapper.vm;
+};
+
+describe('VnInputDate', () => {
+
+    describe('formattedDate', () => {     
+        it('formats a valid date correctly', async () => {
+            generateWrapper('2023-12-25', false, false);
+            await vm.$nextTick();
+            expect(vm.formattedDate).toBe('25/12/2023');
+        });
+
+        it('updates the model value when a new date is set', async () => {
+            const input = wrapper.find('input');
+            await input.setValue('31/12/2023');
+            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
+            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
+        });
+
+        it('should not update the model value when an invalid date is set', async () => {
+            const input = wrapper.find('input');
+            await input.setValue('invalid-date');
+            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
+        }); 
+    });
+
+    describe('styleAttrs', () => {
+        it('should return empty styleAttrs when isOutlined is false', async () => {
+            generateWrapper('2023-12-25', false, false);
+            await vm.$nextTick();
+            expect(vm.styleAttrs).toEqual({}); 
+        });
+
+        it('should set styleAttrs when isOutlined is true', async () => {        
+            generateWrapper('2023-12-25', true, false);
+            await vm.$nextTick();
+            expect(vm.styleAttrs.outlined).toBe(true);
+        });
+    });
+
+    describe('required', () => {
+        it('should not applies required class when isRequired is false', async () => {
+            generateWrapper('2023-12-25', false, false);
+            await vm.$nextTick();
+            expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
+        });
+        
+        it('should applies required class when isRequired is true', async () => {
+            generateWrapper('2023-12-25', false, true);
+            await vm.$nextTick();
+            expect(wrapper.find('.vn-input-date').classes()).toContain('required');
+        });
+    });
+});
\ No newline at end of file
diff --git a/src/components/common/__tests__/VnInputTime.spec.js b/src/components/common/__tests__/VnInputTime.spec.js
new file mode 100644
index 000000000..2692ac71b
--- /dev/null
+++ b/src/components/common/__tests__/VnInputTime.spec.js
@@ -0,0 +1,63 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnInputTime from 'components/common/VnInputTime.vue';
+
+describe('VnInputTime', () => {
+    let wrapper;
+    let vm;
+
+    beforeAll(() => {
+        wrapper = createWrapper(VnInputTime, {
+            props: {
+                isOutlined: true,
+                timeOnly: false,
+            },
+        });
+        vm = wrapper.vm;
+        wrapper = wrapper.wrapper;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should return the correct data if isOutlined is true', () => {
+        expect(vm.isOutlined).toBe(true);
+        expect(vm.styleAttrs).toEqual({ dense: true, outlined: true, rounded: true });
+    });
+
+    it('should return the formatted data', () => {
+        expect(vm.dateToTime('2022-01-01T03:23:43')).toBe('03:23');
+    });
+
+    describe('formattedTime', () => {
+        it('should return the formatted time for a valid ISO date', () => {
+            vm.model = '2025-01-02T15:45:00';
+            expect(vm.formattedTime).toBe('15:45');
+        });
+
+        it('should handle null model value gracefully', () => {
+            vm.model = null;
+            expect(vm.formattedTime).toBe(null);
+        });
+
+        it('should handle time-only input correctly', async () => {
+            await wrapper.setProps({ timeOnly: true });
+            vm.formattedTime = '14:30';
+            expect(vm.model).toBe('14:30');
+        });
+
+        it('should pad short time values correctly', async () => {
+            await wrapper.setProps({ timeOnly: true });
+            vm.formattedTime = '9';
+            expect(vm.model).toBe('09:00');
+        });
+
+        it('should not update the model if the value is unchanged', () => {
+            vm.model = '14:30';
+            const previousModel = vm.model;
+            vm.formattedTime = '14:30';
+            expect(vm.model).toBe(previousModel);
+        });
+    });
+});
\ No newline at end of file
diff --git a/src/components/common/__tests__/VnJsonValue.spec.js b/src/components/common/__tests__/VnJsonValue.spec.js
new file mode 100644
index 000000000..393b39f3a
--- /dev/null
+++ b/src/components/common/__tests__/VnJsonValue.spec.js
@@ -0,0 +1,95 @@
+import { describe, it, expect } from 'vitest';
+import VnJsonValue from 'src/components/common/VnJsonValue.vue';
+import { createWrapper } from 'app/test/vitest/helper';
+
+const buildComponent = (props) => {
+    return createWrapper(VnJsonValue, {
+        props,
+    }).wrapper;
+};
+
+describe('VnJsonValue', () => {
+    it('renders null value correctly', async () => {
+        const wrapper = buildComponent({ value: null });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('∅');
+        expect(span.classes()).toContain('json-null');
+    });
+
+    it('renders boolean true correctly', async () => {
+        const wrapper = buildComponent({ value: true });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('✓');
+        expect(span.classes()).toContain('json-true');
+    });
+
+    it('renders boolean false correctly', async () => {
+        const wrapper = buildComponent({ value: false });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('✗');
+        expect(span.classes()).toContain('json-false');
+    });
+
+    it('renders a short string correctly', async () => {
+        const wrapper = buildComponent({ value: 'Hello' });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('Hello');
+        expect(span.classes()).toContain('json-string');
+    });
+
+    it('renders a long string correctly with ellipsis', async () => {
+        const longString = 'a'.repeat(600);
+        const wrapper = buildComponent({ value: longString });
+        const span = wrapper.find('span');
+        expect(span.text()).toContain('...');
+        expect(span.text().length).toBeLessThanOrEqual(515);
+        expect(span.attributes('title')).toBe(longString);
+        expect(span.classes()).toContain('json-string');
+    });
+
+    it('renders a number correctly', async () => {
+        const wrapper = buildComponent({ value: 123.4567 });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('123.457');
+        expect(span.classes()).toContain('json-number');
+    });
+
+    it('renders an integer correctly', async () => {
+        const wrapper = buildComponent({ value: 42 });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('42');
+        expect(span.classes()).toContain('json-number');
+    });
+
+    it('renders a date correctly', async () => {
+        const date = new Date('2023-01-01');
+        const wrapper = buildComponent({ value: date });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('2023-01-01');
+        expect(span.classes()).toContain('json-object');
+    });
+
+    it('renders an object correctly', async () => {
+        const obj = { key: 'value' };
+        const wrapper = buildComponent({ value: obj });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe(obj.toString());
+        expect(span.classes()).toContain('json-object');
+    });
+
+    it('renders an array correctly', async () => {
+        const arr = [1, 2, 3];
+        const wrapper = buildComponent({ value: arr });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe(arr.toString());
+        expect(span.classes()).toContain('json-object');
+    });
+
+    it('updates value when prop changes', async () => {
+        const wrapper = buildComponent({ value: true });
+        await wrapper.setProps({ value: 123 });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('123');
+        expect(span.classes()).toContain('json-number');
+    });
+});
diff --git a/src/components/common/__tests__/VnNotes.spec.js b/src/components/common/__tests__/VnNotes.spec.js
new file mode 100644
index 000000000..8f24a7f14
--- /dev/null
+++ b/src/components/common/__tests__/VnNotes.spec.js
@@ -0,0 +1,107 @@
+import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import VnNotes from 'src/components/ui/VnNotes.vue';
+
+describe('VnNotes', () => {
+    let vm;
+    let wrapper;
+    let spyFetch;
+    let postMock;
+    let expectedBody;
+    const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
+
+    function generateExpectedBody() {
+        expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+    }
+
+    async function setTestParams(text, observationType, type){
+        vm.newNote.text = text;
+        vm.newNote.observationTypeFk = observationType;
+        wrapper.setProps({ selectType: type });
+    }
+
+    beforeAll(async () => {        
+        vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
+
+        wrapper = createWrapper(VnNotes, {
+            propsData: {
+                url: '/test',
+                body: { name: 'Tony', lastName: 'Stark' },
+            }
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+    });
+
+    beforeEach(() => {
+        postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
+        spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+        expectedBody = {};
+    });
+
+    describe('insert', () => {
+        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
+            await setTestParams( null, null, true );
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
+            await setTestParams( "", null, false );
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
+            await setTestParams( "Test Note", null, true );
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
+            await setTestParams( "Test Note", null, false );
+
+            generateExpectedBody();
+
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {            
+            await setTestParams( "Test Note", 1, false );
+
+            generateExpectedBody();
+
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
+            await setTestParams( "Test Note", 1, true );
+
+            generateExpectedBody();
+            
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+    });
+});
\ No newline at end of file
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index f4c0091d2..cf217555a 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -6,6 +6,7 @@ import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
 import { useRoute } from 'vue-router';
+import VnMoreOptions from './VnMoreOptions.vue';
 
 const $props = defineProps({
     url: {
@@ -47,7 +48,6 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
-const menuRef = ref();
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -159,25 +159,11 @@ const toModule = computed(() =>
                         </QTooltip>
                     </QBtn>
                 </RouterLink>
-                <QBtn
-                    v-if="$slots.menu"
-                    color="white"
-                    dense
-                    flat
-                    icon="more_vert"
-                    round
-                    size="md"
-                    data-cy="descriptor-more-opts"
-                >
-                    <QTooltip>
-                        {{ t('components.cardDescriptor.moreOptions') }}
-                    </QTooltip>
-                    <QMenu :ref="menuRef">
-                        <QList>
-                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
-                        </QList>
-                    </QMenu>
-                </QBtn>
+                <VnMoreOptions v-if="$slots.menu">
+                    <template #menu="{ menuRef }">
+                        <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                    </template>
+                </VnMoreOptions>
             </div>
             <slot name="before" />
             <div class="body q-py-sm">
@@ -222,8 +208,8 @@ const toModule = computed(() =>
     />
 </template>
 
-<style lang="scss" scoped>
-:deep(.body) {
+<style lang="scss">
+.body {
     background-color: var(--vn-section-color);
     .text-h5 {
         font-size: 20px;
@@ -262,7 +248,9 @@ const toModule = computed(() =>
         }
     }
 }
+</style>
 
+<style lang="scss" scoped>
 .title {
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 8395dfd73..cf52bcd40 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -1,10 +1,10 @@
 <script setup>
-import { ref, computed, watch, onBeforeMount, onMounted } from 'vue';
+import { ref, computed, watch, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { isDialogOpened } from 'src/filters';
-import { useStateStore } from 'src/stores/useStateStore';
+import VnMoreOptions from './VnMoreOptions.vue';
 
 const props = defineProps({
     url: {
@@ -40,7 +40,6 @@ const { store } = arrayData;
 const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
-const stateStore = useStateStore();
 defineExpose({
     entity,
     fetch,
@@ -52,9 +51,6 @@ onBeforeMount(async () => {
     watch(props, async () => await fetch());
 });
 
-onMounted(() => {
-    stateStore.rightDrawerChangeValue(false);
-});
 async function fetch() {
     store.url = props.url;
     store.filter = props.filter ?? {};
@@ -64,6 +60,7 @@ async function fetch() {
     isLoading.value = false;
 }
 </script>
+
 <template>
     <div class="summary container">
         <QCard class="cardSummary">
@@ -86,9 +83,14 @@ async function fetch() {
                     <slot name="header" :entity="entity" dense>
                         {{ entity.id + ' - ' + entity.name }}
                     </slot>
-                    <slot name="header-right" :entity="entity">
-                        <span></span>
-                    </slot>
+                    <span class="row no-wrap">
+                        <slot name="header-right" :entity="entity" />
+                        <VnMoreOptions v-if="$slots.menu && isDialogOpened()">
+                            <template #menu="{ menuRef }">
+                                <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                            </template>
+                        </VnMoreOptions>
+                    </span>
                 </div>
                 <div class="summaryBody row q-mb-md">
                     <slot name="body" :entity="entity" />
@@ -97,6 +99,7 @@ async function fetch() {
         </QCard>
     </div>
 </template>
+
 <style lang="scss">
 .summary.container {
     display: flex;
diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue
index 6e159087c..b3912f779 100644
--- a/src/components/ui/FetchedTags.vue
+++ b/src/components/ui/FetchedTags.vue
@@ -18,8 +18,7 @@ const $props = defineProps({
     },
     columns: {
         type: Number,
-        required: false,
-        default: null,
+        default: 3,
     },
 });
 
diff --git a/src/components/ui/SkeletonSummary.vue b/src/components/ui/SkeletonSummary.vue
index e8407ee7b..659d4c53d 100644
--- a/src/components/ui/SkeletonSummary.vue
+++ b/src/components/ui/SkeletonSummary.vue
@@ -1,38 +1,49 @@
 <template>
     <div class="header bg-primary q-pa-sm q-mb-md">
         <QSkeleton type="rect" square />
+        <QSkeleton type="rect" square />
     </div>
     <div class="row q-pa-md q-col-gutter-md q-mb-md">
-        <QSkeleton type="rect" class="q-mb-md" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="rect" class="q-mb-md" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="rect" class="q-mb-md" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="rect" class="q-mb-md" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="rect" class="q-mb-md" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
+        <div class="col">
+            <QSkeleton type="rect" class="q-mb-md" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+        </div>
+        <div class="col">
+            <QSkeleton type="rect" class="q-mb-md" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+        </div>
+        <div class="col">
+            <QSkeleton type="rect" class="q-mb-md" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+        </div>
+        <div class="col">
+            <QSkeleton type="rect" class="q-mb-md" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+        </div>
+        <div class="col">
+            <QSkeleton type="rect" class="q-mb-md" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+        </div>
     </div>
 </template>
 
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 46c43356f..aba797678 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -190,7 +190,7 @@ const getLocale = (label) => {
     const globalLocale = `globals.params.${param}`;
     if (te(globalLocale)) return t(globalLocale);
     else if (te(t(`params.${param}`)));
-    else return t(`${route.meta.moduleName}.params.${param}`);
+    else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`);
 };
 </script>
 
diff --git a/src/components/ui/VnMoreOptions.vue b/src/components/ui/VnMoreOptions.vue
new file mode 100644
index 000000000..39e84be2b
--- /dev/null
+++ b/src/components/ui/VnMoreOptions.vue
@@ -0,0 +1,20 @@
+<template>
+    <QBtn
+        color="white"
+        dense
+        flat
+        icon="more_vert"
+        round
+        size="md"
+        data-cy="descriptor-more-opts"
+    >
+        <QTooltip>
+            {{ $t('components.cardDescriptor.moreOptions') }}
+        </QTooltip>
+        <QMenu ref="menuRef">
+            <QList>
+                <slot name="menu" :menu-ref="$refs.menuRef" />
+            </QList>
+        </QMenu>
+    </QBtn>
+</template>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index a2d3b9ee1..bfaa76588 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,14 +1,16 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'src/stores/useStateStore';
+import { useRoute } from 'vue-router';
 
 const quasar = useQuasar();
 const { t } = useI18n();
 const state = useStateStore();
+const route = useRoute();
 
 const props = defineProps({
     dataKey: {
@@ -83,6 +85,17 @@ if (props.redirect)
     };
 let arrayData = useArrayData(props.dataKey, arrayDataProps);
 let store = arrayData.store;
+const to = computed(() => {
+    const url = { path: route.path, query: { ...(route.query ?? {}) } };
+    const searchUrl = arrayData.store.searchUrl;
+    const currentFilter = {
+        ...arrayData.store.currentFilter,
+        search: searchText.value || undefined,
+    };
+
+    if (searchUrl) url.query[searchUrl] = JSON.stringify(currentFilter);
+    return url;
+});
 
 watch(
     () => props.dataKey,
@@ -132,23 +145,32 @@ async function search() {
 <template>
     <Teleport to="#searchbar" v-if="state.isHeaderMounted()">
         <QForm @submit="search" id="searchbarForm">
+            <RouterLink
+                :to="to"
+                @click="
+                    !$event.shiftKey && !$event.ctrlKey && search();
+                    $refs.input.focus();
+                "
+            >
+                <QIcon
+                    v-if="!quasar.platform.is.mobile"
+                    class="cursor-pointer"
+                    name="search"
+                    size="sm"
+                >
+                    <QTooltip>{{ t('link') }}</QTooltip>
+                </QIcon>
+            </RouterLink>
             <VnInput
                 id="searchbar"
+                ref="input"
                 v-model.trim="searchText"
                 :placeholder="t(props.label)"
                 dense
-                standout
                 autofocus
-                data-cy="vnSearchBar"
+                data-cy="vn-searchbar"
+                borderless
             >
-                <template #prepend>
-                    <QIcon
-                        v-if="!quasar.platform.is.mobile"
-                        class="cursor-pointer"
-                        name="search"
-                        @click="search"
-                    />
-                </template>
                 <template #append>
                     <QIcon
                         v-if="props.info && $q.screen.gt.xs"
@@ -173,20 +195,52 @@ async function search() {
 .q-field {
     transition: width 0.36s;
 }
-</style>
 
-<style lang="scss">
+:deep(.q-field__native) {
+    padding-top: 10px;
+    padding-left: 5px;
+}
+
+:deep(.q-field--dark .q-field__native:focus) {
+    color: black;
+}
+
+:deep(.q-field--focused) {
+    .q-icon {
+        color: black;
+    }
+}
+
 .cursor-info {
     cursor: help;
 }
-#searchbar {
-    .q-field--standout.q-field--highlighted .q-field__control {
+
+.q-form {
+    display: flex;
+    align-items: center;
+    border-radius: 4px;
+    padding: 0 5px;
+    background-color: var(--vn-search-color);
+
+    &:hover {
+        background-color: var(--vn-search-color-hover);
+    }
+    &:focus-within {
         background-color: white;
-        color: black;
-        .q-field__native,
+
         .q-icon {
-            color: black !important;
+            color: black;
         }
     }
 }
+
+.q-icon {
+    color: var(--vn-label-color);
+}
 </style>
+<i18n>
+en:
+    link: click to search, ctrl + click to open in a new tab, shift + click to open in a new window
+es:
+    link: clic para buscar, ctrl + clic para abrir en una nueva pestaña, shift + clic para abrir en una nueva ventana
+</i18n>
diff --git a/src/components/ui/__tests__/CardSummary.spec.js b/src/components/ui/__tests__/CardSummary.spec.js
new file mode 100644
index 000000000..411ebf9bb
--- /dev/null
+++ b/src/components/ui/__tests__/CardSummary.spec.js
@@ -0,0 +1,78 @@
+import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import CardSummary from 'src/components/ui/CardSummary.vue';
+import * as vueRouter from 'vue-router';
+
+describe('CardSummary', () => {
+    let vm;
+    let wrapper;
+
+    beforeAll(() => {
+        vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
+    });
+
+    vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
+        query: {},
+        params: {},
+        meta: { moduleName: 'mockName' },
+        path: 'mockName/1/summary',
+        name: 'CardSummary',
+    });
+
+    beforeEach(() => {
+        wrapper = createWrapper(CardSummary, {
+            propsData: {
+                dataKey: 'cardSummaryKey',
+                url: 'cardSummaryUrl',
+                filter: 'cardFilter',
+            },
+        });
+        vm = wrapper.vm;
+        wrapper = wrapper.wrapper;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should fetch data correctly', async () => {
+        const fetchSpy = vi
+            .spyOn(vm.arrayData, 'fetch')
+            .mockResolvedValue({ data: [{ id: 1, name: 'Test Entity' }] });
+        await vm.fetch();
+
+        expect(fetchSpy).toHaveBeenCalledWith({ append: false, updateRouter: false });
+        expect(wrapper.emitted('onFetch')).toBeTruthy();
+        expect(vm.isLoading).toBe(false);
+    });
+
+    it('should set correct props to the store', () => {
+        expect(vm.store.url).toEqual('cardSummaryUrl');
+        expect(vm.store.filter).toEqual('cardFilter');
+    });
+
+    it('should compute entity correctly from store data', () => {
+        vm.store.data = [{ id: 1, name: 'Entity 1' }];
+        expect(vm.entity).toEqual({ id: 1, name: 'Entity 1' });
+    });
+
+    it('should handle empty data gracefully', () => {
+        vm.store.data = [];
+        expect(vm.entity).toBeUndefined();
+    });
+
+    it('should respond to prop changes and refetch data', async () => {
+        const newUrl = 'CardSummary/35';
+        const newKey = 'cardSummaryKey/35';
+        const fetchSpy = vi.spyOn(vm.arrayData, 'fetch');
+        await wrapper.setProps({ url: newUrl, filter: { key: newKey } });
+
+        expect(fetchSpy).toHaveBeenCalled();
+        expect(vm.store.url).toBe(newUrl);
+        expect(vm.store.filter).toEqual({ key: newKey });
+    });
+
+    it('should return true if route path ends with /summary' , () => {
+        expect(vm.isSummary).toBe(true);
+    });
+});
\ No newline at end of file
diff --git a/src/components/ui/__tests__/FetchedTags.spec.js b/src/components/ui/__tests__/FetchedTags.spec.js
new file mode 100644
index 000000000..3c658a80e
--- /dev/null
+++ b/src/components/ui/__tests__/FetchedTags.spec.js
@@ -0,0 +1,81 @@
+import { describe, expect, it } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
+
+describe('tags computed property', () => {
+    it('returns an object with the correct keys and values', () => {
+        const vm = createWrapper(FetchedTags, {
+            props: {
+                item: {
+                    tag1: 'JavaScript',
+                    value1: 'Programming Language',
+                    tag2: 'Vue',
+                    value2: 'Framework',
+                    tag3: 'EmptyTag',
+                },
+                tag: 'tag',
+                value: 'value',
+                columns: 2,
+            },
+        }).vm;
+        expect(vm.tags).toEqual({
+            JavaScript: 'Programming Language',
+            Vue: 'Framework',
+            EmptyTag: '',
+        });
+    });
+
+    it('returns an empty object if the item prop is an empty object', () => {
+        const vm = createWrapper(FetchedTags, {
+            props: {
+                item: {},
+                tag: 'tag',
+                value: 'value',
+            },
+        }).vm;
+        expect(vm.tags).toEqual({});
+    });
+
+    it('should calculate the correct columnStyle when columns prop is defined', () => {
+        const vm = createWrapper(FetchedTags, {
+            props: {
+                item: {
+                    tag1: 'JavaScript',
+                    value1: 'Programming Language',
+                    tag2: 'Vue',
+                    value2: 'Framework',
+                    tag3: 'EmptyTag',
+                },
+                tag: 'tag',
+                value: 'value',
+                columns: 2,
+            },
+        }).vm;
+
+        const expectedStyle = {
+            'grid-template-columns': 'repeat(2, 1fr)',
+            'max-width': '8rem', 
+        };
+
+        expect(vm.columnStyle).toEqual(expectedStyle);
+    });
+
+    it('should return an empty object for columnStyle when columns prop is not defined', () => {
+        const vm = createWrapper(FetchedTags, {
+            props: {
+                item: {
+                    tag1: 'JavaScript',
+                    value1: 'Programming Language',
+                    tag2: 'Vue',
+                    value2: 'Framework',
+                    tag3: 'EmptyTag',
+                },
+                tag: 'tag',
+                value: 'value',
+                columns: null,
+            },
+        }).vm;
+
+        expect(vm.columnStyle).toEqual({});
+    });
+});
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 1e65c9093..75f1e852b 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -7,7 +7,9 @@ import { isDialogOpened } from 'src/filters';
 
 const arrayDataStore = useArrayDataStore();
 
-export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
+export function useArrayData(key, userOptions) {
+    key ??= useRoute().meta.moduleName;
+
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
@@ -76,25 +78,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         cancelRequest();
         canceller = new AbortController();
-
-        const filter = {
-            limit: store.limit,
-        };
-        let userParams = { ...store.userParams };
-
-        Object.assign(filter, store.userFilter);
-
-        let where;
-        if (filter?.where || store.filter?.where)
-            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
-        Object.assign(filter, store.filter);
-        filter.where = where;
-        const params = { filter };
-
-        Object.assign(params, userParams);
-        if (params.filter) params.filter.skip = store.skip;
-        if (store.order?.length) params.filter.order = toArray(store.order);
-        else delete params.filter.order;
+        const { params, limit } = getCurrentFilter();
 
         store.currentFilter = JSON.parse(JSON.stringify(params));
         delete store.currentFilter.filter.include;
@@ -120,7 +104,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             params,
         });
 
-        const { limit } = filter;
         store.hasMoreData = limit && response.data.length >= limit;
 
         if (!append && !isDialogOpened() && updateRouter) {
@@ -299,6 +282,30 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         router.replace(newUrl);
     }
 
+    function getCurrentFilter() {
+        const filter = {
+            limit: store.limit,
+        };
+
+        let userParams = { ...store.userParams };
+
+        Object.assign(filter, store.userFilter);
+
+        let where;
+        if (filter?.where || store.filter?.where)
+            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+        Object.assign(filter, store.filter);
+        filter.where = where;
+        const params = { filter };
+
+        Object.assign(params, userParams);
+        if (params.filter) params.filter.skip = store.skip;
+        if (store.order) params.filter.order = toArray(store.order);
+        else delete params.filter.order;
+
+        return { filter, params, limit: filter.limit };
+    }
+
     function processData(data, { map = true, append = true }) {
         if (!append) {
             store.data = [];
@@ -331,6 +338,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         fetch,
         applyFilter,
         addFilter,
+        getCurrentFilter,
         addFilterWhere,
         addOrder,
         deleteOrder,
diff --git a/src/composables/useHasAccount.js b/src/composables/useHasAccount.js
new file mode 100644
index 000000000..1014bedf3
--- /dev/null
+++ b/src/composables/useHasAccount.js
@@ -0,0 +1,6 @@
+import axios from 'axios';
+
+export default async (id) => {
+    const { data } = await axios.get(`Accounts/${id}/exists`);
+    return data.exists;
+};
diff --git a/src/composables/useHasContent.js b/src/composables/useHasContent.js
new file mode 100644
index 000000000..8ab018376
--- /dev/null
+++ b/src/composables/useHasContent.js
@@ -0,0 +1,24 @@
+import { onMounted, ref } from 'vue';
+
+export function useHasContent(selector) {
+    const container = ref({});
+    const hasContent = ref();
+
+    onMounted(() => {
+        container.value = document.querySelector(selector);
+        if (!container.value) return;
+
+        const observer = new MutationObserver(() => {
+            if (document.querySelector(selector))
+                hasContent.value = !!container.value.childNodes.length;
+        });
+
+        observer.observe(container.value, {
+            subtree: true,
+            childList: true,
+            attributes: true,
+        });
+    });
+
+    return hasContent;
+}
diff --git a/src/css/app.scss b/src/css/app.scss
index 57bd207c2..8f35d1e8f 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -10,6 +10,8 @@ body.body--light {
     --vn-text-color: black;
     --vn-label-color: #5f5f5f;
     --vn-accent-color: #e7e3e3;
+    --vn-search-color: #d4d4d4;
+    --vn-search-color-hover: #cfcfcf;
     --vn-empty-tag: #acacac;
     --vn-black-text-color: black;
     --vn-text-color-contrast: white;
@@ -28,6 +30,8 @@ body.body--dark {
     --vn-text-color: white;
     --vn-label-color: #a8a8a8;
     --vn-accent-color: #424242;
+    --vn-search-color: #4b4b4b;
+    --vn-search-color-hover: #5b5b5b;
     --vn-empty-tag: #2d2d2d;
     --vn-black-text-color: black;
     --vn-text-color-contrast: black;
diff --git a/src/filters/index.js b/src/filters/index.js
index a92d2eb07..bf1429aee 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -16,6 +16,7 @@ import getUpdatedValues from './getUpdatedValues';
 import getParamWhere from './getParamWhere';
 import parsePhone from './parsePhone';
 import isDialogOpened from './isDialogOpened';
+import toCelsius from './toCelsius';
 
 export {
     getUpdatedValues,
@@ -36,4 +37,5 @@ export {
     dashIfEmpty,
     dateRange,
     getParamWhere,
+    toCelsius,
 };
diff --git a/src/filters/toCelsius.js b/src/filters/toCelsius.js
new file mode 100644
index 000000000..83cab32ca
--- /dev/null
+++ b/src/filters/toCelsius.js
@@ -0,0 +1,3 @@
+export default function toCelsius(value) {
+    return value ? `${value}°C` : '';
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 4b9accb91..473446970 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -346,6 +346,7 @@ globals:
         countryFk: Country
         companyFk: Company
     changePass: Change password
+    setPass: Set password
     deleteConfirmTitle: Delete selected elements
     changeState: Change state
     raid: 'Raid {daysInForward} days'
@@ -388,74 +389,19 @@ cau:
     subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.
     inputLabel: Explain why this error should not appear
     askPrivileges: Ask for privileges
-entry:
-    list:
-        newEntry: New entry
-        tableVisibleColumns:
-            created: Creation
-            supplierFk: Supplier
-            isBooked: Booked
-            isConfirmed: Confirmed
-            isOrdered: Ordered
-            companyFk: Company
-            travelFk: Travel
-            isExcludedFromAvailable: Inventory
-            invoiceAmount: Import
-    summary:
-        commission: Commission
-        currency: Currency
-        invoiceNumber: Invoice number
-        ordered: Ordered
-        booked: Booked
-        excludedFromAvailable: Inventory
-        travelReference: Reference
-        travelAgency: Agency
-        travelShipped: Shipped
-        travelDelivered: Delivered
-        travelLanded: Landed
-        travelReceived: Received
-        buys: Buys
-        stickers: Stickers
-        package: Package
-        packing: Pack.
-        grouping: Group.
-        buyingValue: Buying value
-        import: Import
-        pvp: PVP
-    basicData:
-        travel: Travel
-        currency: Currency
-        commission: Commission
-        observation: Observation
-        booked: Booked
-        excludedFromAvailable: Inventory
-    buys:
-        observations: Observations
-        packagingFk: Box
-        color: Color
-        printedStickers: Printed stickers
-    notes:
-        observationType: Observation type
-    latestBuys:
-        tableVisibleColumns:
-            image: Picture
-            itemFk: Item ID
-            weightByPiece: Weight/Piece
-            isActive: Active
-            family: Family
-            entryFk: Entry
-            freightValue: Freight value
-            comissionValue: Commission value
-            packageValue: Package value
-            isIgnored: Is ignored
-            price2: Grouping
-            price3: Packing
-            minPrice: Min
-            ektFk: Ekt
-            packingOut: Package out
-            landing: Landing
-            isExcludedFromAvailable: Es inventory
 ticket:
+    params:
+        ticketFk: Ticket ID
+        weekDay: Weekday
+        agencyModeFk: Agency
+        id: Worker
+        state: State
+        created: Created
+        externalId: External ID
+        counter: Counter
+        freightItemName: Freight item name
+        packageItemName: Package item name
+        longName: Long name
     card:
         customerId: Customer ID
         customerCard: Customer card
@@ -506,6 +452,7 @@ invoiceOut:
     card:
         issued: Issued
         customerCard: Customer card
+        ticketList: Ticket List
     summary:
         issued: Issued
         dued: Due
@@ -558,27 +505,6 @@ parking:
     searchBar:
         info: You can search by parking code
         label: Search parking...
-order:
-    field:
-        salesPersonFk: Sales Person
-    form:
-        clientFk: Client
-        addressFk: Address
-        agencyModeFk: Agency
-    list:
-        newOrder: New Order
-    summary:
-        basket: Basket
-        notConfirmed: Not confirmed
-        created: Created
-        createdFrom: Created From
-        address: Address
-        total: Total
-        items: Items
-        orderTicketList: Order Ticket List
-        amount: Amount
-        confirm: Confirm
-        confirmLines: Confirm lines
 department:
     chat: Chat
     bossDepartment: Boss Department
@@ -697,6 +623,11 @@ wagon:
         minHeightBetweenTrays: 'The minimum height between trays is '
         maxWagonHeight: 'The maximum height of the wagon is '
         uncompleteTrays: There are incomplete trays
+    params:
+        label: Label
+        plate: Plate
+        volume: Volume
+        name: Name
 
 supplier:
     list:
@@ -865,7 +796,10 @@ components:
         hasMinPrice: Minimum price
         # LatestBuysFilter
         salesPersonFk: Buyer
+        supplierFk: Supplier
         from: From
+        to: To
+        visible: Is visible
         active: Is active
         floramondo: Is floramondo
         showBadDates: Show future items
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f91a02e6a..b764b1e43 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -348,6 +348,7 @@ globals:
         countryFk: País
         companyFk: Empresa
     changePass: Cambiar contraseña
+    setPass: Establecer contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
     changeState: Cambiar estado
     raid: 'Redada {daysInForward} días'
@@ -388,75 +389,19 @@ cau:
     subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
     inputLabel: Explique el motivo por el que no deberia aparecer este fallo
     askPrivileges: Solicitar permisos
-entry:
-    list:
-        newEntry: Nueva entrada
-        tableVisibleColumns:
-            created: Creación
-            supplierFk: Proveedor
-            isBooked: Asentado
-            isConfirmed: Confirmado
-            isOrdered: Pedida
-            companyFk: Empresa
-            travelFk: Envio
-            isExcludedFromAvailable: Inventario
-            invoiceAmount: Importe
-    summary:
-        commission: Comisión
-        currency: Moneda
-        invoiceNumber: Núm. factura
-        ordered: Pedida
-        booked: Contabilizada
-        excludedFromAvailable: Inventario
-        travelReference: Referencia
-        travelAgency: Agencia
-        travelShipped: F. envio
-        travelWarehouseOut: Alm. salida
-        travelDelivered: Enviada
-        travelLanded: F. entrega
-        travelReceived: Recibida
-        buys: Compras
-        stickers: Etiquetas
-        package: Embalaje
-        packing: Pack.
-        grouping: Group.
-        buyingValue: Coste
-        import: Importe
-        pvp: PVP
-    basicData:
-        travel: Envío
-        currency: Moneda
-        observation: Observación
-        commission: Comisión
-        booked: Asentado
-        excludedFromAvailable: Inventario
-    buys:
-        observations: Observaciónes
-        packagingFk: Embalaje
-        color: Color
-        printedStickers: Etiquetas impresas
-    notes:
-        observationType: Tipo de observación
-    latestBuys:
-        tableVisibleColumns:
-            image: Foto
-            itemFk: Id Artículo
-            weightByPiece: Peso (gramos)/tallo
-            isActive: Activo
-            family: Familia
-            entryFk: Entrada
-            freightValue: Porte
-            comissionValue: Comisión
-            packageValue: Embalaje
-            isIgnored: Ignorado
-            price2: Grouping
-            price3: Packing
-            minPrice: Min
-            ektFk: Ekt
-            packingOut: Embalaje envíos
-            landing: Llegada
-            isExcludedFromAvailable: Es inventario
 ticket:
+    params:
+        ticketFk: ID de ticket
+        weekDay: Salida
+        agencyModeFk: Agencia
+        id: Comercial
+        created: Creado
+        state: Estado
+        externalId: ID externo
+        counter: Contador
+        freightItemName: Nombre
+        packageItemName: Embalaje
+        longName: Descripción
     card:
         customerId: ID cliente
         customerCard: Ficha del cliente
@@ -544,30 +489,6 @@ invoiceOut:
         comercial: Comercial
         errors:
             downloadCsvFailed: Error al descargar CSV
-order:
-    field:
-        salesPersonFk: Comercial
-    form:
-        clientFk: Cliente
-        addressFk: Dirección
-        agencyModeFk: Agencia
-    list:
-        newOrder: Nuevo Pedido
-    summary:
-        basket: Cesta
-        notConfirmed: No confirmada
-        created: Creado
-        createdFrom: Creado desde
-        address: Dirección
-        total: Total
-        vat: IVA
-        state: Estado
-        alias: Alias
-        items: Artículos
-        orderTicketList: Tickets del pedido
-        amount: Monto
-        confirm: Confirmar
-        confirmLines: Confirmar lineas
 shelving:
     list:
         parking: Parking
@@ -700,6 +621,11 @@ wagon:
         minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
         maxWagonHeight: 'La altura máxima del vagón es '
         uncompleteTrays: Hay bandejas sin completar
+    params:
+        label: Etiqueta
+        plate: Matrícula
+        volume: Volumen
+        name: Nombre
 supplier:
     list:
         payMethod: Método de pago
@@ -867,7 +793,11 @@ components:
         wareHouseFk: Almacén
         # LatestBuysFilter
         salesPersonFk: Comprador
+        supplierFk: Proveedor
+        visible: Visible
         active: Activo
+        from: Desde
+        to: Hasta
         floramondo: Floramondo
         showBadDates: Ver items a futuro
     userPanel:
diff --git a/src/pages/Account/AccountCreate.vue b/src/pages/Account/AccountCreate.vue
index 6b7c049c8..b925ff06a 100644
--- a/src/pages/Account/AccountCreate.vue
+++ b/src/pages/Account/AccountCreate.vue
@@ -6,6 +6,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -61,10 +62,10 @@ const redirectToAccountBasicData = (_, { id }) => {
                     hide-selected
                     :rules="validate('VnUser.roleFk')"
                 />
-                <VnInput
+                <VnInputPassword
                     v-model="data.password"
                     :label="t('ldap.password')"
-                    type="password"
+                    :toggle-visibility="true"
                     :rules="validate('VnUser.password')"
                 />
                 <QCheckbox
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index bb220aa2e..4710f961b 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -8,6 +8,7 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -128,10 +129,9 @@ onMounted(async () => await getInitialLdapConfig());
                         :required="true"
                         :rules="validate('LdapConfig.rdn')"
                     />
-                    <VnInput
+                    <VnInputPassword
                         :label="t('ldap.password')"
                         clearable
-                        type="password"
                         v-model="data.password"
                         :required="true"
                         :rules="validate('LdapConfig.password')"
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index c1c75fcee..ea8daba0d 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -4,9 +4,9 @@ import { computed, ref } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import VnInput from 'src/components/common/VnInput.vue';
 import VnSection from 'src/components/common/VnSection.vue';
 import FetchData from 'src/components/FetchData.vue';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -168,10 +168,9 @@ function exprBuilder(param, value) {
             >
                 <template #more-create-dialog="{ data }">
                     <QCardSection>
-                        <VnInput
+                        <VnInputPassword
                             :label="t('Password')"
                             v-model="data.password"
-                            type="password"
                             :required="true"
                             autocomplete="new-password"
                         />
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 699a638eb..7b36de85f 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -8,6 +8,7 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -143,10 +144,9 @@ onMounted(async () => await getInitialSambaConfig());
                         v-model="data.adUser"
                         :rules="validate('SambaConfigs.adUser')"
                     />
-                    <VnInput
+                    <VnInputPassword
                         :label="t('samba.passwordAD')"
                         clearable
-                        type="password"
                         v-model="data.adPassword"
                     />
                     <VnInput
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 8af817fcc..4e5328de6 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -1,13 +1,13 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
-import FetchData from 'src/components/FetchData.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
+import useHasAccount from 'src/composables/useHasAccount.js';
 
 const $props = defineProps({
     id: {
@@ -23,6 +23,7 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 const data = ref(useCardDescription());
+const hasAccount = ref();
 const setData = (entity) => (data.value = useCardDescription(entity.nickname, entity.id));
 
 const filter = {
@@ -30,18 +31,16 @@ const filter = {
     fields: ['id', 'nickname', 'name', 'role'],
     include: { relation: 'role', scope: { fields: ['id', 'name'] } },
 };
-const hasAccount = ref(false);
+
+onMounted(async () => {
+    hasAccount.value = await useHasAccount(entityId.value);
+});
 </script>
 
 <template>
-    <FetchData
-        :url="`Accounts/${entityId}/exists`"
-        auto-load
-        @on-fetch="(data) => (hasAccount = data.exists)"
-    />
     <CardDescriptor
         ref="descriptor"
-        url="VnUsers/preview"
+        :url="`VnUsers/preview`"
         :filter="filter"
         module="Account"
         @on-fetch="setData"
@@ -50,7 +49,7 @@ const hasAccount = ref(false);
         :subtitle="data.subtitle"
     >
         <template #menu>
-            <AccountDescriptorMenu :has-account="hasAccount" />
+            <AccountDescriptorMenu :entity-id="entityId" />
         </template>
         <template #before>
             <VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
@@ -74,7 +73,7 @@ const hasAccount = ref(false);
             <VnLv :label="t('account.card.nickname')" :value="entity.name" />
             <VnLv :label="t('account.card.role')" :value="entity.role.name" />
         </template>
-        <template #icons="{ entity }">
+        <template #actions="{ entity }">
             <QCardActions class="q-gutter-x-md">
                 <QIcon
                     v-if="!entity.active"
@@ -82,7 +81,7 @@ const hasAccount = ref(false);
                     name="vn:disabled"
                     flat
                     round
-                    size="xs"
+                    size="sm"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.deactivated') }}</QTooltip>
@@ -93,7 +92,7 @@ const hasAccount = ref(false);
                     v-if="hasAccount"
                     flat
                     round
-                    size="xs"
+                    size="sm"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.enabled') }}</QTooltip>
diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index 1780b4247..ccf029e44 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -1,14 +1,17 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, toRefs } from 'vue';
+import { computed, onMounted, ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useRoute } from 'vue-router';
 import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
+import { useState } from 'src/composables/useState';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { useQuasar } from 'quasar';
+import { useRouter } from 'vue-router';
 
 const $props = defineProps({
     hasAccount: {
@@ -17,14 +20,20 @@ const $props = defineProps({
         required: true,
     },
 });
+
 const { t } = useI18n();
 const { hasAccount } = toRefs($props);
 const { openConfirmationModal } = useVnConfirm();
 const route = useRoute();
+const router = useRouter();
+const state = useState();
+const user = state.getUser();
 const { notify } = useQuasar();
 const account = computed(() => useArrayData('AccountId').store.data[0]);
 account.value.hasAccount = hasAccount.value;
 const entityId = computed(() => +route.params.id);
+const hasitManagementAccess = ref();
+const hasSysadminAccess = ref();
 
 async function updateStatusAccount(active) {
     if (active) {
@@ -36,7 +45,7 @@ async function updateStatusAccount(active) {
     account.value.hasAccount = active;
     const status = active ? 'enable' : 'disable';
     notify({
-        message: t(`account.card.${status}Account.success`),
+        message: t(`account.card.actions.${status}Account.success`),
         type: 'positive',
     });
 }
@@ -49,6 +58,17 @@ async function updateStatusUser(active) {
         type: 'positive',
     });
 }
+
+async function deleteAccount() {
+    const { data } = await axios.delete(`VnUsers/${entityId.value}`);
+    if (data) {
+        notify({
+            message: t('account.card.actions.delete.success'),
+            type: 'positive',
+        });
+        router.push({ name: 'AccountList' });
+    }
+}
 const showSyncDialog = ref(false);
 const syncPassword = ref(null);
 const shouldSyncPassword = ref(false);
@@ -63,11 +83,27 @@ async function sync() {
         type: 'positive',
     });
 }
+const askOldPass = ref(false);
+const changePassRef = ref();
+
+const onChangePass = (oldPass) => {
+    askOldPass.value = oldPass;
+    changePassRef.value.show();
+};
+
+onMounted(() => {
+    hasitManagementAccess.value = useAcl().hasAny([
+        { model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
+    ]);
+    hasSysadminAccess.value = useAcl().hasAny([
+        { model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
+    ]);
+});
 </script>
 <template>
     <VnChangePassword
         ref="changePassRef"
-        :ask-old-pass="true"
+        :ask-old-pass="askOldPass"
         :submit-fn="
             async (newPassword, oldPassword) => {
                 await axios.patch(`Accounts/change-password`, {
@@ -97,7 +133,7 @@ async function sync() {
                     <QTooltip>{{ t('account.card.actions.sync.tooltip') }}</QTooltip>
                 </QIcon></QCheckbox
             >
-            <QInput
+            <VnInputPassword
                 v-if="shouldSyncPassword"
                 :label="t('login.password')"
                 v-model="syncPassword"
@@ -109,18 +145,46 @@ async function sync() {
         </template>
     </VnConfirm>
     <QItem
-        v-if="
-            entityId == account.id &&
-            useAcl().hasAny([{ model: 'Account', props: '*', accessType: 'WRITE' }])
-        "
+        v-if="hasitManagementAccess"
         v-ripple
         clickable
-        @click="$refs.changePassRef.show()"
+        @click="
+            openConfirmationModal(
+                t('account.card.actions.disableAccount.title'),
+                t('account.card.actions.disableAccount.subtitle'),
+                () => deleteAccount()
+            )
+        "
     >
-        <QItemSection>{{ t('globals.changePass') }}</QItemSection>
+        <QItemSection>{{ t('globals.delete') }}</QItemSection>
     </QItem>
     <QItem
-        v-if="account.hasAccount"
+        v-if="hasSysadminAccess"
+        v-ripple
+        clickable
+        @click="user.id === account.id ? onChangePass(true) : onChangePass(false)"
+    >
+        <QItemSection v-if="user.id === account.id">
+            {{ t('globals.changePass') }}
+        </QItemSection>
+        <QItemSection v-else>{{ t('globals.setPass') }}</QItemSection>
+    </QItem>
+    <QItem
+        v-if="!account.hasAccount && hasSysadminAccess"
+        v-ripple
+        clickable
+        @click="
+            openConfirmationModal(
+                t('account.card.actions.enableAccount.title'),
+                t('account.card.actions.enableAccount.subtitle'),
+                () => updateStatusAccount(true)
+            )
+        "
+    >
+        <QItemSection>{{ t('account.card.actions.enableAccount.name') }}</QItemSection>
+    </QItem>
+    <QItem
+        v-if="account.hasAccount && hasSysadminAccess"
         v-ripple
         clickable
         @click="
@@ -135,7 +199,7 @@ async function sync() {
     </QItem>
 
     <QItem
-        v-if="!account.active"
+        v-if="!account.active && hasitManagementAccess"
         v-ripple
         clickable
         @click="
@@ -149,7 +213,7 @@ async function sync() {
         <QItemSection>{{ t('account.card.actions.activateUser.name') }}</QItemSection>
     </QItem>
     <QItem
-        v-if="account.active"
+        v-if="account.active && hasitManagementAccess"
         v-ripple
         clickable
         @click="
@@ -162,7 +226,12 @@ async function sync() {
     >
         <QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
     </QItem>
-    <QItem v-ripple clickable @click="showSyncDialog = true">
+    <QItem
+        v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
+        v-ripple
+        clickable
+        @click="showSyncDialog = true"
+    >
         <QItemSection>{{ t('account.card.actions.sync.name') }}</QItemSection>
     </QItem>
     <QSeparator />
diff --git a/src/pages/Account/Card/AccountMailAlias.vue b/src/pages/Account/Card/AccountMailAlias.vue
index 8d3bd3b67..efd2b481b 100644
--- a/src/pages/Account/Card/AccountMailAlias.vue
+++ b/src/pages/Account/Card/AccountMailAlias.vue
@@ -9,6 +9,7 @@ import AccountMailAliasCreateForm from './AccountMailAliasCreateForm.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useArrayData } from 'composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
+import useHasAccount from 'src/composables/useHasAccount.js';
 import axios from 'axios';
 
 const { t } = useI18n();
@@ -50,16 +51,6 @@ const columns = computed(() => [
     },
 ]);
 
-const fetchAccountExistence = async () => {
-    try {
-        const { data } = await axios.get(`Accounts/${route.params.id}/exists`);
-        return data.exists;
-    } catch (error) {
-        console.error('Error fetching account existence', error);
-        return false;
-    }
-};
-
 const deleteMailAlias = async (row) => {
     await axios.delete(`${urlPath}/${row.id}`);
     fetchMailAliases();
@@ -79,7 +70,7 @@ const fetchMailAliases = async () => {
 
 const getAccountData = async (reload = true) => {
     loading.value = true;
-    hasAccount.value = await fetchAccountExistence();
+    hasAccount.value = await useHasAccount(route.params.id);
     if (!hasAccount.value) {
         loading.value = false;
         store.data = [];
diff --git a/src/pages/Account/Card/AccountMailForwarding.vue b/src/pages/Account/Card/AccountMailForwarding.vue
index 30849d44a..0e5ae3122 100644
--- a/src/pages/Account/Card/AccountMailForwarding.vue
+++ b/src/pages/Account/Card/AccountMailForwarding.vue
@@ -9,6 +9,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
 import useNotify from 'src/composables/useNotify.js';
+import useHasAccount from 'src/composables/useHasAccount';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -30,23 +31,9 @@ const hasDataChanged = computed(
         initialData.value.hasData !== hasData.value
 );
 
-const fetchAccountExistence = async () => {
-    try {
-        const { data } = await axios.get(`Accounts/${route.params.id}/exists`);
-        return data.exists;
-    } catch (error) {
-        console.error('Error fetching account existence', error);
-        return false;
-    }
-};
-
 const fetchMailForwards = async () => {
-    try {
-        const response = await axios.get(`MailForwards/${route.params.id}`);
-        return response.data;
-    } catch {
-        return null;
-    }
+    const response = await axios.get(`MailForwards/${route.params.id}`);
+    return response.data;
 };
 
 const deleteMailForward = async () => {
@@ -72,7 +59,7 @@ const setInitialData = async () => {
     loading.value = true;
     initialData.value.account = route.params.id;
     formData.value.account = route.params.id;
-    hasAccount.value = await fetchAccountExistence(route.params.id);
+    hasAccount.value = await useHasAccount(route.params.id);
     if (!hasAccount.value) {
         loading.value = false;
         return;
diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue
index e6c21ed34..ca17c7975 100644
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@@ -7,6 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
+import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -31,12 +32,14 @@ const filter = {
 <template>
     <CardSummary
         data-key="AccountId"
-        ref="AccountSummary"
         url="VnUsers/preview"
         :filter="filter"
         @on-fetch="(data) => (account = data)"
     >
         <template #header>{{ account.id }} - {{ account.nickname }}</template>
+        <template #menu="">
+            <AccountDescriptorMenu :entity-id="entityId" />
+        </template>
         <template #body>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index 88a6b11e9..1826250fd 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -1,4 +1,18 @@
 account:
+    params:
+        id: Id
+        name: Name
+        roleFk: Role
+        nickname: Nickname
+        password: Password
+        active: Active
+        search: Id
+        description: Description
+        alias: Alias
+        model: Model
+        principalId: Role
+        property: Property
+        accessType: Access
     card:
         nickname: User
         role: Role
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index ba559f2c3..941a9948f 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -1,4 +1,20 @@
+accessType: Acceso
+property: Propiedad
 account:
+    params:
+        id: Id
+        name: Nombre
+        roleFk: Rol
+        nickname: Nickname
+        password: Contraseña
+        active: Activo
+        search: Id
+        description: Descripción
+        alias: Alias
+        model: Modelo
+        principalId: Rol
+        property: Propiedad
+        accessType: Acceso
     card:
         nickname: Usuario
         role: Rol
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 3642dc0d0..e1e000815 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,21 +1,13 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
-import ClaimFilter from '../ClaimFilter.vue';
 import filter from './ClaimFilter.js';
 </script>
 <template>
-    <VnCard
-        data-key="Claim"
-        base-url="Claims"
-        :descriptor="ClaimDescriptor"
-        :filter-panel="ClaimFilter"
-        search-data-key="ClaimList"
+    <VnCardBeta 
+        data-key="Claim" 
+        base-url="Claims" 
+        :descriptor="ClaimDescriptor" 
         :filter="filter"
-        :searchbar-props="{
-            url: 'Claims/filter',
-            label: 'Search claim',
-            info: 'You can search by claim id or customer name',
-        }"
     />
 </template>
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 8939a0785..66fb151e5 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -19,6 +19,7 @@ import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import ClaimDescriptorMenu from './ClaimDescriptorMenu.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -228,6 +229,9 @@ function claimUrl(section) {
                 </QList>
             </QBtnDropdown>
         </template>
+        <template #menu="{ entity }">
+            <ClaimDescriptorMenu :claim="entity.claim" />
+        </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
             <QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
                 <VnTitle
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index c28e95cb8..b4dd4ee1b 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -93,16 +93,7 @@ defineExpose({ states });
                     outlined
                     rounded
                     dense
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                />
                 <VnSelect
                     :label="t('claim.responsible')"
                     v-model="params.claimResponsibleFk"
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 3a44a1e77..35b051cdc 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -2,18 +2,18 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'filters/index';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import ClaimFilter from './ClaimFilter.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const dataKey = 'ClaimList';
 
 const claimFilterRef = ref();
 const columns = computed(() => [
@@ -125,49 +125,50 @@ const STATE_COLOR = {
 </script>
 
 <template>
-    <VnSearchbar
-        data-key="ClaimList"
-        :label="t('Search claim')"
-        :info="t('You can search by claim id or customer name')"
-    />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="claim"
+        :array-data-props="{
+            url: 'Claims/filter',
+            order: ['cs.priority ASC', 'created ASC'],
+        }"
+    >
+        <template #rightMenu>
             <ClaimFilter data-key="ClaimList" ref="claimFilterRef" />
         </template>
-    </RightMenu>
-    <VnTable
-        data-key="ClaimList"
-        url="Claims/filter"
-        :order="['cs.priority ASC', 'created ASC']"
-        :columns="columns"
-        redirect="claim"
-        :right-search="false"
-        auto-load
-    >
-        <template #column-clientFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.clientName }}
-                <CustomerDescriptorProxy :id="row.clientFk" />
-            </span>
+        <template #body>
+            <VnTable
+                :data-key="dataKey"
+                :columns="columns"
+                redirect="claim"
+                :right-search="false"
+                auto-load
+            >
+                <template #column-clientFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.clientName }}
+                        <CustomerDescriptorProxy :id="row.clientFk" />
+                    </span>
+                </template>
+                <template #column-attendedBy="{ row }">
+                    <span @click.stop>
+                        <VnUserLink :name="row.workerName" :worker-id="row.workerFk" />
+                    </span>
+                </template>
+                <template #column-zoneFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.zoneName }}
+                        <ZoneDescriptorProxy :id="row.zoneId" />
+                    </span>
+                </template>
+            </VnTable>
         </template>
-        <template #column-attendedBy="{ row }">
-            <span @click.stop>
-                <VnUserLink :name="row.workerName" :worker-id="row.workerFk" />
-            </span>
-        </template>
-        <template #column-zoneFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.zoneName }}
-                <ZoneDescriptorProxy :id="row.zoneId" />
-            </span>
-        </template>
-    </VnTable>
+    </VnSection>
 </template>
 
 <i18n>
 es:
-    Search claim: Buscar reclamación
-    You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
     params:
         stateCode: Estado
 en:
diff --git a/src/pages/Claim/locale/en.yml b/src/pages/Claim/locale/en.yml
index ffcb44df6..11b4a2ca4 100644
--- a/src/pages/Claim/locale/en.yml
+++ b/src/pages/Claim/locale/en.yml
@@ -44,3 +44,5 @@ claim:
     fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
     noData: 'There are no images/videos, click here or drag and drop the file'
     dragDrop: Drag and drop it here
+    search: Search claims
+    searchInfo: You can search by claim id or customer name
diff --git a/src/pages/Claim/locale/es.yml b/src/pages/Claim/locale/es.yml
index 052416aa7..d35d2c8e7 100644
--- a/src/pages/Claim/locale/es.yml
+++ b/src/pages/Claim/locale/es.yml
@@ -1,5 +1,3 @@
-Search claim: Buscar reclamación
-You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
 claim:
     customer: Cliente
     code: Código
@@ -46,3 +44,5 @@ claim:
     fileDescription: 'ID de reclamación {claimId} del cliente {clientName} con ID {clientId}'
     noData: 'No hay imágenes/videos, haz clic aquí o arrastra y suelta el archivo'
     dragDrop: Arrastra y suelta aquí
+    search: Buscar reclamación
+    searchInfo: Puedes buscar por ID de la reclamación o nombre del cliente
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index fd4ed0e42..4a064843a 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -14,7 +14,6 @@ import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 
 const customerDebt = ref();
 const customerCredit = ref();
-
 const $props = defineProps({
     id: {
         type: Number,
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index aff7deda4..8f2c4efb0 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -44,6 +44,7 @@ function handleLocation(data, location) {
                     :required="true"
                     :rules="validate('client.socialName')"
                     clearable
+                    uppercase="true"
                     v-model="data.socialName"
                 >
                     <template #append>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 6650ea395..d2eb125d7 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -12,6 +12,7 @@ import VnLinkMail from 'src/components/ui/VnLinkMail.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
+import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 const route = useRoute();
 const { t } = useI18n();
 const grafanaUrl = 'https://grafana.verdnatura.es';
@@ -70,6 +71,9 @@ const sumRisk = ({ clientRisks }) => {
         data-key="CustomerSummary"
         module-name="Customer"
     >
+        <template #menu="{ entity }">
+            <CustomerDescriptorMenu :customer="entity" />
+        </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle
@@ -94,14 +98,13 @@ const sumRisk = ({ clientRisks }) => {
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
                             class="q-ml-xs"
-                            :country="entity.country?.code"
                         />
                     </template>
                 </VnLv>
                 <VnLv :value="entity.email" copy
                     ><template #label>
                         {{ t('globals.params.email') }}
-                        <VnLinkMail :email="entity.email"></VnLinkMail> </template
+                        <VnLinkMail email="entity.email"></VnLinkMail> </template
                 ></VnLv>
                 <VnLv
                     :label="t('customer.summary.salesPerson')"
@@ -173,7 +176,7 @@ const sumRisk = ({ clientRisks }) => {
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
                     />
-                    <VnLv :label="t('globals.isVies')" :value="entity.isVies" />
+                    <VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
                 </VnRow>
             </QCard>
             <QCard class="vn-one">
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 53a12bf43..eae97d1be 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -1,3 +1,4 @@
+
 <script setup>
 import { useI18n } from 'vue-i18n';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
@@ -169,9 +170,16 @@ en:
         fi: FI
         salesPersonFk: Salesperson
         provinceFk: Province
+        isActive: Is active
         city: City
         phone: Phone
         email: Email
+        isToBeMailed: Mailed
+        isEqualizated: Equailized
+        businessTypeFk: Business type
+        sageTaxTypeFk: Sage Tax Type
+        sageTransactionTypeFk: Sage Tax Type
+        payMethodFk: Billing data
         zoneFk: Zone
         socialName : Social name
         name: Name
@@ -180,6 +188,13 @@ es:
     params:
         search: Contiene
         fi: NIF
+        isActive: Activo
+        isToBeMailed: A enviar
+        isEqualizated:  Recargo de equivalencia
+        businessTypeFk: Tipo de negocio
+        sageTaxTypeFk: Tipo de impuesto Sage
+        sageTransactionTypeFk: Tipo de impuesto Sage
+        payMethodFk: Forma de pago
         salesPersonFk: Comercial
         provinceFk: Provincia
         city: Ciudad
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 12aa8fe5e..7efa5e7e5 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -37,8 +37,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('globals.name'),
         name: 'name',
+        label: t('globals.name'),
         isTitle: true,
         create: true,
         columnClass: 'expand',
@@ -50,17 +50,31 @@ const columns = computed(() => [
         isTitle: true,
         create: true,
         columnClass: 'expand',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['socialName'],
+                optionLabel: 'socialName',
+                optionValue: 'socialName',
+                uppercase: false,
+            },
+        },
+        attrs: {
+            uppercase: true,
+        },
+
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.fi'),
         name: 'fi',
+        label: t('customer.extendedList.tableVisibleColumns.fi'),
         create: true,
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
         name: 'salesPersonFk',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
         component: 'select',
         attrs: {
             url: 'Workers/activeWithInheritedRole',
@@ -76,8 +90,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.credit'),
         name: 'credit',
+        label: t('customer.summary.credit'),
         columnFilter: {
             component: 'number',
             inWhere: true,
@@ -85,8 +99,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
         name: 'creditInsurance',
+        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
         columnFilter: {
             component: 'number',
             inWhere: true,
@@ -94,8 +108,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.phone'),
         name: 'phone',
+        label: t('customer.extendedList.tableVisibleColumns.phone'),
         cardVisible: true,
         columnFilter: {
             component: 'number',
@@ -114,8 +128,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.mobile'),
         name: 'mobile',
+        label: t('customer.summary.mobile'),
         cardVisible: true,
         columnFilter: {
             component: 'number',
@@ -124,8 +138,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.street'),
         name: 'street',
+        label: t('customer.extendedList.tableVisibleColumns.street'),
         create: true,
         columnFilter: {
             inWhere: true,
@@ -134,8 +148,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
         name: 'countryFk',
+        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
         columnFilter: {
             component: 'select',
             inWhere: true,
@@ -148,8 +162,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
         name: 'provinceFk',
+        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
         component: 'select',
         attrs: {
             url: 'Provinces',
@@ -161,24 +175,24 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.city'),
         name: 'city',
+        label: t('customer.summary.city'),
     },
     {
         align: 'left',
-        label: t('customer.summary.postcode'),
         name: 'postcode',
+        label: t('customer.summary.postcode'),
     },
     {
         align: 'left',
-        label: t('globals.params.email'),
         name: 'email',
+        label: t('globals.params.email'),
         cardVisible: true,
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.created'),
         name: 'created',
+        label: t('customer.extendedList.tableVisibleColumns.created'),
         format: ({ created }) => toDate(created),
         columnFilter: {
             component: 'date',
@@ -188,10 +202,13 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
         name: 'businessTypeFk',
+        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
         create: true,
         component: 'select',
+        columnFilter: {
+            inWhere: true,
+        },
         attrs: {
             url: 'BusinessTypes',
             fields: ['code', 'description'],
@@ -206,8 +223,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.payMethodFk'),
         name: 'payMethodFk',
+        label: t('customer.summary.payMethodFk'),
         columnFilter: {
             component: 'select',
             attrs: {
@@ -227,8 +244,6 @@ const columns = computed(() => [
                 optionLabel: 'vat',
                 url: 'SageTaxTypes',
             },
-            alias: 'sti',
-            inWhere: true,
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.sageTaxType),
     },
@@ -242,15 +257,13 @@ const columns = computed(() => [
                 optionLabel: 'transaction',
                 url: 'SageTransactionTypes',
             },
-            alias: 'stt',
-            inWhere: true,
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.sageTransactionType),
     },
     {
         align: 'left',
-        label: t('customer.summary.isActive'),
         name: 'isActive',
+        label: t('customer.summary.isActive'),
         chip: {
             color: null,
             condition: (value) => !value,
@@ -262,24 +275,24 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('globals.isVies'),
         name: 'isVies',
+        label: t('globals.isVies'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
         name: 'isTaxDataChecked',
+        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.summary.isEqualizated'),
         name: 'isEqualizated',
+        label: t('customer.summary.isEqualizated'),
         create: true,
         columnFilter: {
             inWhere: true,
@@ -287,8 +300,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
         name: 'isFreezed',
+        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
         chip: {
             color: null,
             condition: (value) => value,
@@ -300,48 +313,48 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
         name: 'hasToInvoice',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
         name: 'hasToInvoiceByAddress',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
         name: 'isToBeMailed',
+        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.summary.hasLcr'),
         name: 'hasLcr',
+        label: t('customer.summary.hasLcr'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.summary.hasCoreVnl'),
         name: 'hasCoreVnl',
+        label: t('customer.summary.hasCoreVnl'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
         name: 'hasSepaVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
         columnFilter: {
             inWhere: true,
         },
@@ -422,32 +435,10 @@ function handleLocation(data, location) {
             <VnSelectWorker
                 :label="t('customer.summary.salesPerson')"
                 v-model="data.salesPersonFk"
-                :params="{
-                    departmentCodes: ['VT', 'shopping'],
-                }"
                 :has-avatar="true"
-                :id-value="data.salesPersonFk"
                 emit-value
                 auto-load
             >
-                <template #prepend>
-                    <VnAvatar
-                        :worker-id="data.salesPersonFk"
-                        color="primary"
-                        :title="title"
-                    />
-                </template>
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption
-                                >{{ scope.opt?.nickname }},
-                                {{ scope.opt?.code }}</QItemLabel
-                            >
-                        </QItemSection>
-                    </QItem>
-                </template>
             </VnSelectWorker>
             <VnLocation
                 :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index bc4d6a128..32b4078db 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -11,6 +11,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -150,6 +151,22 @@ function onAgentCreated({ id, fiscalName }, data) {
                     </template>
                 </VnSelectDialog>
             </VnRow>
+            <VnRow>
+                <VnInputNumber
+                    :label="t('Longitude')"
+                    clearable
+                    v-model="data.longitude"
+                    :decimal-places="7"
+                    :positive="false"
+                />
+                <VnInputNumber
+                    :label="t('Latitude')"
+                    clearable
+                    v-model="data.latitude"
+                    :decimal-places="7"
+                    :positive="false"
+                />
+            </VnRow>
         </template>
     </FormModel>
 </template>
@@ -175,4 +192,6 @@ es:
     Mobile: Movíl
     Incoterms: Incoterms
     Customs agent: Agente de aduanas
+    Longitude: Longitud
+    Latitude: Latitud
 </i18n>
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 18cee7309..1918838b7 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -94,3 +94,24 @@ customer:
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
             hasSepaVnl: VNL B2B received
+    params:
+        id: Id
+        isWorker: Is Worker
+        payMethod: Payment Method
+        workerFk: Author
+        observation: Last Observation
+        created: Last Update Date
+        creditInsurance: Credit Insurance
+        defaulterSinced: Defaulted Since
+        hasRecovery: Has Recovery
+        socialName: Social name
+        city: City
+        phone: Phone
+        postcode: Postcode
+        campaign: Campaign
+        grouped: Grouped
+        search: Contains
+        itemId: Item Id
+        ticketFk: Ticket Id
+        description: Description
+        quantity: Quantity
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index b544f8ad7..d5db3df1b 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -96,3 +96,24 @@ customer:
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
             hasSepaVnl: Recibido B2B VNL
+    params:
+        id: ID
+        isWorker: Es trabajador
+        payMethod: F. Pago
+        workerFk: Autor
+        observation: Última observación
+        created: Fecha Ú. O.
+        creditInsurance: Crédito A.
+        defaulterSinced: Desde
+        hasRecovery: Tiene recobro
+        socialName: Razón social
+        campaign: Campaña
+        city: Ciudad
+        phone: Teléfono
+        postcode: Código postal
+        grouped: Agrupado
+        search: Contiene
+        itemId: Id Artículo
+        ticketFk: Id Ticket
+        description: Descripción
+        quantity: Cantidad
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Department/Card/DepartmentCard.vue
index 21247ca5a..8597e37cf 100644
--- a/src/pages/Department/Card/DepartmentCard.vue
+++ b/src/pages/Department/Card/DepartmentCard.vue
@@ -1,13 +1,13 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         class="q-pa-md column items-center"
         v-bind="{ ...$attrs }"
         data-key="Department"
         base-url="Departments"
         :descriptor="DepartmentDescriptor"
     />
-</template>
+</template>
\ No newline at end of file
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
index 498a05acb..b219ccfe1 100644
--- a/src/pages/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -83,7 +83,11 @@ const { openConfirmationModal } = useVnConfirm();
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('department.chat')" :value="entity.chatName" />
-            <VnLv :label="t('globals.email')" :value="entity.notificationEmail" copy />
+            <VnLv
+                :label="t('globals.params.email')"
+                :value="entity.notificationEmail"
+                copy
+            />
             <VnLv
                 :label="t('department.selfConsumptionCustomer')"
                 :value="entity.client?.name"
@@ -102,7 +106,7 @@ const { openConfirmationModal } = useVnConfirm();
                     :to="{
                         name: 'WorkerList',
                         query: {
-                            params: JSON.stringify({ departmentFk: entityId }),
+                            table: JSON.stringify({ departmentFk: entityId }),
                         },
                     }"
                 >
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
index 03f9b7860..d41f8622b 100644
--- a/src/pages/Department/Card/DepartmentSummary.vue
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -40,7 +40,7 @@ onMounted(async () => {
         <template #body="{ entity: department }">
             <QCard class="column">
                 <VnTitle
-                    :url="`#/department/department/${entityId}/basic-data`"
+                    :url="`#/worker/department/${entityId}/basic-data`"
                     :text="t('Basic data')"
                 />
                 <div class="full-width row wrap justify-between content-between">
@@ -58,7 +58,7 @@ onMounted(async () => {
                             dash
                         />
                         <VnLv
-                            :label="t('globals.email')"
+                            :label="t('globals.params.email')"
                             :value="department.notificationEmail"
                             dash
                         />
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 147287837..68d666fc0 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -3,7 +3,6 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useRole } from 'src/composables/useRole';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -11,7 +10,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
-
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toDate } from 'src/filters';
 
 const route = useRoute();
@@ -26,6 +25,7 @@ const onFilterTravelSelected = (formData, id) => {
     formData.travelFk = id;
 };
 </script>
+
 <template>
     <FetchData
         ref="companiesRef"
@@ -93,14 +93,13 @@ const onFilterTravelSelected = (formData, id) => {
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
                             <QItemSection>
-                                <QItemLabel
-                                    >{{ scope.opt?.agencyModeName }} -
-                                    {{ scope.opt?.warehouseInName }} ({{
-                                        toDate(scope.opt?.shipped)
-                                    }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
-                                        toDate(scope.opt?.landed)
-                                    }})</QItemLabel
-                                >
+                                <QItemLabel>
+                                    {{ scope.opt?.agencyModeName }} -
+                                    {{ scope.opt?.warehouseInName }}
+                                    ({{ toDate(scope.opt?.shipped) }}) →
+                                    {{ scope.opt?.warehouseOutName }}
+                                    ({{ toDate(scope.opt?.landed) }})
+                                </QItemLabel>
                             </QItemSection>
                         </QItem>
                     </template>
@@ -126,6 +125,13 @@ const onFilterTravelSelected = (formData, id) => {
                 />
             </VnRow>
             <VnRow>
+                <VnInputNumber
+                    :label="t('entry.summary.commission')"
+                    v-model="data.commission"
+                    step="1"
+                    autofocus
+                    :positive="false"
+                />
                 <VnSelect
                     :label="t('entry.summary.currency')"
                     v-model="data.currencyFk"
@@ -133,12 +139,23 @@ const onFilterTravelSelected = (formData, id) => {
                     option-value="id"
                     option-label="code"
                 />
-                <QInput
-                    :label="t('entry.summary.commission')"
-                    v-model="data.commission"
-                    type="number"
-                    autofocus
-                    min="0"
+            </VnRow>
+            <VnRow>
+                <VnInputNumber
+                    v-model="data.initialTemperature"
+                    name="initialTemperature"
+                    :label="t('entry.basicData.initialTemperature')"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
+                />
+                <VnInputNumber
+                    v-model="data.finalTemperature"
+                    name="finalTemperature"
+                    :label="t('entry.basicData.finalTemperature')"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
                 />
             </VnRow>
             <VnRow>
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 3f2596338..e00623a21 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,21 +1,13 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
-import EntryFilter from '../EntryFilter.vue';
-import filter from './EntryFilter.js';
+import filter from './EntryFilter.js'
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Entry"
         base-url="Entries"
-        :filter="filter"
         :descriptor="EntryDescriptor"
-        :filter-panel="EntryFilter"
-        search-data-key="EntryList"
-        :searchbar-props="{
-            url: 'Entries/filter',
-            label: 'Search entries',
-            info: 'You can search by entry reference',
-        }"
+        :user-filter="filter"
     />
 </template>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index eee76868b..9a154c357 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -7,9 +7,9 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { toDate } from 'src/filters';
-import { usePrintService } from 'composables/usePrintService';
 import { getUrl } from 'src/composables/getUrl';
 import filter from './EntryFilter.js';
+import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -21,7 +21,6 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const { openReport } = usePrintService();
 const entryDescriptorRef = ref(null);
 const url = ref();
 
@@ -52,10 +51,6 @@ const getEntryRedirectionFilter = (entry) => {
         to,
     });
 };
-
-const showEntryReport = () => {
-    openReport(`Entries/${route.params.id}/entry-order-pdf`);
-};
 </script>
 
 <template>
@@ -68,14 +63,12 @@ const showEntryReport = () => {
         data-key="Entry"
     >
         <template #menu="{ entity }">
-            <QItem v-ripple clickable @click="showEntryReport(entity)">
-                <QItemSection>{{ t('Show entry report') }}</QItemSection>
-            </QItem>
+            <EntryDescriptorMenu :id="entity.id" />
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('globals.agency')" :value="entity.travel?.agency?.name" />
-            <VnLv :label="t('globals.shipped')" :value="toDate(entity.travel?.shipped)" />
-            <VnLv :label="t('globals.landed')" :value="toDate(entity.travel?.landed)" />
+            <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
+            <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
             <VnLv
                 :label="t('globals.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"
diff --git a/src/pages/Entry/Card/EntryDescriptorMenu.vue b/src/pages/Entry/Card/EntryDescriptorMenu.vue
new file mode 100644
index 000000000..a357b46fe
--- /dev/null
+++ b/src/pages/Entry/Card/EntryDescriptorMenu.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { usePrintService } from 'composables/usePrintService';
+
+const { openReport } = usePrintService();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+function showEntryReport() {
+    openReport(`Entries/${$props.id}/entry-order-pdf`);
+}
+</script>
+
+<template>
+    <QItem v-ripple clickable @click="showEntryReport">
+        <QItemSection>{{ $t('entryList.list.showEntryReport') }}</QItemSection>
+    </QItem>
+</template>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 2545aecd3..8c46fb6e6 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -7,11 +7,14 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
-import { toDate, toCurrency } from 'src/filters';
+import { toDate, toCurrency, toCelsius } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -147,9 +150,8 @@ async function setEntryData(data) {
 }
 
 const fetchEntryBuys = async () => {
-        const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`);
-        if (data) entryBuys.value = data;
-
+    const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`);
+    if (data) entryBuys.value = data;
 };
 </script>
 
@@ -171,15 +173,15 @@ const fetchEntryBuys = async () => {
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
         </template>
+        <template #menu="{ entity }">
+            <EntryDescriptorMenu :id="entity.id" />
+        </template>
         <template #body>
             <QCard class="vn-one">
-                <router-link
-                    :to="{ name: 'EntryBasicData', params: { id: entityId } }"
-                    class="header header-link"
-                >
-                    {{ t('globals.summary.basicData') }}
-                    <QIcon name="open_in_new" />
-                </router-link>
+                <VnTitle
+                    :url="`#/entry/${entityId}/basic-data`"
+                    :text="t('globals.summary.basicData')"
+                />
                 <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
                 <VnLv
                     :label="t('entry.summary.currency')"
@@ -191,15 +193,20 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.invoiceNumber')"
                     :value="entry.invoiceNumber"
                 />
+                <VnLv
+                    :label="t('entry.basicData.initialTemperature')"
+                    :value="toCelsius(entry.initialTemperature)"
+                />
+                <VnLv
+                    :label="t('entry.basicData.finalTemperature')"
+                    :value="toCelsius(entry.finalTemperature)"
+                />
             </QCard>
             <QCard class="vn-one">
-                <router-link
-                    :to="{ name: 'EntryBasicData', params: { id: entityId } }"
-                    class="header header-link"
-                >
-                    {{ t('globals.summary.basicData') }}
-                    <QIcon name="open_in_new" />
-                </router-link>
+                <VnTitle
+                    :url="`#/entry/${entityId}/basic-data`"
+                    :text="t('globals.summary.basicData')"
+                />
                 <VnLv :label="t('entry.summary.travelReference')">
                     <template #value>
                         <span class="link">
@@ -212,61 +219,45 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.travelAgency')"
                     :value="entry.travel.agency?.name"
                 />
-                <VnLv :label="t('globals.shipped')" :value="toDate(entry.travel.shipped)" />
+                <VnLv
+                    :label="t('globals.shipped')"
+                    :value="toDate(entry.travel.shipped)"
+                />
                 <VnLv
                     :label="t('globals.warehouseOut')"
                     :value="entry.travel.warehouseOut?.name"
                 />
-                <QCheckbox
+                <VnLv
                     :label="t('entry.summary.travelDelivered')"
-                    v-model="entry.travel.isDelivered"
-                    :disable="true"
+                    :value="entry.travel.isDelivered"
                 />
                 <VnLv :label="t('globals.landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
                     :label="t('globals.warehouseIn')"
                     :value="entry.travel.warehouseIn?.name"
                 />
-                <QCheckbox
+                <VnLv
                     :label="t('entry.summary.travelReceived')"
-                    v-model="entry.travel.isReceived"
-                    :disable="true"
+                    :value="entry.travel.isReceived"
                 />
             </QCard>
             <QCard class="vn-one">
-                <router-link
-                    :to="{ name: 'TravelSummary', params: { id: entry.travel.id } }"
-                    class="header header-link"
-                >
-                    {{ t('Travel data') }}
-                    <QIcon name="open_in_new" />
-                </router-link>
-                <QCheckbox
-                    :label="t('entry.summary.ordered')"
-                    v-model="entry.isOrdered"
-                    :disable="true"
-                />
-                <QCheckbox
-                    :label="t('globals.confirmed')"
-                    v-model="entry.isConfirmed"
-                    :disable="true"
-                />
-                <QCheckbox
-                    :label="t('entry.summary.booked')"
-                    v-model="entry.isBooked"
-                    :disable="true"
-                />
-                <QCheckbox
-                    :label="t('entry.summary.excludedFromAvailable')"
-                    v-model="entry.isExcludedFromAvailable"
-                    :disable="true"
-                />
+                <VnTitle :url="`#/travel/${entityId}/summary`" :text="t('Travel data')" />
+                <VnRow class="block">
+                    <VnLv :label="t('entry.summary.ordered')" :value="entry.isOrdered" />
+                    <VnLv :label="t('globals.confirmed')" :value="entry.isConfirmed" />
+                    <VnLv :label="t('entry.summary.booked')" :value="entry.isBooked" />
+                    <VnLv
+                        :label="t('entry.summary.excludedFromAvailable')"
+                        :value="entry.isExcludedFromAvailable"
+                    />
+                </VnRow>
             </QCard>
-            <QCard class="vn-two" style="min-width: 100%">
-                <a class="header header-link">
-                    {{ t('entry.summary.buys') }}
-                    <QIcon name="open_in_new" />
-                </a>
+            <QCard class="vn-max">
+                <VnTitle
+                    :url="`#/entry/${entityId}/buys`"
+                    :text="t('entry.summary.buys')"
+                />
                 <QTable
                     :rows="entryBuys"
                     :columns="entriesTableColumns"
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index f50810eb7..bc8b40aaa 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -40,7 +40,7 @@ const companiesOptions = ref([]);
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ t(`entryFilter.params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -49,7 +49,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.search"
-                        :label="t('entryFilter.filter.search')"
+                        :label="t('entryFilter.params.search')"
                         is-outlined
                     />
                 </QItemSection>
@@ -58,7 +58,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.reference"
-                        :label="t('entryFilter.filter.reference')"
+                        :label="t('entryFilter.params.reference')"
                         is-outlined
                     />
                 </QItemSection>
@@ -67,7 +67,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.invoiceNumber"
-                        :label="t('params.invoiceNumber')"
+                        :label="t('entryFilter.params.invoiceNumber')"
                         is-outlined
                     />
                 </QItemSection>
@@ -76,7 +76,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.travelFk"
-                        :label="t('params.travelFk')"
+                        :label="t('entryFilter.params.travelFk')"
                         is-outlined
                     />
                 </QItemSection>
@@ -84,7 +84,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('params.companyFk')"
+                        :label="t('entryFilter.params.companyFk')"
                         v-model="params.companyFk"
                         @update:model-value="searchFn()"
                         :options="companiesOptions"
@@ -100,7 +100,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('params.currencyFk')"
+                        :label="t('entryFilter.params.currencyFk')"
                         v-model="params.currencyFk"
                         @update:model-value="searchFn()"
                         :options="currenciesOptions"
@@ -116,13 +116,14 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('params.supplierFk')"
+                        :label="t('entryFilter.params.supplierFk')"
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
                         url="Suppliers"
                         option-value="id"
                         option-label="name"
                         :fields="['id', 'name', 'nickname']"
+                        :filter-options="['id', 'name', 'nickname']"
                         sort-by="nickname"
                         hide-selected
                         dense
@@ -132,9 +133,12 @@ const companiesOptions = ref([]);
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{
-                                        scope.opt?.name + ': ' + scope.opt?.nickname
-                                    }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
@@ -144,7 +148,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.created')"
+                        :label="t('entryFilter.params.created')"
                         v-model="params.created"
                         @update:model-value="searchFn()"
                         is-outlined
@@ -154,7 +158,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.from')"
+                        :label="t('entryFilter.params.from')"
                         v-model="params.from"
                         @update:model-value="searchFn()"
                         is-outlined
@@ -164,7 +168,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.to')"
+                        :label="t('entryFilter.params.to')"
                         v-model="params.to"
                         @update:model-value="searchFn()"
                         is-outlined
@@ -174,14 +178,14 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isBooked')"
+                        :label="t('entryFilter.params.isBooked')"
                         v-model="params.isBooked"
                         toggle-indeterminate
                     />
                 </QItemSection>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isConfirmed')"
+                        :label="t('entryFilter.params.isConfirmed')"
                         v-model="params.isConfirmed"
                         toggle-indeterminate
                     />
@@ -190,7 +194,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isOrdered')"
+                        :label="t('entryFilter.params.isOrdered')"
                         v-model="params.isOrdered"
                         toggle-indeterminate
                     />
@@ -198,35 +202,4 @@ const companiesOptions = ref([]);
             </QItem>
         </template>
     </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        
-        invoiceNumber: Invoice number
-        travelFk: Travel
-        companyFk: Company
-        currencyFk: Currency
-        supplierFk: Supplier
-        from: From
-        to: To
-        created: Created
-        isBooked: Booked
-        isConfirmed: Confirmed
-        isOrdered: Ordered
-es:
-    params:
-       
-        invoiceNumber: Núm. factura
-        travelFk: Envío
-        companyFk: Empresa
-        currencyFk: Moneda
-        supplierFk: Proveedor
-        from: Desde
-        to: Hasta
-        created: Fecha creación
-        isBooked: Asentado
-        isConfirmed: Confirmado
-        isOrdered: Pedida
-</i18n>
+</template>
\ No newline at end of file
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 450efe624..73fdcbbbf 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -102,7 +102,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('globals.weightByPiece'),
+        label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
         name: 'weightByPiece',
         columnFilter: {
             component: 'number',
@@ -157,7 +157,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.buys.packageValue'),
+        label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
         name: 'packageValue',
         columnFilter: {
             component: 'number',
@@ -262,8 +262,3 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :right-search="false"
     />
 </template>
-
-<i18n>
-es:
-    Edit buy(s): Editar compra(s)
-</i18n>
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index dbca58131..59dddce26 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -69,12 +69,14 @@ const tagValues = ref([]);
                         use-input
                         @update:model-value="searchFn()"
                     >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
                                     <QItemLabel caption>
-                                        {{ opt.nickname }}
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 84ead85ad..641042156 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -1,20 +1,18 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import EntryFilter from './EntryFilter.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import { toDate } from 'src/filters';
+import { toCelsius, toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import EntrySummary from './Card/EntrySummary.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
 const tableRef = ref();
+const dataKey = 'EntryList';
 
 const { viewSummary } = useSummaryDialog();
 const entryFilter = {
@@ -159,6 +157,20 @@ const columns = computed(() => [
         name: 'invoiceAmount',
         cardVisible: true,
     },
+    {
+        align: 'left',
+        name: 'initialTemperature',
+        label: t('entry.basicData.initialTemperature'),
+        field: 'initialTemperature',
+        format: (row) => toCelsius(row.initialTemperature),
+    },
+    {
+        align: 'left',
+        name: 'finalTemperature',
+        label: t('entry.basicData.finalTemperature'),
+        field: 'finalTemperature',
+        format: (row) => toCelsius(row.finalTemperature),
+    },
     {
         label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'),
         name: 'isExcludedFromAvailable',
@@ -180,74 +192,73 @@ const columns = computed(() => [
     },
 ]);
 </script>
+
 <template>
-    <VnSearchbar
-        data-key="EntryList"
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="entry"
         url="Entries/filter"
-        :label="t('Search entries')"
-        :info="t('You can search by entry reference')"
-    />
-    <RightMenu>
-        <template #right-panel>
+        :array-data-props="{
+            url: 'Entries/filter',
+            order: 'id DESC',
+            userFilter: entryFilter,
+        }"
+    >
+        <template #rightMenu>
             <EntryFilter data-key="EntryList" />
         </template>
-    </RightMenu>
-    <VnTable
-        ref="tableRef"
-        data-key="EntryList"
-        url="Entries/filter"
-        :filter="entryFilter"
-        :create="{
-            urlCreate: 'Entries',
-            title: t('Create entry'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
-        }"
-        order="id DESC"
-        :columns="columns"
-        redirect="entry"
-        :right-search="false"
-    >
-        <template #column-status="{ row }">
-            <div class="row q-gutter-xs">
-                <QIcon
-                    v-if="!!row.isExcludedFromAvailable"
-                    name="vn:inventory"
-                    color="primary"
-                >
-                    <QTooltip>{{
-                        t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
-                    }}</QTooltip>
-                </QIcon>
-                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
-                    <QTooltip>
-                        {{
-                            t('globals.raid', { daysInForward: row.daysInForward })
-                        }}</QTooltip
-                    >
-                </QIcon>
-            </div>
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'Entries',
+                    title: t('entry.list.newEntry'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: {},
+                }"
+                :columns="columns"
+                redirect="entry"
+                :right-search="false"
+            >
+                <template #column-status="{ row }">
+                    <div class="row q-gutter-xs">
+                        <QIcon
+                            v-if="!!row.isExcludedFromAvailable"
+                            name="vn:inventory"
+                            color="primary"
+                        >
+                            <QTooltip>{{
+                                t(
+                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable'
+                                )
+                            }}</QTooltip>
+                        </QIcon>
+                        <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
+                            <QTooltip>
+                                {{
+                                    t('globals.raid', {
+                                        daysInForward: row.daysInForward,
+                                    })
+                                }}</QTooltip
+                            >
+                        </QIcon>
+                    </div>
+                </template>
+                <template #column-supplierFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.supplierName }}
+                        <SupplierDescriptorProxy :id="row.supplierFk" />
+                    </span>
+                </template>
+                <template #column-travelFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.travelRef }}
+                        <TravelDescriptorProxy :id="row.travelFk" />
+                    </span>
+                </template>
+            </VnTable>
         </template>
-        <template #column-supplierFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.supplierName }}
-                <SupplierDescriptorProxy :id="row.supplierFk" />
-            </span>
-        </template>
-        <template #column-travelFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.travelRef }}
-                <TravelDescriptorProxy :id="row.travelFk" />
-            </span>
-        </template>
-    </VnTable>
+    </VnSection>
 </template>
-
-<i18n>
-es:
-    Inventory entry: Es inventario
-    Virtual entry: Es una redada
-    Search entries: Buscar entradas
-    You can search by entry reference: Puedes buscar por referencia de la entrada
-    Create entry: Crear entrada
-</i18n>
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 3f0cd2d99..fa0bdc12e 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
@@ -19,7 +19,7 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
-const columns = [
+const columns = computed(() => [
     {
         align: 'left',
         label: 'Id',
@@ -31,7 +31,7 @@ const columns = [
     {
         align: 'left',
         name: 'workerFk',
-        label: t('Buyer'),
+        label: t('entryStockBought.buyer'),
         isTitle: true,
         component: 'select',
         cardVisible: true,
@@ -49,7 +49,7 @@ const columns = [
     },
     {
         align: 'center',
-        label: t('Reserve'),
+        label: t('entryStockBought.reserve'),
         name: 'reserve',
         columnFilter: false,
         create: true,
@@ -58,7 +58,7 @@ const columns = [
     },
     {
         align: 'center',
-        label: t('Bought'),
+        label: t('entryStockBought.bought'),
         name: 'bought',
         summation: true,
         cardVisible: true,
@@ -66,7 +66,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('Date'),
+        label: t('entryStockBought.date'),
         name: 'dated',
         component: 'date',
         visible: false,
@@ -77,7 +77,7 @@ const columns = [
         name: 'tableActions',
         actions: [
             {
-                title: t('View more details'),
+                title: t('entryStockBought.viewMoreDetails'),
                 icon: 'search',
                 isPrimary: true,
                 action: (row) => {
@@ -92,7 +92,7 @@ const columns = [
             },
         ],
     },
-];
+]);
 
 const fetchDataRef = ref();
 const travelDialogRef = ref(false);
@@ -166,7 +166,7 @@ function round(value) {
             <VnRow class="travel">
                 <div v-if="travel">
                     <span style="color: var(--vn-label-color)">
-                        {{ t('Purchase Spaces') }}:
+                        {{ t('entryStockBought.purchaseSpaces') }}:
                     </span>
                     <span>
                         {{ travel?.m3 }}
@@ -177,7 +177,7 @@ function round(value) {
                         flat
                         icon="edit"
                         @click="openDialog()"
-                        :title="t('Edit travel')"
+                        :title="t('entryStockBought.editTravel')"
                         color="primary"
                     />
                 </div>
@@ -226,7 +226,7 @@ function round(value) {
                 @on-fetch="(data) => setFooter(data)"
                 :create="{
                     urlCreate: 'StockBoughts',
-                    title: t('Reserve some space'),
+                    title: t('entryStockBought.reserveSomeSpace'),
                     onDataSaved: () => tableRef.reload(),
                     formInitialData: {
                         workerFk: user.id,
@@ -288,16 +288,3 @@ function round(value) {
     color: $negative !important;
 }
 </style>
-<i18n>
-    es:
-        Edit travel: Editar envío
-        Travel: Envíos
-        Purchase Spaces: Espacios de compra
-        Buyer: Comprador
-        Reserve: Reservado
-        Bought: Comprado
-        Date: Fecha
-        View more details: Ver más detalles
-        Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
-</i18n>
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index dbe05eb88..3f7566ae0 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -123,8 +123,8 @@ const printBuys = (rowId) => {
     <VnSearchbar
         data-key="myEntriesList"
         url="Entries/filter"
-        :label="t('Search entries')"
-        :info="t('You can search by entry reference')"
+        :label="t('myEntries.search')"
+        :info="t('myEntries.searchInfo')"
     />
     <VnTable
         data-key="myEntriesList"
@@ -137,7 +137,3 @@ const printBuys = (rowId) => {
         chip-locale="myEntries"
     />
 </template>
-
-<i18n>
-    You can search by entry reference: Puedes buscar por referencia de la entrada
-</i18n>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 6e41566d0..97a3be32b 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -1,8 +1,94 @@
-entryList:
+entry:
     list:
+        newEntry: New entry
+        tableVisibleColumns:
+            created: Creation
+            supplierFk: Supplier
+            isBooked: Booked
+            isConfirmed: Confirmed
+            isOrdered: Ordered
+            companyFk: Company
+            travelFk: Travel
+            isExcludedFromAvailable: Inventory
+            invoiceAmount: Import
         inventoryEntry: Inventory entry
+    summary:
+        commission: Commission
+        currency: Currency
+        invoiceNumber: Invoice number
+        ordered: Ordered
+        booked: Booked
+        excludedFromAvailable: Inventory
+        travelReference: Reference
+        travelAgency: Agency
+        travelShipped: Shipped
+        travelDelivered: Delivered
+        travelLanded: Landed
+        travelReceived: Received
+        buys: Buys
+        stickers: Stickers
+        package: Package
+        packing: Pack.
+        grouping: Group.
+        buyingValue: Buying value
+        import: Import
+        pvp: PVP
+    basicData:
+        travel: Travel
+        currency: Currency
+        commission: Commission
+        observation: Observation
+        booked: Booked
+        excludedFromAvailable: Inventory
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
+    buys:
+        observations: Observations
+        packagingFk: Box
+        color: Color
+        printedStickers: Printed stickers
+    notes:
+        observationType: Observation type
+    latestBuys:
+        tableVisibleColumns:
+            image: Picture
+            itemFk: Item ID
+            weightByPiece: Weight/Piece
+            isActive: Active
+            family: Family
+            entryFk: Entry
+            freightValue: Freight value
+            comissionValue: Commission value
+            packageValue: Package value
+            isIgnored: Is ignored
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            packingOut: Package out
+            landing: Landing
+            isExcludedFromAvailable: Es inventory
+    params:
+        toShipped: To
+        fromShipped: From
+        daysOnward: Days onward
+        daysAgo: Days ago
+        warehouseInFk: Warehouse in
+    search: Search entries
+    searchInfo: You can search by entry reference
 entryFilter:
-    filter:
+    params:
+        invoiceNumber: Invoice number
+        travelFk: Travel
+        companyFk: Company
+        currencyFk: Currency
+        supplierFk: Supplier
+        from: From
+        to: To
+        created: Created
+        isBooked: Booked
+        isConfirmed: Confirmed
+        isOrdered: Ordered
         search: General search
         reference: Reference
 myEntries:
@@ -18,5 +104,18 @@ myEntries:
     daysOnward: Days onward
     daysAgo: Days ago
     downloadCsv: Download CSV
+    search: Search entries
+    searchInfo: You can search by entry reference
+entryStockBought:
+    travel: Travel
+    editTravel: Edit travel
+    purchaseSpaces: Purchase spaces
+    buyer: Buyer
+    reserve: Reserve
+    bought: Bought
+    date: Date
+    viewMoreDetails: View more details
+    reserveSomeSpace: Reserve some space
+    thisBuyerHasReservationThisDate: This buyer has already made a reservation for this date
 wasteRecalc:
     recalcOk: The wastes were successfully recalculated
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 7e627b09f..993913417 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -1,11 +1,95 @@
-Search entries: Buscar entradas
-You can search by entry reference: Puedes buscar por referencia de la entrada
-
-entryList:
+entry:
     list:
+        newEntry: Nueva entrada
+        tableVisibleColumns:
+            created: Creación
+            supplierFk: Proveedor
+            isBooked: Asentado
+            isConfirmed: Confirmado
+            isOrdered: Pedida
+            companyFk: Empresa
+            travelFk: Envio
+            isExcludedFromAvailable: Inventario
+            invoiceAmount: Importe
         inventoryEntry: Es inventario
+    summary:
+        commission: Comisión
+        currency: Moneda
+        invoiceNumber: Núm. factura
+        ordered: Pedida
+        booked: Contabilizada
+        excludedFromAvailable: Inventario
+        travelReference: Referencia
+        travelAgency: Agencia
+        travelShipped: F. envio
+        travelWarehouseOut: Alm. salida
+        travelDelivered: Enviada
+        travelLanded: F. entrega
+        travelReceived: Recibida
+        buys: Compras
+        stickers: Etiquetas
+        package: Embalaje
+        packing: Pack.
+        grouping: Group.
+        buyingValue: Coste
+        import: Importe
+        pvp: PVP
+    basicData:
+        travel: Envío
+        currency: Moneda
+        observation: Observación
+        commission: Comisión
+        booked: Asentado
+        excludedFromAvailable: Inventario
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
+    buys:
+        observations: Observaciónes
+        packagingFk: Embalaje
+        color: Color
+        printedStickers: Etiquetas impresas
+    notes:
+        observationType: Tipo de observación
+    latestBuys:
+        tableVisibleColumns:
+            image: Foto
+            itemFk: Id Artículo
+            weightByPiece: Peso (gramos)/tallo
+            isActive: Activo
+            family: Familia
+            entryFk: Entrada
+            freightValue: Porte
+            comissionValue: Comisión
+            packageValue: Embalaje
+            isIgnored: Ignorado
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            packingOut: Embalaje envíos
+            landing: Llegada
+            isExcludedFromAvailable: Es inventario
+    params:
+        toShipped: Hasta
+        fromShipped: Desde
+        warehouseInFk: Alm. entrada
+        daysOnward: Días adelante
+        daysAgo: Días atras
+    search: Buscar entradas
+    searchInfo: Puedes buscar por referencia de entrada
 entryFilter:
-    filter:
+    params:
+        invoiceNumber: Núm. factura
+        travelFk: Envío
+        companyFk: Empresa
+        currencyFk: Moneda
+        supplierFk: Proveedor
+        from: Desde
+        to: Hasta
+        created: Fecha creación
+        isBooked: Asentado
+        isConfirmed: Confirmado
+        isOrdered: Pedida
         search: Búsqueda general
         reference: Referencia
 myEntries:
@@ -21,5 +105,18 @@ myEntries:
     daysOnward: Días adelante
     daysAgo: Días atras
     downloadCsv: Descargar CSV
+    search: Buscar entradas
+    searchInfo: Puedes buscar por referencia de la entrada
+entryStockBought:
+    travel: Envío
+    editTravel: Editar envío
+    purchaseSpaces: Espacios de compra
+    buyer: Comprador
+    reserve: Reservado
+    bought: Comprado
+    date: Fecha
+    viewMoreDetails: Ver más detalles
+    reserveSomeSpace: Reservar espacio
+    thisBuyerHasReservationThisDate: Este comprador ya ha hecho una reserva para esta fecha
 wasteRecalc:
     recalcOk: Se han recalculado las mermas correctamente
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 83b1aa25e..90aa50af7 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -268,7 +268,7 @@ function deleteFile(dmsFk) {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('InvoiceIn.summary.sage')"
+                    :label="t('invoicein.summary.sage')"
                     v-model="data.withholdingSageFk"
                     :options="sageWithholdings"
                     option-value="id"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index cb8a45833..4d9e180eb 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -1,60 +1,30 @@
 <script setup>
-import { ref, reactive, computed, onBeforeMount, capitalize } from 'vue';
+import { ref, reactive, computed, onBeforeMount } from 'vue';
 import { useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
-import { useAcl } from 'src/composables/useAcl';
-import { downloadFile } from 'src/composables/downloadFile';
-import { useArrayData } from 'src/composables/useArrayData';
-import { usePrintService } from 'composables/usePrintService';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import FetchData from 'src/components/FetchData.vue';
-import SendEmailDialog from 'components/common/SendEmailDialog.vue';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import InvoiceInToBook from '../InvoiceInToBook.vue';
+import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
 
 const $props = defineProps({ id: { type: Number, default: null } });
-
 const { push, currentRoute } = useRouter();
-
-const quasar = useQuasar();
-const { hasAny } = useAcl();
 const { t } = useI18n();
-const { openReport, sendEmail } = usePrintService();
-const arrayData = useArrayData();
 
-const invoiceIn = computed(() => arrayData.store.data);
 const cardDescriptorRef = ref();
 const correctionDialogRef = ref();
 const entityId = computed(() => $props.id || +currentRoute.value.params.id);
 const totalAmount = ref();
-const currentAction = ref();
 const config = ref();
 const cplusRectificationTypes = ref([]);
 const siiTypeInvoiceIns = ref([]);
 const invoiceCorrectionTypes = ref([]);
-const actions = {
-    unbook: {
-        title: t('assertAction', { action: t('unbook') }),
-        action: toUnbook,
-    },
-    delete: {
-        title: t('assertAction', { action: t('delete') }),
-        action: deleteInvoice,
-    },
-    clone: {
-        title: t('assertAction', { action: t('clone') }),
-        action: cloneInvoice,
-    },
-    showPdf: { cb: showPdfInvoice },
-    sendPdf: { cb: sendPdfInvoiceConfirmation },
-    correct: { cb: () => correctionDialogRef.value.show() },
-};
+
 const filter = {
     include: [
         {
@@ -90,7 +60,7 @@ const routes = reactive({
         return {
             name: 'InvoiceInList',
             query: {
-                table: JSON.stringify({ supplierFk: id }),
+                params: JSON.stringify({ supplierFk: id }),
             },
         };
     },
@@ -99,7 +69,7 @@ const routes = reactive({
             return {
                 name: 'InvoiceInList',
                 query: {
-                    table: JSON.stringify({ correctedFk: entityId.value }),
+                    params: JSON.stringify({ correctedFk: entityId.value }),
                 },
             };
         }
@@ -118,21 +88,21 @@ const routes = reactive({
 const correctionFormData = reactive({
     invoiceReason: 2,
     invoiceType: 2,
-    invoiceClass: 8,
+    invoiceClass: 6,
 });
 const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
 
 onBeforeMount(async () => {
     await setInvoiceCorrection(entityId.value);
     const { data } = await axios.get(`InvoiceIns/${entityId.value}/getTotals`);
-    totalAmount.value = data.totalTaxableBase;
+    totalAmount.value = data.totalDueDay;
 });
 
 onBeforeRouteUpdate(async (to, from) => {
     if (to.params.id !== from.params.id) {
         await setInvoiceCorrection(to.params.id);
         const { data } = await axios.get(`InvoiceIns/${to.params.id}/getTotals`);
-        totalAmount.value = data.totalTaxableBase;
+        totalAmount.value = data.totalDueDay;
     }
 });
 
@@ -153,94 +123,6 @@ async function setInvoiceCorrection(id) {
     );
 }
 
-function openDialog() {
-    quasar.dialog({
-        component: VnConfirm,
-        componentProps: {
-            title: t(currentAction.value.title),
-            promise: currentAction.value.action,
-        },
-    });
-}
-
-async function toUnbook() {
-    const { data } = await axios.post(`InvoiceIns/${entityId.value}/toUnbook`);
-    const { isLinked, bookEntry, accountingEntries } = data;
-
-    const type = isLinked ? 'warning' : 'positive';
-    const message = isLinked
-        ? t('isLinked', { bookEntry, accountingEntries })
-        : t('isNotLinked', { bookEntry });
-
-    quasar.notify({ type, message });
-    if (!isLinked) arrayData.store.data.isBooked = false;
-}
-
-async function deleteInvoice() {
-    await axios.delete(`InvoiceIns/${entityId.value}`);
-    quasar.notify({
-        type: 'positive',
-        message: t('Invoice deleted'),
-    });
-    push({ path: '/invoice-in' });
-}
-
-async function cloneInvoice() {
-    const { data } = await axios.post(`InvoiceIns/${entityId.value}/clone`);
-    quasar.notify({
-        type: 'positive',
-        message: t('Invoice cloned'),
-    });
-    push({ path: `/invoice-in/${data.id}/summary` });
-}
-
-const canEditProp = (props) =>
-    hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
-
-const isAgricultural = () => {
-    if (!config.value) return false;
-    return (
-        invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
-        config?.value[0]?.sageWithholdingFk
-    );
-};
-
-function showPdfInvoice() {
-    if (isAgricultural())
-        openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`, null, '_blank');
-}
-
-function sendPdfInvoiceConfirmation() {
-    quasar.dialog({
-        component: SendEmailDialog,
-        componentProps: {
-            data: {
-                address: invoiceIn.value.supplier.contacts[0].email,
-            },
-            promise: sendPdfInvoice,
-        },
-    });
-}
-
-function sendPdfInvoice({ address }) {
-    if (!address)
-        quasar.notify({
-            type: 'negative',
-            message: t(`The email can't be empty`),
-        });
-    else
-        return sendEmail(`InvoiceIns/${entityId.value}/invoice-in-email`, {
-            recipientId: invoiceIn.value.supplier.id,
-            recipient: address,
-        });
-}
-
-function triggerMenu(type) {
-    currentAction.value = actions[type];
-    if (currentAction.value.cb) currentAction.value.cb();
-    else openDialog(type);
-}
-
 const createInvoiceInCorrection = async () => {
     const { data: correctingId } = await axios.post(
         'InvoiceIns/corrective',
@@ -262,7 +144,7 @@ const createInvoiceInCorrection = async () => {
         auto-load
     />
     <FetchData
-        url="siiTypeInvoiceIns"
+        url="SiiTypeInvoiceIns"
         :where="{ code: { like: 'R%' } }"
         @on-fetch="(data) => (siiTypeInvoiceIns = data)"
         auto-load
@@ -281,87 +163,13 @@ const createInvoiceInCorrection = async () => {
         title="supplierRef"
     >
         <template #menu="{ entity }">
-            <InvoiceInToBook>
-                <template #content="{ book }">
-                    <QItem
-                        v-if="!entity?.isBooked && canEditProp('toBook')"
-                        v-ripple
-                        clickable
-                        @click="book(entityId)"
-                    >
-                        <QItemSection>{{ t('To book') }}</QItemSection>
-                    </QItem>
-                </template>
-            </InvoiceInToBook>
-            <QItem
-                v-if="entity?.isBooked && canEditProp('toUnbook')"
-                v-ripple
-                clickable
-                @click="triggerMenu('unbook')"
-            >
-                <QItemSection>
-                    {{ t('To unbook') }}
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-if="canEditProp('deleteById')"
-                v-ripple
-                clickable
-                @click="triggerMenu('delete')"
-            >
-                <QItemSection>{{ t('Delete invoice') }}</QItemSection>
-            </QItem>
-            <QItem
-                v-if="canEditProp('clone')"
-                v-ripple
-                clickable
-                @click="triggerMenu('clone')"
-            >
-                <QItemSection>{{ t('Clone invoice') }}</QItemSection>
-            </QItem>
-            <QItem
-                v-if="isAgricultural()"
-                v-ripple
-                clickable
-                @click="triggerMenu('showPdf')"
-            >
-                <QItemSection>{{ t('Show agricultural receipt as PDF') }}</QItemSection>
-            </QItem>
-            <QItem
-                v-if="isAgricultural()"
-                v-ripple
-                clickable
-                @click="triggerMenu('sendPdf')"
-            >
-                <QItemSection
-                    >{{ t('Send agricultural receipt as PDF') }}...</QItemSection
-                >
-            </QItem>
-            <QItem
-                v-if="!invoiceInCorrection.corrected"
-                v-ripple
-                clickable
-                @click="triggerMenu('correct')"
-            >
-                <QItemSection>{{ t('Create rectificative invoice') }}...</QItemSection>
-            </QItem>
-            <QItem
-                v-if="entity.dmsFk"
-                v-ripple
-                clickable
-                @click="downloadFile(entity.dmsFk)"
-            >
-                <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
-            </QItem>
+            <InvoiceInDescriptorMenu :invoice="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('InvoiceIn.list.issued')" :value="toDate(entity.issued)" />
-            <VnLv
-                :label="t('InvoiceIn.summary.bookedDate')"
-                :value="toDate(entity.booked)"
-            />
-            <VnLv :label="t('InvoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
-            <VnLv :label="t('InvoiceIn.list.supplier')">
+            <VnLv :label="t('invoicein.list.issued')" :value="toDate(entity.issued)" />
+            <VnLv :label="t('invoicein.summary.bookedDate')" :value="toDate(entity.booked)" />
+            <VnLv :label="t('invoicein.list.amount')" :value="toCurrency(totalAmount)" />
+            <VnLv :label="t('invoicein.list.supplier')">
                 <template #value>
                     <span class="link">
                         {{ entity?.supplier?.nickname }}
@@ -378,7 +186,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getSupplier(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('InvoiceIn.list.supplier') }}</QTooltip>
+                    <QTooltip>{{ t('invoicein.list.supplier') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -394,7 +202,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getTickets(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('InvoiceIn.descriptor.ticketList') }}</QTooltip>
+                    <QTooltip>{{ t('InvoiceOut.card.ticketList') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="
@@ -438,7 +246,7 @@ const createInvoiceInCorrection = async () => {
                             readonly
                         />
                         <VnSelect
-                            :label="`${capitalize(t('globals.class'))}`"
+                            :label="`${useCapitalize(t('globals.class'))}`"
                             v-model="correctionFormData.invoiceClass"
                             :options="siiTypeInvoiceIns"
                             option-value="id"
@@ -448,27 +256,15 @@ const createInvoiceInCorrection = async () => {
                     </QItemSection>
                     <QItemSection>
                         <VnSelect
-                            :label="`${capitalize(t('globals.type'))}`"
+                            :label="`${useCapitalize(t('globals.type'))}`"
                             v-model="correctionFormData.invoiceType"
                             :options="cplusRectificationTypes"
                             option-value="id"
                             option-label="description"
                             :required="true"
-                        >
-                            <template #option="{ opt }">
-                                <QItem>
-                                    <QItemSection>
-                                        <QItemLabel
-                                            >{{ opt.code }} -
-                                            {{ opt.description }}</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                                <div></div>
-                            </template>
-                        </VnSelect>
+                        />
                         <VnSelect
-                            :label="`${capitalize(t('globals.reason'))}`"
+                            :label="`${useCapitalize(t('globals.reason'))}`"
                             v-model="correctionFormData.invoiceReason"
                             :options="invoiceCorrectionTypes"
                             option-value="id"
@@ -512,31 +308,3 @@ const createInvoiceInCorrection = async () => {
     }
 }
 </style>
-<i18n>
-en:
-    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries
-    isLinked: The entry {bookEntry} has been linked to Sage. Please contact administration for further information
-    assertAction: Are you sure you want to {action} this invoice?
-es:
-    book: asentar
-    unbook: desasentar
-    delete: eliminar
-    clone: clonar
-    To book: Contabilizar
-    To unbook: Descontabilizar
-    Delete invoice: Eliminar factura
-    Invoice deleted: Factura eliminada
-    Clone invoice: Clonar factura
-    Invoice cloned: Factura clonada
-    Show agricultural receipt as PDF: Ver recibo agrícola como PDF
-    Send agricultural receipt as PDF: Enviar recibo agrícola como PDF
-    Are you sure you want to send it?: Estás seguro que quieres enviarlo?
-    Send PDF invoice: Enviar factura a PDF
-    Create rectificative invoice: Crear factura rectificativa
-    Rectificative invoice: Factura rectificativa
-    Original invoice: Factura origen
-    Entry: entrada
-    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes
-    isLinked: El asiento {bookEntry} fue enlazado a Sage, por favor contacta con administración
-    assertAction: Estas seguro de querer {action} esta factura?
-</i18n>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue
new file mode 100644
index 000000000..647b68f88
--- /dev/null
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue
@@ -0,0 +1,206 @@
+<script setup>
+import { ref, computed, toRefs, reactive } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+import axios from 'axios';
+import { useAcl } from 'src/composables/useAcl';
+import { downloadFile } from 'src/composables/downloadFile';
+import { useArrayData } from 'src/composables/useArrayData';
+import { usePrintService } from 'composables/usePrintService';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import SendEmailDialog from 'components/common/SendEmailDialog.vue';
+import InvoiceInToBook from '../InvoiceInToBook.vue';
+
+const { hasAny } = useAcl();
+const { t } = useI18n();
+const { openReport, sendEmail } = usePrintService();
+const { push, currentRoute } = useRouter();
+const $props = defineProps({
+    invoice: {
+        type: Object,
+        required: true,
+    },
+});
+const { invoice } = toRefs($props);
+const quasar = useQuasar();
+const arrayData = useArrayData();
+const currentAction = ref();
+const config = ref();
+const correctionDialogRef = ref();
+const invoiceInCorrection = reactive({ correcting: [], corrected: null });
+const entityId = computed(() => $props.invoice.id || +currentRoute.value.params.id);
+const invoiceIn = computed(() => arrayData.store.data);
+const actions = {
+    unbook: {
+        title: t('assertAction', { action: t('invoicein.descriptorMenu.unbook') }),
+        action: toUnbook,
+    },
+    delete: {
+        title: t('assertAction', { action: t('invoicein.descriptorMenu.delete') }),
+        action: deleteInvoice,
+    },
+    clone: {
+        title: t('assertAction', { action: t('invoicein.descriptorMenu.clone') }),
+        action: cloneInvoice,
+    },
+    showPdf: { cb: showPdfInvoice },
+    sendPdf: { cb: sendPdfInvoiceConfirmation },
+    correct: { cb: () => correctionDialogRef.value.show() },
+};
+const canEditProp = (props) =>
+    hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
+
+function triggerMenu(type) {
+    currentAction.value = actions[type];
+    if (currentAction.value.cb) currentAction.value.cb();
+    else openDialog(type);
+}
+
+function openDialog() {
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t(currentAction.value.title),
+            promise: currentAction.value.action,
+        },
+    });
+}
+
+async function toUnbook() {
+    const { data } = await axios.post(`InvoiceIns/${entityId.value}/toUnbook`);
+    const { isLinked, bookEntry, accountingEntries } = data;
+
+    const type = isLinked ? 'warning' : 'positive';
+    const message = isLinked
+        ? t('isLinked', { bookEntry })
+        : t('isNotLinked', { bookEntry, accountingEntries });
+
+    quasar.notify({ type, message });
+    if (!isLinked) arrayData.store.data.isBooked = false;
+}
+
+async function deleteInvoice() {
+    await axios.delete(`InvoiceIns/${entityId.value}`);
+    quasar.notify({
+        type: 'positive',
+        message: t('invoicein.descriptorMenu.invoiceDeleted'),
+    });
+    push({ path: '/invoice-in' });
+}
+
+async function cloneInvoice() {
+    const { data } = await axios.post(`InvoiceIns/${entityId.value}/clone`);
+    quasar.notify({
+        type: 'positive',
+        message: t('invoicein.descriptorMenu.invoiceCloned'),
+    });
+    push({ path: `/invoice-in/${data.id}/summary` });
+}
+
+const isAgricultural = () => {
+    if (!config.value) return false;
+    return (
+        invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
+        config?.value[0]?.sageWithholdingFk
+    );
+};
+function showPdfInvoice() {
+    if (isAgricultural()) openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`);
+}
+
+function sendPdfInvoiceConfirmation() {
+    quasar.dialog({
+        component: SendEmailDialog,
+        componentProps: {
+            data: {
+                address: invoiceIn.value.supplier.contacts[0].email,
+            },
+            promise: sendPdfInvoice,
+        },
+    });
+}
+
+function sendPdfInvoice({ address }) {
+    if (!address)
+        quasar.notify({
+            type: 'negative',
+            message: t(`The email can't be empty`),
+        });
+    else
+        return sendEmail(`InvoiceIns/${entityId.value}/invoice-in-email`, {
+            recipientId: invoiceIn.value.supplier.id,
+            recipient: address,
+        });
+}
+</script>
+
+<template>
+    <InvoiceInToBook>
+        <template #content="{ book }">
+            <QItem
+                v-if="!invoice?.isBooked && canEditProp('toBook')"
+                v-ripple
+                clickable
+                @click="book(entityId)"
+            >
+                <QItemSection>{{ t('invoicein.descriptorMenu.toBook') }}</QItemSection>
+            </QItem>
+        </template>
+    </InvoiceInToBook>
+    <QItem
+        v-if="invoice?.isBooked && canEditProp('toUnbook')"
+        v-ripple
+        clickable
+        @click="triggerMenu('unbook')"
+    >
+        <QItemSection>
+            {{ t('invoicein.descriptorMenu.toUnbook') }}
+        </QItemSection>
+    </QItem>
+    <QItem
+        v-if="canEditProp('deleteById')"
+        v-ripple
+        clickable
+        @click="triggerMenu('invoicein.descriptorMenu.delete')"
+    >
+        <QItemSection>{{ t('invoicein.descriptorMenu.deleteInvoice') }}</QItemSection>
+    </QItem>
+    <QItem v-if="canEditProp('clone')" v-ripple clickable @click="triggerMenu('clone')">
+        <QItemSection>{{ t('invoicein.descriptorMenu.cloneInvoice') }}</QItemSection>
+    </QItem>
+    <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('showPdf')">
+        <QItemSection>{{
+            t('invoicein.descriptorMenu.showAgriculturalPdf')
+        }}</QItemSection>
+    </QItem>
+    <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('sendPdf')">
+        <QItemSection
+            >{{ t('invoicein.descriptorMenu.sendAgriculturalPdf') }}...</QItemSection
+        >
+    </QItem>
+    <QItem
+        v-if="!invoiceInCorrection.corrected"
+        v-ripple
+        clickable
+        @click="triggerMenu('correct')"
+    >
+        <QItemSection
+            >{{ t('invoicein.descriptorMenu.createCorrective') }}...</QItemSection
+        >
+    </QItem>
+    <QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">
+        <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
+    </QItem>
+</template>
+
+<i18n>
+en:
+    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries		
+    isLinked: The entry has been linked to Sage. Please contact administration for further information		
+    assertAction: Are you sure you want to {action} this invoice?
+es:
+    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes		
+    isLinked: El asiento fue enlazado a Sage, por favor contacta con administración		
+    assertAction: Estas seguro de querer {action} esta factura?
+</i18n>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 115a33208..eca0c7af1 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -10,6 +10,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceIntoBook from '../InvoiceInToBook.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
 
 const props = defineProps({ id: { type: [Number, String], default: 0 } });
 const { t } = useI18n();
@@ -26,14 +27,14 @@ const intrastatTotals = ref({ amount: 0, net: 0, stems: 0 });
 const vatColumns = ref([
     {
         name: 'expense',
-        label: 'InvoiceIn.summary.expense',
+        label: 'invoicein.summary.expense',
         field: (row) => row.expenseFk,
         sortable: true,
         align: 'left',
     },
     {
         name: 'landed',
-        label: 'InvoiceIn.summary.taxableBase',
+        label: 'invoicein.summary.taxableBase',
         field: (row) => row.taxableBase,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -41,7 +42,7 @@ const vatColumns = ref([
     },
     {
         name: 'vat',
-        label: 'InvoiceIn.summary.sageVat',
+        label: 'invoicein.summary.sageVat',
         field: (row) => {
             if (row.taxTypeSage) return `#${row.taxTypeSage.id} : ${row.taxTypeSage.vat}`;
         },
@@ -51,7 +52,7 @@ const vatColumns = ref([
     },
     {
         name: 'transaction',
-        label: 'InvoiceIn.summary.sageTransaction',
+        label: 'invoicein.summary.sageTransaction',
         field: (row) => {
             if (row.transactionTypeSage)
                 return `#${row.transactionTypeSage.id} : ${row.transactionTypeSage?.transaction}`;
@@ -62,7 +63,7 @@ const vatColumns = ref([
     },
     {
         name: 'rate',
-        label: 'InvoiceIn.summary.rate',
+        label: 'invoicein.summary.rate',
         field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
         format: (value) => toCurrency(value),
         sortable: true,
@@ -70,7 +71,7 @@ const vatColumns = ref([
     },
     {
         name: 'currency',
-        label: 'InvoiceIn.summary.currency',
+        label: 'invoicein.summary.currency',
         field: (row) => row.foreignValue,
         format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
@@ -81,21 +82,21 @@ const vatColumns = ref([
 const dueDayColumns = ref([
     {
         name: 'date',
-        label: 'InvoiceIn.summary.dueDay',
+        label: 'invoicein.summary.dueDay',
         field: (row) => toDate(row.dueDated),
         sortable: true,
         align: 'left',
     },
     {
         name: 'bank',
-        label: 'InvoiceIn.summary.bank',
+        label: 'invoicein.summary.bank',
         field: (row) => row.bank.bank,
         sortable: true,
         align: 'left',
     },
     {
         name: 'amount',
-        label: 'InvoiceIn.list.amount',
+        label: 'invoicein.list.amount',
         field: (row) => row.amount,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -103,7 +104,7 @@ const dueDayColumns = ref([
     },
     {
         name: 'landed',
-        label: 'InvoiceIn.summary.foreignValue',
+        label: 'invoicein.summary.foreignValue',
         field: (row) => row.foreignValue,
         format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
@@ -114,7 +115,7 @@ const dueDayColumns = ref([
 const intrastatColumns = ref([
     {
         name: 'code',
-        label: 'InvoiceIn.summary.code',
+        label: 'invoicein.summary.code',
         field: (row) => {
             return `${row.intrastat.id}: ${row.intrastat?.description}`;
         },
@@ -123,21 +124,21 @@ const intrastatColumns = ref([
     },
     {
         name: 'amount',
-        label: 'InvoiceIn.list.amount',
+        label: 'invoicein.list.amount',
         field: (row) => toCurrency(row.amount),
         sortable: true,
         align: 'left',
     },
     {
         name: 'net',
-        label: 'InvoiceIn.summary.net',
+        label: 'invoicein.summary.net',
         field: (row) => row.net,
         sortable: true,
         align: 'left',
     },
     {
         name: 'stems',
-        label: 'InvoiceIn.summary.stems',
+        label: 'invoicein.summary.stems',
         field: (row) => row.stems,
         format: (value) => value,
         sortable: true,
@@ -145,7 +146,7 @@ const intrastatColumns = ref([
     },
     {
         name: 'landed',
-        label: 'InvoiceIn.summary.country',
+        label: 'invoicein.summary.country',
         field: (row) => row.country?.code,
         format: (value) => value,
         sortable: true,
@@ -200,6 +201,9 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </template>
             </InvoiceIntoBook>
         </template>
+        <template #menu="{ entity }">
+            <InvoiceInDescriptorMenu :invoice="entity" />
+        </template>
         <template #body="{ entity }">
             <!--Basic Data-->
             <QCard class="vn-one">
@@ -210,7 +214,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('InvoiceIn.list.supplier')"
+                    :label="t('invoicein.list.supplier')"
                     :value="entity.supplier?.name"
                 >
                     <template #value>
@@ -221,14 +225,14 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('InvoiceIn.list.supplierRef')"
+                    :label="t('invoicein.list.supplierRef')"
                     :value="entity.supplierRef"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.summary.currency')"
+                    :label="t('invoicein.summary.currency')"
                     :value="entity.currency?.code"
                 />
-                <VnLv :label="t('InvoiceIn.serial')" :value="`${entity.serial}`" />
+                <VnLv :label="t('invoicein.serial')" :value="`${entity.serial}`" />
                 <VnLv
                     :label="t('globals.country')"
                     :value="entity.supplier?.country?.code"
@@ -243,19 +247,19 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </QCardSection>
                 <VnLv
                     :ellipsis-value="false"
-                    :label="t('InvoiceIn.summary.issued')"
+                    :label="t('invoicein.summary.issued')"
                     :value="toDate(entity.issued)"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.summary.operated')"
+                    :label="t('invoicein.summary.operated')"
                     :value="toDate(entity.operated)"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.summary.bookEntried')"
+                    :label="t('invoicein.summary.bookEntried')"
                     :value="toDate(entity.bookEntried)"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.summary.bookedDate')"
+                    :label="t('invoicein.summary.bookedDate')"
                     :value="toDate(entity.booked)"
                 />
                 <VnLv :label="t('globals.isVies')" :value="entity.supplier?.isVies" />
@@ -268,18 +272,18 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('InvoiceIn.summary.sage')"
+                    :label="t('invoicein.summary.sage')"
                     :value="entity.sageWithholding?.withholding"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.summary.vat')"
+                    :label="t('invoicein.summary.vat')"
                     :value="entity.expenseDeductible?.name"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.card.company')"
+                    :label="t('invoicein.card.company')"
                     :value="entity.company?.code"
                 />
-                <VnLv :label="t('InvoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
+                <VnLv :label="t('invoicein.isBooked')" :value="invoiceIn?.isBooked" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -290,11 +294,11 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </QCardSection>
                 <QCardSection class="q-pa-none">
                     <VnLv
-                        :label="t('InvoiceIn.summary.taxableBase')"
+                        :label="t('invoicein.summary.taxableBase')"
                         :value="toCurrency(entity.totals.totalTaxableBase)"
                     />
                     <VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
-                    <VnLv :label="t('InvoiceIn.summary.dueTotal')">
+                    <VnLv :label="t('invoicein.summary.dueTotal')">
                         <template #value>
                             <QChip
                                 dense
@@ -302,8 +306,8 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                 :color="amountsNotMatch ? 'negative' : 'transparent'"
                                 :title="
                                     amountsNotMatch
-                                        ? t('InvoiceIn.summary.noMatch')
-                                        : t('InvoiceIn.summary.dueTotal')
+                                        ? t('invoicein.summary.noMatch')
+                                        : t('invoicein.summary.dueTotal')
                                 "
                             >
                                 {{ toCurrency(entity.totals.totalDueDay) }}
@@ -314,7 +318,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <!--Vat-->
             <QCard v-if="entity.invoiceInTax.length" class="vat">
-                <VnTitle :url="getLink('vat')" :text="t('InvoiceIn.card.vat')" />
+                <VnTitle :url="getLink('vat')" :text="t('invoicein.card.vat')" />
                 <QTable
                     :columns="vatColumns"
                     :rows="entity.invoiceInTax"
@@ -362,7 +366,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <!--Due Day-->
             <QCard v-if="entity.invoiceInDueDay.length" class="due-day">
-                <VnTitle :url="getLink('due-day')" :text="t('InvoiceIn.card.dueDay')" />
+                <VnTitle :url="getLink('due-day')" :text="t('invoicein.card.dueDay')" />
                 <QTable :columns="dueDayColumns" :rows="entity.invoiceInDueDay" flat>
                     <template #header="dueDayProps">
                         <QTr :props="dueDayProps" class="bg">
@@ -400,7 +404,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             <QCard v-if="entity.invoiceInIntrastat.length">
                 <VnTitle
                     :url="getLink('intrastat')"
-                    :text="t('InvoiceIn.card.intrastat')"
+                    :text="t('invoicein.card.intrastat')"
                 />
                 <QTable
                     :columns="intrastatColumns"
diff --git a/src/pages/InvoiceIn/InvoiceInCreate.vue b/src/pages/InvoiceIn/InvoiceInCreate.vue
index 200997f65..f180410aa 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.list.supplierRef')"
+                        :label="t('invoicein.list.supplierRef')"
                         v-model="data.supplierRef"
                     />
                 </VnRow>
@@ -97,10 +97,10 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         map-options
                         hide-selected
                         :required="true"
-                        :rules="validate('InvoiceIn.companyFk')"
+                        :rules="validate('invoicein.companyFk')"
                     />
                     <VnInputDate
-                        :label="t('InvoiceIn.summary.issued')"
+                        :label="t('invoicein.summary.issued')"
                         v-model="data.issued"
                     />
                 </VnRow>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 653692026..31a611936 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -68,13 +68,26 @@ function handleDaysAgo(params, daysAgo) {
                     <VnSelect
                         v-model="params.supplierFk"
                         url="Suppliers"
-                        :fields="['id', 'nickname']"
+                        :fields="['id', 'nickname', 'name']"
                         :label="getLocale('supplierFk')"
                         option-label="nickname"
                         dense
                         outlined
                         rounded
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
@@ -151,7 +164,7 @@ function handleDaysAgo(params, daysAgo) {
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="$t('InvoiceIn.isBooked')"
+                        :label="$t('invoicein.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 43b9f2c11..5e80ae652 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -26,7 +26,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'isBooked',
-        label: t('InvoiceIn.isBooked'),
+        label: t('invoicein.isBooked'),
         columnFilter: false,
     },
     {
@@ -41,7 +41,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'supplierFk',
-        label: t('InvoiceIn.list.supplier'),
+        label: t('invoicein.list.supplier'),
         columnFilter: {
             component: 'select',
             attrs: {
@@ -55,16 +55,16 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'supplierRef',
-        label: t('InvoiceIn.list.supplierRef'),
+        label: t('invoicein.list.supplierRef'),
     },
     {
         align: 'left',
         name: 'serial',
-        label: t('InvoiceIn.serial'),
+        label: t('invoicein.serial'),
     },
     {
         align: 'left',
-        label: t('InvoiceIn.list.issued'),
+        label: t('invoicein.list.issued'),
         name: 'issued',
         component: null,
         columnFilter: {
@@ -74,7 +74,7 @@ const cols = computed(() => [
     },
     {
         align: 'left',
-        label: t('InvoiceIn.list.dueDated'),
+        label: t('invoicein.list.dueDated'),
         name: 'dueDated',
         component: null,
         columnFilter: {
@@ -86,12 +86,12 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'awbCode',
-        label: t('InvoiceIn.list.awb'),
+        label: t('invoicein.list.awb'),
     },
     {
         align: 'left',
         name: 'amount',
-        label: t('InvoiceIn.list.amount'),
+        label: t('invoicein.list.amount'),
         format: ({ amount }) => toCurrency(amount),
         cardVisible: true,
     },
@@ -165,24 +165,24 @@ const cols = computed(() => [
             <VnSelect
                 v-model="data.supplierFk"
                 url="Suppliers"
-                :fields="['id', 'nickname']"
+                :fields="['id', 'nickname', 'name']"
                 :label="t('globals.supplier')"
                 option-value="id"
                 option-label="nickname"
-                :filter-options="['id', 'name']"
+                :filter-options="['id', 'name', 'nickname']"
                 :required="true"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
                         <QItemSection>
                             <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                            <QItemLabel caption> #{{ scope.opt?.id }}, {{  scope.opt?.name }} </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>
             </VnSelect>
             <VnInput
-                :label="t('InvoiceIn.list.supplierRef')"
+                :label="t('invoicein.list.supplierRef')"
                 v-model="data.supplierRef"
             />
             <VnSelect
@@ -194,7 +194,7 @@ const cols = computed(() => [
                 option-label="code"
                 :required="true"
             />
-            <VnInputDate :label="t('InvoiceIn.summary.issued')" v-model="data.issued" />
+            <VnInputDate :label="t('invoicein.summary.issued')" v-model="data.issued" />
         </template>
     </VnTable>
 </template>
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index ef7e31ac3..94db50066 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -1,4 +1,4 @@
-InvoiceIn:
+invoicein:
     serial: Serial
     isBooked: Is booked
     list:
@@ -12,6 +12,26 @@ InvoiceIn:
         amount: Amount
     descriptor:
         ticketList: Ticket list
+    descriptorMenu:
+        book: Book
+        unbook: Unbook
+        delete: Delete
+        clone: Clone
+        toBook: To book
+        toUnbook: To unbook
+        deleteInvoice: Delete invoice
+        invoiceDeleted: invoice deleted
+        cloneInvoice: Clone invoice
+        invoiceCloned: Invoice cloned
+        showAgriculturalPdf: Show agricultural receipt as PDF
+        sendAgriculturalPdf: Send agricultural receipt as PDF
+        checkSendInvoice: Are you sure you want to send it?
+        sendPdfInvoice: Send PDF invoice
+        createCorrective: Create rectificative invoice
+        correctiveInvoice: Rectificative invoice
+        originalInvoice: Original invoice
+        entry: Entry
+        emailEmpty: The email can't be empty
     card:
         client: Client
         company: Company
@@ -44,7 +64,8 @@ InvoiceIn:
         country: Country
     params:
         search: Id or supplier name
-        account: Ledger account
-        correctingFk: Rectificative
         correctedFk: Corrected
         isBooked: Is booked
+        account: Ledger account
+        correctingFk: Rectificative
+        
\ No newline at end of file
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index ed5943489..bcb9c0551 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -1,4 +1,4 @@
-InvoiceIn:
+invoicein:
     serial: Serie
     isBooked: Contabilizada
     list:
@@ -12,6 +12,26 @@ InvoiceIn:
         amount: Importe
     descriptor:
         ticketList: Listado de tickets
+    descriptorMenu:
+        book: Asentar
+        unbook: Desasentar
+        delete: Eliminar
+        clone: Clonar
+        toBook: Contabilizar
+        toUnbook: Descontabilizar
+        deleteInvoice: Eliminar factura
+        invoiceDeleted: Factura eliminada
+        cloneInvoice: Clonar factura
+        invoiceCloned: Factura clonada
+        showAgriculturalPdf: Ver recibo agrícola como PDF
+        sendAgriculturalPdf: Enviar recibo agrícola como PDF
+        checkSendInvoice: ¿Estás seguro que quieres enviarlo?
+        sendPdfInvoice: Enviar factura a PDF
+        createCorrective: Crear factura rectificativa
+        correctiveInvoice: Factura rectificativa
+        originalInvoice: Factura origen
+        entry: Entrada
+        emailEmpty: El email no puede estar vacío
     card:
         client: Cliente
         company: Empresa
@@ -42,6 +62,7 @@ InvoiceIn:
         country: País
     params:
         search: Id o nombre proveedor
+        correctedFk: Rectificada
         account: Cuenta contable
         correctingFk: Rectificativa
-        correctedFk: Rectificada
+
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 81b3e7c41..3ceb447dd 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -10,6 +10,7 @@ import { getUrl } from 'src/composables/getUrl';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
 
 onMounted(async () => {
     fetch();
@@ -113,6 +114,9 @@ const ticketsColumns = ref([
         <template #header="{ entity: { invoiceOut } }">
             <div>{{ invoiceOut.ref }} - {{ invoiceOut.client?.socialName }}</div>
         </template>
+        <template #menu="{ entity }">
+            <InvoiceOutDescriptorMenu :invoice-out-data="entity.invoiceOut" />
+        </template>
         <template #body="{ entity: { invoiceOut } }">
             <QCard class="vn-one">
                 <VnTitle :text="t('globals.pageTitles.basicData')" />
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index dc1d833a2..cdc9f037a 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -47,6 +47,7 @@ const states = ref();
                         :label="t('Amount')"
                         v-model="params.amount"
                         is-outlined
+                        data-cy="InvoiceOutFilterAmountBtn"
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index e6c689523..392256473 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -101,6 +101,7 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
+                data-cy="InvoiceOutGlobalClientSelect"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -125,6 +126,7 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
+                data-cy="InvoiceOutGlobalSerialSelect"
             />
             <VnInputDate
                 v-model="formData.invoiceDate"
@@ -135,6 +137,7 @@ onMounted(async () => {
                 v-model="formData.maxShipped"
                 :label="t('maxShipped')"
                 is-outlined
+                data-cy="InvoiceOutGlobalMaxShippedDate"
             />
             <VnSelect
                 :label="t('company')"
@@ -144,6 +147,7 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
+                data-cy="InvoiceOutGlobalCompanySelect"
             />
             <VnSelect
                 :label="t('printer')"
@@ -152,6 +156,7 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
+                data-cy="InvoiceOutGlobalPrinterSelect"
             />
         </div>
         <QBtn
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 3a886c383..09873642d 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -126,6 +126,13 @@ const columns = computed(() => [
         columnField: { component: null },
         format: (row) => toDate(row.dued),
     },
+    {
+        align: 'left',
+        name: 'customsAgentFk',
+        label: t('invoiceOutList.tableVisibleColumns.customsAgent'),
+        cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.customsAgentName),
+    },
     {
         align: 'right',
         name: 'tableActions',
@@ -190,6 +197,7 @@ watchEffect(selectedRows);
                 icon-right="cloud_download"
                 @click="downloadPdf()"
                 :disable="!hasSelectedCards"
+                data-cy="InvoiceOutDownloadPdfBtn"
             >
                 <QTooltip>{{ t('downloadPdf') }}</QTooltip>
             </QBtn>
@@ -238,6 +246,7 @@ watchEffect(selectedRows);
                                 v-model="data.ticketFk"
                                 :label="t('globals.ticket')"
                                 style="flex: 1"
+                                data-cy="InvoiceOutCreateTicketinput"
                             />
 
                             <div
@@ -346,12 +355,13 @@ watchEffect(selectedRows);
                         <VnSelect
                             url="InvoiceOutSerials"
                             v-model="data.serial"
-                            :label="t('InvoiceIn.serial')"
+                            :label="t('invoicein.serial')"
                             :options="invoiceOutSerialsOptions"
                             option-label="description"
                             option-value="code"
                             option-filter
                             :expr-builder="exprBuilder"
+                            data-cy="InvoiceOutCreateSerialSelect"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml
index 8cefe8bdc..f31e5a07c 100644
--- a/src/pages/InvoiceOut/locale/en.yml
+++ b/src/pages/InvoiceOut/locale/en.yml
@@ -13,6 +13,7 @@ invoiceOutList:
         invoiceOutSerial: Serial
         ticket: Ticket
         taxArea: Tax area
+        customsAgent: Custom Agent
 DownloadPdf: Download PDF
 InvoiceOutSummary: Summary
 negativeBases:
@@ -24,3 +25,15 @@ negativeBases:
     hasToInvoice: Has to invoice
     verifiedData: Verified data
     commercial: Commercial
+invoiceout:
+    params:
+        company: Company
+        country: Country
+        clientId: Client ID
+        clientSocialName: Client
+        taxableBase: Base
+        ticketFk: Ticket
+        isActive: Active
+        hasToInvoice: Has to invoice
+        hasVerifiedData: Verified data
+        workerName: Worker
\ No newline at end of file
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index 106168a5d..deca8bdea 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -15,6 +15,7 @@ invoiceOutList:
         invoiceOutSerial: Serial
         ticket: Ticket
         taxArea: Area
+        customsAgent: Agente de aduanas
 DownloadPdf: Descargar PDF
 InvoiceOutSummary: Resumen
 negativeBases:
@@ -27,3 +28,15 @@ negativeBases:
     hasToInvoice: Debe facturar
     verifiedData: Datos verificados
     commercial: Comercial
+invoiceout:
+    params:
+        company: Empresa
+        country: País
+        clientId: ID del cliente
+        clientSocialName: Cliente
+        taxableBase: Base
+        ticketFk: Ticket
+        isActive: Activo
+        hasToInvoice: Debe facturar
+        hasVerifiedData: Datos verificados
+        workerName: Comercial
\ No newline at end of file
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index 57774f75e..4894d94fc 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -52,6 +52,7 @@ const entityId = computed(() => {
                     :fields="['id', 'name']"
                     sort-by="name ASC"
                     hide-selected
+                    data-cy="AddGenusSelectDialog"
                 >
                     <template #form>
                         <CreateGenusForm
@@ -68,6 +69,7 @@ const entityId = computed(() => {
                     :fields="['id', 'name']"
                     sort-by="name ASC"
                     hide-selected
+                    data-cy="AddSpeciesSelectDialog"
                 >
                     <template #form>
                         <CreateSpecieForm
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 4705525fb..c6fee8540 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -6,17 +6,16 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import RegularizeStockForm from 'components/RegularizeStockForm.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
-import { cloneItem } from 'src/pages/Item/composables/cloneItem';
+import ItemDescriptorMenu from './ItemDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
-        type: [Number, String],
+        type: Number,
         required: false,
         default: null,
     },
@@ -29,7 +28,7 @@ const $props = defineProps({
         default: null,
     },
     saleFk: {
-        type: [Number, String],
+        type: Number,
         default: null,
     },
     warehouseFk: {
@@ -38,7 +37,6 @@ const $props = defineProps({
     },
 });
 
-const { openCloneDialog } = cloneItem();
 const route = useRoute();
 const { t } = useI18n();
 const warehouseConfig = ref(null);
@@ -46,7 +44,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const regularizeStockFormDialog = ref(null);
 const mounted = ref();
 
 const arrayDataStock = useArrayData('descriptorStock', {
@@ -61,14 +58,14 @@ onMounted(async () => {
 const data = ref(useCardDescription());
 const setData = async (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity?.name, entity?.id);
+    data.value = useCardDescription(entity.name, entity.id);
     await updateStock();
 };
 
 const getItemConfigs = async () => {
     const { data } = await axios.get('ItemConfigs/findOne');
     if (!data) return;
-    return (warehouseConfig.value = data.warehouseFk);
+    warehouseConfig.value = data.warehouseFk;
 };
 const updateStock = async () => {
     if (!mounted.value) return;
@@ -89,10 +86,6 @@ const updateStock = async () => {
     if (storeData?.itemFk == entityId.value) return;
     await stock.fetch({});
 };
-
-const openRegularizeStockForm = () => {
-    regularizeStockFormDialog.value.show();
-};
 </script>
 
 <template>
@@ -105,24 +98,12 @@ const openRegularizeStockForm = () => {
         :url="`Items/${entityId}/getCard`"
         @on-fetch="setData"
     >
-        <template #menu="{}">
-            <QItem v-ripple clickable @click="openRegularizeStockForm()">
-                <QItemSection>
-                    {{ t('Regularize stock') }}
-                    <QDialog ref="regularizeStockFormDialog">
-                        <RegularizeStockForm
-                            :item-fk="entityId"
-                            :warehouse-fk="warehouseFk"
-                            @on-data-saved="updateStock()"
-                        />
-                    </QDialog>
-                </QItemSection>
-            </QItem>
-            <QItem v-ripple clickable @click="openCloneDialog(entityId)">
-                <QItemSection>
-                    {{ t('globals.clone') }}
-                </QItemSection>
-            </QItem>
+        <template #menu>
+            <ItemDescriptorMenu
+                :entity-id="entityId"
+                :warehouse-fk="warehouseFk"
+                @regularized="updateStock"
+            />
         </template>
         <template #before>
             <ItemDescriptorImage
@@ -191,7 +172,6 @@ const openRegularizeStockForm = () => {
 
 <i18n>
 es:
-    Regularize stock: Regularizar stock
     Inactive article: Artículo inactivo
 </i18n>
 
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index 05185c589..a887964e9 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -131,7 +131,6 @@ const handlePhotoUpdated = (evt = false) => {
 
 <i18n>
 es:
-    Regularize stock: Regularizar stock
     All it's properties will be copied: Todas sus propiedades serán copiadas
     Do you want to clone this item?: ¿Desea clonar este artículo?
     warehouseText: Calculado sobre el almacén de { warehouseName }
diff --git a/src/pages/Item/Card/ItemDescriptorMenu.vue b/src/pages/Item/Card/ItemDescriptorMenu.vue
new file mode 100644
index 000000000..3e9c6f2d4
--- /dev/null
+++ b/src/pages/Item/Card/ItemDescriptorMenu.vue
@@ -0,0 +1,44 @@
+<script setup>
+import RegularizeStockForm from 'components/RegularizeStockForm.vue';
+import { cloneItem } from 'src/pages/Item/composables/cloneItem';
+
+const { openCloneDialog } = cloneItem();
+
+defineProps({
+    entityId: {
+        type: Number,
+        default: null,
+    },
+    warehouseFk: {
+        type: Number,
+        default: null,
+    },
+});
+
+defineEmits(['regularized']);
+</script>
+<template>
+    <QItem v-ripple clickable @click="$refs.regularizeStockFormDialog.show()">
+        <QItemSection>
+            {{ $t('item.regularizeStock') }}
+            <QDialog ref="regularizeStockFormDialog">
+                <RegularizeStockForm
+                    :item-fk="entityId"
+                    :warehouse-fk="warehouseFk"
+                    @on-data-saved="$emit('regularized')"
+                />
+            </QDialog>
+        </QItemSection>
+    </QItem>
+    <QItem v-ripple clickable @click="openCloneDialog(entityId)">
+        <QItemSection>
+            {{ $t('globals.clone') }}
+        </QItemSection>
+    </QItem>
+</template>
+
+<style lang="scss" scoped>
+.weekdaysBtn {
+    margin: 1%;
+}
+</style>
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 96a003a09..c2f2c19a0 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -1,7 +1,7 @@
 <script setup>
-import { onMounted, computed, reactive, ref, nextTick, watch } from 'vue';
+import { onMounted, computed, ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
@@ -22,19 +22,16 @@ import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
 const state = useState();
 const user = state.getUser();
-const today = ref(Date.vnNew());
+const today = Date.vnNew();
+today.setHours(0, 0, 0, 0);
 const warehousesOptions = ref([]);
-const itemBalancesRef = ref(null);
-const itemsBalanceFilter = reactive({
-    where: { itemFk: route.params.id, warehouseFk: null, date: null },
-});
-const itemBalances = ref([]);
-const warehouseFk = ref(null);
-const _showWhatsBeforeInventory = ref(false);
+const itemBalances = computed(() => arrayDataItemBalances.store.data);
+const where = computed(() => arrayDataItemBalances.store.filter.where || {});
+const showWhatsBeforeInventory = ref(false);
 const inventoriedDate = ref(null);
+let arrayDataItemBalances = useArrayData('ItemBalances');
 
 const originTypeMap = {
     entry: {
@@ -122,36 +119,28 @@ const columns = computed(() => [
     },
 ]);
 
-const showWhatsBeforeInventory = computed({
-    get: () => _showWhatsBeforeInventory.value,
-    set: (val) => {
-        _showWhatsBeforeInventory.value = val;
-        if (!val) itemsBalanceFilter.where.date = null;
-        else itemsBalanceFilter.where.date = inventoriedDate.value ?? new Date();
-    },
-});
-
 onMounted(async () => {
-    today.value.setHours(0, 0, 0, 0);
-    if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
-    else if (user.value) warehouseFk.value = user.value.warehouseFk;
-    itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
-    const { data } = await axios.get('Configs/findOne');
-    inventoriedDate.value = data.inventoried;
+    const ref = where.value;
+    const query = route.query;
+    inventoriedDate.value =
+        (await axios.get('Configs/findOne')).data?.inventoried || today;
+
+    if (query.warehouseFk) ref.warehouseFk = query.warehouseFk;
+    else if (!ref.warehouseFk && user.value) ref.warehouseFk = user.value.warehouseFk;
+    if (ref.date) showWhatsBeforeInventory.value = true;
+    ref.itemFk = route.params.id;
+
+    arrayDataItemBalances = useArrayData('ItemBalances', {
+        url: 'Items/getBalance',
+        filter: { where: ref },
+    });
+
     await fetchItemBalances();
     await scrollToToday();
-    await updateWarehouse(warehouseFk.value);
+    await updateWarehouse(ref.warehouseFk);
 });
 
-watch(
-    () => router.currentRoute.value.params.id,
-    (newId) => {
-        itemsBalanceFilter.where.itemFk = newId;
-        itemBalancesRef.value.fetch();
-    }
-);
-
-const fetchItemBalances = async () => await itemBalancesRef.value.fetch();
+const fetchItemBalances = async () => await arrayDataItemBalances.fetch({});
 
 const getBadgeAttrs = (_date) => {
     const isSameDate = date.isSameDate(today.value, _date);
@@ -178,23 +167,13 @@ const formatDateForAttribute = (dateValue) => {
 };
 
 async function updateWarehouse(warehouseFk) {
-    const stock = useArrayData('descriptorStock', {
-        userParams: {
-            warehouseFk,
-        },
-    });
+    const stock = useArrayData('descriptorStock', { userParams: { warehouseFk } });
     await stock.fetch({});
     stock.store.data.itemFk = route.params.id;
 }
 </script>
 
 <template>
-    <FetchData
-        ref="itemBalancesRef"
-        url="Items/getBalance"
-        :filter="itemsBalanceFilter"
-        @on-fetch="(data) => (itemBalances = data)"
-    />
     <FetchData
         url="Warehouses"
         :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
@@ -207,27 +186,30 @@ async function updateWarehouse(warehouseFk) {
                 <VnSelect
                     :label="t('itemDiary.warehouse')"
                     :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    dense
-                    v-model="itemsBalanceFilter.where.warehouseFk"
+                    v-model="where.warehouseFk"
                     @update:model-value="
-                        (value) => fetchItemBalances() && updateWarehouse(value)
+                        (val) => fetchItemBalances() && updateWarehouse(val)
                     "
                     class="q-mr-lg"
+                    :is-clearable="false"
                 />
                 <QCheckbox
                     :label="t('itemDiary.showBefore')"
                     v-model="showWhatsBeforeInventory"
-                    @update:model-value="fetchItemBalances"
+                    @update:model-value="
+                        async (val) => {
+                            if (!val) where.date = null;
+                            else where.date = inventoriedDate;
+                            await fetchItemBalances();
+                        }
+                    "
                     class="q-mr-lg"
                 />
                 <VnInputDate
                     v-if="showWhatsBeforeInventory"
                     :label="t('itemDiary.since')"
                     dense
-                    v-model="itemsBalanceFilter.where.date"
+                    v-model="where.date"
                     @update:model-value="fetchItemBalances"
                 />
             </div>
diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index c2df553c3..7d8890c2b 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -36,18 +36,7 @@ const exprBuilder = (param, value) => {
     }
 };
 
-const where = {
-    itemFk: route.params.id,
-};
-
-const arrayData = useArrayData('ItemLastEntries', {
-    url: 'Items/lastEntriesFilter',
-    order: ['landed DESC', 'buyFk DESC'],
-    exprBuilder: exprBuilder,
-    userFilter: {
-        where: where,
-    },
-});
+let arrayData = useArrayData('ItemLastEntries');
 const itemLastEntries = ref([]);
 
 const columns = computed(() => [
@@ -161,25 +150,51 @@ const getDate = (date, type) => {
 };
 
 const updateFilter = async () => {
-    let filter;
-    if (!from.value && to.value) filter = { lte: to.value };
-    else if (from.value && !to.value) filter = { gte: from.value };
-    else if (from.value && to.value) filter = { between: [from.value, to.value] };
-
-    const userFilter = arrayData.store.userFilter.where;
-
-    userFilter.landed = filter;
+    let landed;
+    if (!from.value && to.value) landed = { lte: to.value };
+    else if (from.value && !to.value) landed = { gte: from.value };
+    else if (from.value && to.value) landed = { between: [from.value, to.value] };
 
+    arrayData.store.filter.where.landed = landed;
     await fetchItemLastEntries();
 };
 
 onMounted(async () => {
-    const _from = Date.vnNew();
-    _from.setDate(_from.getDate() - 75);
-    from.value = getDate(_from, 'from');
-    const _to = Date.vnNew();
-    _to.setDate(_to.getDate() + 10);
-    to.value = getDate(_to, 'to');
+    const landed = arrayData.store.filter.where?.landed;
+    arrayData = useArrayData('ItemLastEntries', {
+        url: 'Items/lastEntriesFilter',
+        order: ['landed DESC', 'buyFk DESC'],
+        exprBuilder: exprBuilder,
+        filter: {
+            where: {
+                itemFk: route.params.id,
+                landed,
+            },
+        },
+    });
+
+    if (landed) {
+        const key = Object.keys(landed)[0];
+        switch (key) {
+            case 'gte':
+                from.value = landed.gte;
+                break;
+            case 'lte':
+                to.value = landed.lte;
+                break;
+            case 'between':
+                from.value = landed.between[0];
+                to.value = landed.between[1];
+                break;
+        }
+    } else {
+        const _from = Date.vnNew();
+        _from.setDate(_from.getDate() - 75);
+        from.value = getDate(_from, 'from');
+        const _to = Date.vnNew();
+        _to.setDate(_to.getDate() + 10);
+        to.value = getDate(_to, 'to');
+    }
 
     updateFilter();
 
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index e1b97d7c9..bc828bbf6 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -8,6 +8,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import ItemDescriptorMenu from './ItemDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -43,10 +44,13 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
         <template #header="{ entity: { item } }">
             {{ item.id }} - {{ item.name }}
         </template>
+        <template #menu>
+            <ItemDescriptorMenu :entity-id="entityId" :warehouse-fk="warehouseFk" />
+        </template>
         <template #body="{ entity: { item, tags, visible, available, botanical } }">
             <QCard class="vn-one photo">
                 <ItemDescriptorImage
-                    :entity-id="Number(entityId)"
+                    :entity-id="entityId"
                     :visible="visible"
                     :available="available"
                     :show-edit-button="false"
@@ -89,7 +93,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
             <QCard class="vn-one">
                 <VnTitle
                     :url="getUrl(entityId, 'basic-data')"
-                    :text="t('item.summary.basicData')"
+                    :text="t('item.summary.otherData')"
                 />
                 <VnLv
                     :label="t('item.summary.intrastatCode')"
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index 93d4b9a71..992b1042b 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -107,7 +107,7 @@ const submitTags = async (data) => {
                 @on-fetch="onItemTagsFetched"
             >
                 <template #body="{ rows, validate }">
-                    <QCard class="q-px-lg q-pt-md q-pb-sm">
+                    <QCard class="q-px-lg q-pt-md q-pb-sm" data-cy="itemTags">
                         <VnRow
                             v-for="(row, index) in rows"
                             :key="index"
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 932567af2..53d300a3b 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -35,6 +35,7 @@ const editTableCellDialogRef = ref(null);
 const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
+const hasSelectedRows = computed(() => rowsSelected.value.length > 0);
 const rowsSelected = ref([]);
 const itemFixedPriceFilterRef = ref();
 
@@ -368,9 +369,9 @@ function handleOnDataSave({ CrudModelRef }) {
         </template>
     </RightMenu>
     <VnSubToolbar>
-        <template #st-data>
+        <template #st-actions>
             <QBtn
-                v-if="rowsSelected.length"
+                :disable="!hasSelectedRows"
                 @click="openEditTableCellDialog()"
                 color="primary"
                 icon="edit"
@@ -380,13 +381,13 @@ function handleOnDataSave({ CrudModelRef }) {
                 </QTooltip>
             </QBtn>
             <QBtn
+                :disable="!hasSelectedRows"
                 :label="tMobile('globals.remove')"
                 color="primary"
                 icon="delete"
                 flat
                 @click="(row) => confirmRemove(row, true)"
                 :title="t('globals.remove')"
-                v-if="rowsSelected.length"
             />
         </template>
     </VnSubToolbar>
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 5119b5177..00d0f5c4e 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import VnImg from 'src/components/ui/VnImg.vue';
@@ -15,6 +15,9 @@ import ItemTypeDescriptorProxy from './ItemType/Card/ItemTypeDescriptorProxy.vue
 import { cloneItem } from 'src/pages/Item/composables/cloneItem';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import ItemListFilter from './ItemListFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import axios from 'axios';
 
 const entityId = computed(() => route.params.id);
 const { openCloneDialog } = cloneItem();
@@ -22,7 +25,9 @@ const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 const tableRef = ref();
 const route = useRoute();
-
+const validPriorities = ref([]);
+const defaultTag = ref();
+const defaultPriority = ref();
 const itemFilter = {
     include: [
         {
@@ -90,7 +95,6 @@ const columns = computed(() => [
         label: t('globals.description'),
         name: 'description',
         align: 'left',
-        create: true,
         columnFilter: {
             name: 'search',
         },
@@ -132,13 +136,23 @@ const columns = computed(() => [
                 fields: ['id', 'name'],
             },
         },
-        create: true,
         visible: false,
     },
     {
         label: t('item.list.typeName'),
         name: 'typeName',
         align: 'left',
+        component: 'select',
+        columnFilter: {
+            name: 'typeFk',
+            attrs: {
+                url: 'ItemTypes',
+                fields: ['id', 'name'],
+            },
+        },
+        columnField: {
+            component: null,
+        },
     },
     {
         label: t('item.list.category'),
@@ -161,6 +175,11 @@ const columns = computed(() => [
         name: 'intrastat',
         align: 'left',
         component: 'select',
+        attrs: {
+            url: 'Intrastats',
+            optionValue: 'description',
+            optionLabel: 'description',
+        },
         columnFilter: {
             name: 'intrastat',
             attrs: {
@@ -172,7 +191,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        create: true,
         cardVisible: true,
     },
     {
@@ -198,7 +216,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        create: true,
         cardVisible: true,
     },
     {
@@ -297,12 +314,21 @@ const columns = computed(() => [
         ],
     },
 ]);
+
+onBeforeMount(async () => {
+    const { data } = await axios.get('ItemConfigs');
+    defaultTag.value = data[0].defaultTag;
+    defaultPriority.value = data[0].defaultPriority;
+    data.forEach((priority) => {
+        validPriorities.value = priority.validPriorities;
+    });
+});
 </script>
 <template>
     <VnSearchbar
         data-key="ItemList"
         :label="t('item.searchbar.label')"
-        :info="t('You can search by id')"
+        :info="t('item.searchbar.info')"
     />
     <RightMenu>
         <template #right-panel>
@@ -310,15 +336,18 @@ const columns = computed(() => [
         </template>
     </RightMenu>
     <VnTable
+        v-if="defaultTag"
         ref="tableRef"
         data-key="ItemList"
         url="Items/filter"
         :create="{
-            urlCreate: 'Items',
-            title: t('Create Item'),
-            onDataSaved: () => tableRef.redirect(),
+            urlCreate: 'Items/new',
+            title: t('item.list.newItem'),
+            onDataSaved: ({ id }) => tableRef.redirect(`${id}/basic-data`),
             formInitialData: {
                 editorFk: entityId,
+                tag: defaultTag,
+                priority: defaultPriority,
             },
         }"
         :order="['isActive DESC', 'name', 'id']"
@@ -362,7 +391,97 @@ const columns = computed(() => [
                     {{ row?.subName.toUpperCase() }}
                 </div>
             </div>
-            <FetchedTags :item="row" :columns="3" />
+            <FetchedTags :item="row" />
+        </template>
+        <template #more-create-dialog="{ data }">
+            <VnInput
+                v-model="data.provisionalName"
+                :label="t('globals.description')"
+                :is-required="true"
+            />
+            <VnSelect
+                url="Tags"
+                v-model="data.tag"
+                :label="t('globals.tag')"
+                :fields="['id', 'name']"
+                option-label="name"
+                option-value="id"
+                :is-required="true"
+                :sort-by="['name ASC']"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <VnSelect
+                :options="validPriorities"
+                v-model="data.priority"
+                :label="t('item.create.priority')"
+                :is-required="true"
+            />
+            <VnSelect
+                url="ItemTypes"
+                v-model="data.typeFk"
+                :label="t('item.list.typeName')"
+                :fields="['id', 'code', 'name']"
+                option-label="name"
+                option-value="id"
+                :is-required="true"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption>
+                                {{ scope.opt?.code }} #{{ scope.opt?.id }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <VnSelect
+                url="Intrastats"
+                v-model="data.intrastatFk"
+                :label="t('globals.intrastat')"
+                :fields="['id', 'description']"
+                option-label="description"
+                option-value="id"
+                :is-required="true"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.description }}</QItemLabel>
+                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <VnSelect
+                url="Origins"
+                v-model="data.originFk"
+                :label="t('globals.origin')"
+                :fields="['id', 'code', 'name']"
+                option-label="code"
+                option-value="id"
+                :is-required="true"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption>
+                                {{ scope.opt?.code }} #{{ scope.opt?.id }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
         </template>
     </VnTable>
 </template>
@@ -379,5 +498,4 @@ es:
     Create Item: Crear artículo
     You can search by id: Puedes buscar por id
     Preview: Vista previa
-    Regularize stock: Regularizar stock
 </i18n>
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 484265b49..a8349c935 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -199,17 +199,7 @@ onMounted(async () => {
                         dense
                         outlined
                         rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        t(`params.${scope.opt?.name}`)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -265,6 +255,7 @@ onMounted(async () => {
                         option-value="id"
                         option-label="name"
                         :fields="['id', 'name', 'nickname']"
+                        :filter-options="['id', 'name', 'nickname']"
                         sort-by="name ASC"
                         hide-selected
                         dense
@@ -274,9 +265,12 @@ onMounted(async () => {
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{
-                                        scope.opt?.name + ': ' + scope.opt?.nickname
-                                    }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
@@ -375,6 +369,7 @@ onMounted(async () => {
                         :model-value="fieldFilter.selectedField"
                         :options="moreFields"
                         option-label="label"
+                        option-value="label"                        
                         dense
                         outlined
                         rounded
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index f23cadcad..af48f7f5c 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -149,7 +149,6 @@ onMounted(async () => {
                         :label="t('params.requesterFk')"
                         v-model="params.requesterFk"
                         @update:model-value="searchFn()"
-                        :fields="['id', 'name']"
                         :params="{ departmentCodes: ['VT'] }"
                         hide-selected
                         dense
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index ac5010a12..52722198b 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -58,6 +58,7 @@ lastEntries:
     pvp: PVP
     label: Label
     grouping: Grouping
+    packing: Packing
     quantity: Quantity
     cost: Cost
     kg: Kg.
@@ -107,6 +108,7 @@ item:
         scopeDays: Scope days
     searchbar:
         label: Search item
+        info: You can search by id
     descriptor:
         item: Item
         buyer: Buyer
@@ -139,6 +141,7 @@ item:
         stemMultiplier: Multiplier
         producer: Producer
         landed: Landed
+        newItem: New item
     basicData:
         type: Type
         reference: Reference
@@ -217,3 +220,4 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
+    regularizeStock: Regularize stock
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 96c8cbc9a..29af8dc5c 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -58,6 +58,7 @@ lastEntries:
     pvp: PVP
     label: Eti.
     grouping: Grouping
+    packing: Packing
     quantity: Cantidad
     cost: Coste
     kg: Kg.
@@ -109,6 +110,7 @@ item:
         scopeDays: Días en adelante
     searchbar:
         label: Buscar artículo
+        info: Puedes buscar por id
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -141,6 +143,7 @@ item:
         stemMultiplier: Multiplicador
         producer: Productor
         landed: F. entrega
+        newItem: Nuevo artículo
     basicData:
         type: Tipo
         reference: Referencia
@@ -208,6 +211,7 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
+    regularizeStock: Regularizar stock
     buyRequest:
         ticketId: 'ID Ticket'
         shipped: 'F. envío'
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index 44b868ebd..a4c3566a9 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -3,7 +3,7 @@ import { ref } from 'vue';
 import { Notify } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 import { useSession } from 'src/composables/useSession';
 import { useLogin } from 'src/composables/useLogin';
 
@@ -63,11 +63,10 @@ async function onSubmit() {
             :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
             color="primary"
         />
-        <VnInput
-            type="password"
+        <VnInputPassword
             v-model="password"
             :label="t('login.password')"
-            lazy-rules
+            :toggle-visibility="true"
             :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
             class="red"
         />
diff --git a/src/pages/Login/ResetPassword.vue b/src/pages/Login/ResetPassword.vue
index 2751f1ceb..081801e0e 100644
--- a/src/pages/Login/ResetPassword.vue
+++ b/src/pages/Login/ResetPassword.vue
@@ -7,6 +7,7 @@ import axios from 'axios';
 
 import VnInput from 'components/common/VnInput.vue';
 import VnOutForm from 'components/ui/VnOutForm.vue';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const quasar = useQuasar();
 const router = useRouter();
@@ -54,8 +55,7 @@ async function onSubmit() {
 <template>
     <VnOutForm @submit="onSubmit" :title="t('globals.pageTitles.resetPassword')">
         <template #default>
-            <VnInput
-                type="password"
+            <VnInputPassword
                 :label="t('login.password')"
                 v-model="newPassword"
                 :info="
@@ -72,9 +72,8 @@ async function onSubmit() {
                 <template #prepend>
                     <QIcon name="password" />
                 </template>
-            </VnInput>
-            <VnInput
-                type="password"
+            </VnInputPassword>
+            <VnInputPassword
                 :label="t('resetPassword.repeatPassword')"
                 v-model="repeatPassword"
                 required
@@ -82,7 +81,7 @@ async function onSubmit() {
                 <template #prepend>
                     <QIcon name="password" />
                 </template>
-            </VnInput>
+            </VnInputPassword>
         </template>
         <template #buttons>
             <QBtn
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index ef03ec20d..f363f5bf8 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -110,15 +110,13 @@ const columns = computed(() => [
         name: 'salesPersonFk',
         field: 'userName',
         align: 'left',
-        optionFilter: 'firstName',
         columnFilter: {
             component: 'select',
             attrs: {
-                url: 'Workers/activeWithInheritedRole',
-                fields: ['id', 'name'],
+                url: 'Workers/search?departmentCodes=["VT"]',
+                fields: ['id', 'name', 'nickname', 'code'],
                 sortBy: 'nickname ASC',
-                where: { role: 'salesPerson' },
-                useLike: false,
+                optionLabel: 'nickname',
             },
         },
     },
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 67c0f1de5..823815f59 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -1,38 +1,12 @@
 <script setup>
-import { computed } from 'vue';
-import { useRoute } from 'vue-router';
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
-import OrderFilter from './OrderFilter.vue';
-import OrderSearchbar from './OrderSearchbar.vue';
-import OrderCatalogFilter from './OrderCatalogFilter.vue';
-const config = {
-    OrderCatalog: OrderCatalogFilter,
-};
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => {
-    const route = config[routeName.value];
-    if (route) return null;
-    return 'OrderList';
-});
-const customFilterPanel = computed(() => {
-    const filterPanel = config[routeName.value] ?? OrderFilter;
-    return filterPanel;
-});
 </script>
 
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Order"
         base-url="Orders"
         :descriptor="OrderDescriptor"
-        :filter-panel="customFilterPanel"
-        :search-data-key="customRouteRedirectName"
-    >
-        <template #searchbar>
-            <OrderSearchbar />
-        </template>
-    </VnCard>
+    />
 </template>
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index da2e88aa9..186f216fb 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -15,15 +15,18 @@ const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const dataKey = 'OrderCatalogList';
-const arrayData = useArrayData(dataKey);
-const store = arrayData.store;
-const tags = ref([]);
-const itemRefs = ref({});
-
-let catalogParams = {
+const catalogParams = {
     orderFk: route.params.id,
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
+const arrayData = useArrayData(dataKey, {
+    url: 'Orders/CatalogFilter',
+    limit: 50,
+    userParams: catalogParams,
+});
+const store = arrayData.store;
+const tags = ref([]);
+const itemRefs = ref({});
 
 onMounted(() => {
     stateStore.rightDrawer = true;
@@ -66,7 +69,6 @@ function extractValueTags(items) {
     );
     tagValue.value = resultValueTags;
 }
-const autoLoad = computed(() => !!JSON.parse(route?.query.table ?? '{}')?.categoryFk);
 
 watch(
     () => store.data,
@@ -78,16 +80,15 @@ watch(
 </script>
 
 <template>
-    <VnSearchbar
-        :data-key="dataKey"
-        :user-params="catalogParams"
-        :static-params="['orderFk', 'orderBy']"
-        :redirect="false"
-        url="Orders/CatalogFilter"
-        :label="t('Search items')"
-        :info="t('You can search items by name or id')"
-        :search-remove-params="false"
-    />
+    <Teleport to="#section-searchbar" v-if="stateStore.isHeaderMounted()">
+        <VnSearchbar
+            :data-key="dataKey"
+            :redirect="false"
+            :label="t('Search items')"
+            :info="t('You can search items by name or id')"
+            :search-remove-params="false"
+        />
+    </Teleport>
     <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <OrderCatalogFilter
             :data-key="dataKey"
@@ -98,13 +99,7 @@ watch(
     </Teleport>
     <QPage class="column items-center q-pa-md" data-cy="orderCatalogPage">
         <div class="full-width">
-            <VnPaginate
-                :data-key="dataKey"
-                url="Orders/CatalogFilter"
-                :limit="50"
-                :user-params="catalogParams"
-                :auto-load="autoLoad"
-            >
+            <VnPaginate :data-key="dataKey">
                 <template #body="{ rows }">
                     <div class="catalog-list">
                         <div v-if="rows && !rows?.length" class="no-result">
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index e0c613aed..0d5f0146f 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -9,7 +9,6 @@ import useCardDescription from 'src/composables/useCardDescription';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import FetchData from 'components/FetchData.vue';
-import OrderDescriptorMenu from 'pages/Order/Card/OrderDescriptorMenu.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const DEFAULT_ITEMS = 0;
@@ -94,9 +93,6 @@ const total = ref(0);
         @on-fetch="setData"
         data-key="orderData"
     >
-        <template #menu="{ entity }">
-            <OrderDescriptorMenu :order="entity" />
-        </template>
         <template #body="{ entity }">
             <VnLv
                 :label="t('globals.state')"
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index fcd1ef2e4..c387be241 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -97,6 +97,7 @@ const sourceList = ref([]);
                     v-model="params.sourceApp"
                     :options="sourceList"
                     option-label="value"
+                    option-value="value"
                     dense
                     outlined
                     rounded
diff --git a/src/pages/Order/Card/OrderSearchbar.vue b/src/pages/Order/Card/OrderSearchbar.vue
deleted file mode 100644
index fa30a097f..000000000
--- a/src/pages/Order/Card/OrderSearchbar.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-
-const { t } = useI18n();
-</script>
-
-<template>
-    <VnSearchbar
-        data-key="OrderList"
-        url="Orders/filter"
-        :label="t('Search order')"
-        :info="t('Search orders by ticket id')"
-    />
-</template>
-
-<style scoped lang="scss"></style>
-<i18n>
-es:
-    Search order: Buscar orden
-    Search orders by ticket id: Buscar pedido por id ticket
-</i18n>
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index ad06dfe43..a289688e4 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -12,6 +12,7 @@ import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import OrderDescriptorMenu from 'pages/Order/Card/OrderDescriptorMenu.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -91,6 +92,9 @@ async function handleConfirm() {
                     <QTooltip>{{ t('order.summary.confirmLines') }}</QTooltip>
                 </QBtn>
             </template>
+            <template #menu="{ entity }">
+                <OrderDescriptorMenu :order="entity" />
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
                     <VnTitle
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index baa203541..ae1fe68bd 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -8,15 +8,14 @@ import { useRoute } from 'vue-router';
 
 import axios from 'axios';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
-import OrderSearchbar from './Card/OrderSearchbar.vue';
 import OrderFilter from './Card/OrderFilter.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -24,6 +23,8 @@ const tableRef = ref();
 const agencyList = ref([]);
 const route = useRoute();
 const addressOptions = ref([]);
+const dataKey = 'OrderList';
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -178,117 +179,126 @@ const getDateColor = (date) => {
     if (difference < 0) return 'bg-success';
 };
 </script>
+
 <template>
-    <OrderSearchbar />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="order"
+        :array-data-props="{
+            url: 'Orders/filter',
+            order: ['landed DESC', 'clientFk ASC', 'id DESC'],
+        }"
+    >
+        <template #rightMenu>
             <OrderFilter data-key="OrderList" />
         </template>
-    </RightMenu>
-    <VnTable
-        ref="tableRef"
-        data-key="OrderList"
-        url="Orders/filter"
-        :order="['landed DESC', 'clientFk ASC', 'id DESC']"
-        :create="{
-            urlCreate: 'Orders/new',
-            title: t('module.cerateOrder'),
-            onDataSaved: (url) => {
-                tableRef.redirect(`${url}/catalog`);
-            },
-            formInitialData: {
-                active: true,
-                addressId: null,
-                clientFk: null,
-            },
-        }"
-        :user-params="{ showEmpty: false }"
-        :columns="columns"
-        :right-search="false"
-        redirect="order"
-    >
-        <template #column-clientFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row?.clientName }}
-                <CustomerDescriptorProxy :id="row?.clientFk" />
-            </span>
-        </template>
-        <template #column-salesPersonFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row?.name }}
-                <WorkerDescriptorProxy :id="row?.salesPersonFk" />
-            </span>
-        </template>
-        <template #column-landed="{ row }">
-            <span v-if="getDateColor(row.landed)">
-                <QChip :class="getDateColor(row.landed)" dense square>
-                    {{ toDate(row?.landed) }}
-                </QChip>
-            </span>
-        </template>
-        <template #more-create-dialog="{ data }">
-            <VnSelect
-                url="Clients"
-                :include="{ relation: 'addresses' }"
-                v-model="data.clientFk"
-                :label="t('module.customer')"
-                @update:model-value="(id) => fetchClientAddress(id, data)"
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'Orders/new',
+                    title: t('module.cerateOrder'),
+                    onDataSaved: (url) => {
+                        tableRef.redirect(`${url}/catalog`);
+                    },
+                    formInitialData: {
+                        active: true,
+                        addressId: null,
+                        clientFk: null,
+                    },
+                }"
+                :user-params="{ showEmpty: false }"
+                :columns="columns"
+                :right-search="false"
+                redirect="order"
             >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>
-                                {{ scope.opt.name }}
-                            </QItemLabel>
-                            <QItemLabel caption>
-                                {{ `#${scope.opt.id}` }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
+                <template #column-clientFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.clientName }}
+                        <CustomerDescriptorProxy :id="row?.clientFk" />
+                    </span>
                 </template>
-            </VnSelect>
-            <VnSelect
-                v-model="data.addressId"
-                :options="addressOptions"
-                :label="t('module.address')"
-                option-value="id"
-                option-label="nickname"
-                @update:model-value="() => fetchAgencies(data)"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel
-                                :class="{
-                                    'color-vn-label': !scope.opt?.isActive,
-                                }"
-                            >
-                                {{
-                                    `${
-                                        !scope.opt?.isActive
-                                            ? t('basicData.inactive')
-                                            : ''
-                                    } `
-                                }}
-                                {{ scope.opt?.nickname }}: {{ scope.opt?.street }},
-                                {{ scope.opt?.city }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
+                <template #column-salesPersonFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.name }}
+                        <WorkerDescriptorProxy :id="row?.salesPersonFk" />
+                    </span>
                 </template>
-            </VnSelect>
-            <VnInputDate
-                v-model="data.landed"
-                :label="t('module.landed')"
-                @update:model-value="() => fetchAgencies(data)"
-            />
-            <VnSelect
-                v-model="data.agencyModeId"
-                :label="t('module.agency')"
-                :options="agencyList"
-                option-value="agencyModeFk"
-                option-label="agencyMode"
-            />
+                <template #column-landed="{ row }">
+                    <span v-if="getDateColor(row.landed)">
+                        <QChip :class="getDateColor(row.landed)" dense square>
+                            {{ toDate(row?.landed) }}
+                        </QChip>
+                    </span>
+                </template>
+                <template #more-create-dialog="{ data }">
+                    <VnSelect
+                        url="Clients"
+                        :include="{ relation: 'addresses' }"
+                        v-model="data.clientFk"
+                        :label="t('module.customer')"
+                        @update:model-value="(id) => fetchClientAddress(id, data)"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt.name }}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt.id}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        v-model="data.addressId"
+                        :options="addressOptions"
+                        :label="t('module.address')"
+                        option-value="id"
+                        option-label="nickname"
+                        @update:model-value="() => fetchAgencies(data)"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel
+                                        :class="{
+                                            'color-vn-label': !scope.opt?.isActive,
+                                        }"
+                                    >
+                                        {{
+                                            `${
+                                                !scope.opt?.isActive
+                                                    ? t('basicData.inactive')
+                                                    : ''
+                                            } `
+                                        }}
+                                        {{ scope.opt?.nickname }}:
+                                        {{ scope.opt?.street }},
+                                        {{ scope.opt?.city }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnInputDate
+                        v-model="data.landed"
+                        :label="t('module.landed')"
+                        @update:model-value="() => fetchAgencies(data)"
+                    />
+                    <VnSelect
+                        v-model="data.agencyModeId"
+                        :label="t('module.agency')"
+                        :options="agencyList"
+                        option-value="agencyModeFk"
+                        option-label="agencyMode"
+                    />
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
diff --git a/src/pages/Order/locale/en.yml b/src/pages/Order/locale/en.yml
index 4349bc76f..14e41c559 100644
--- a/src/pages/Order/locale/en.yml
+++ b/src/pages/Order/locale/en.yml
@@ -21,3 +21,26 @@ lines:
     image: Image
 params:
     tagGroups: Tags
+order:
+    field:
+        salesPersonFk: Sales Person
+    form:
+        clientFk: Client
+        addressFk: Address
+        agencyModeFk: Agency
+    list:
+        newOrder: New Order
+    summary:
+        basket: Basket
+        notConfirmed: Not confirmed
+        created: Created
+        createdFrom: Created From
+        address: Address
+        total: Total
+        items: Items
+        orderTicketList: Order Ticket List
+        amount: Amount
+        confirm: Confirm
+        confirmLines: Confirm lines
+    search: Search orders
+    searchInfo: You can search orders by ticket id
diff --git a/src/pages/Order/locale/es.yml b/src/pages/Order/locale/es.yml
index cef06cb6d..44e243ad1 100644
--- a/src/pages/Order/locale/es.yml
+++ b/src/pages/Order/locale/es.yml
@@ -21,3 +21,29 @@ lines:
     image: Imagen
 params:
     tagGroups: Tags
+order:
+    field:
+        salesPersonFk: Comercial
+    form:
+        clientFk: Cliente
+        addressFk: Dirección
+        agencyModeFk: Agencia
+    list:
+        newOrder: Nuevo Pedido
+    summary:
+        basket: Cesta
+        notConfirmed: No confirmada
+        created: Creado
+        createdFrom: Creado desde
+        address: Dirección
+        total: Total
+        vat: IVA
+        state: Estado
+        alias: Alias
+        items: Artículos
+        orderTicketList: Tickets del pedido
+        amount: Monto
+        confirm: Confirmar
+        confirmLines: Confirmar lineas
+    search: Buscar pedido
+    searchInfo: Buscar pedidos por el número de ticket
diff --git a/src/pages/Route/Agency/locale/es.yml b/src/pages/Route/Agency/locale/es.yml
index 2607472bd..5c594a41d 100644
--- a/src/pages/Route/Agency/locale/es.yml
+++ b/src/pages/Route/Agency/locale/es.yml
@@ -10,3 +10,4 @@ agency:
     searchBar:
         info: Puedes buscar por nombre o id
         label: Buscar agencia...
+
diff --git a/src/pages/Route/Card/RouteDescriptorMenu.vue b/src/pages/Route/Card/RouteDescriptorMenu.vue
index 6092bcd95..d1a70c868 100644
--- a/src/pages/Route/Card/RouteDescriptorMenu.vue
+++ b/src/pages/Route/Card/RouteDescriptorMenu.vue
@@ -52,7 +52,7 @@ async function actualizeVolume() {
     const params = { isOk: true };
     await axios.post(`Routes/${routeId}/updateVolume`, params);
     quasar.notify({
-        message: t('globals.dataUpdated'),
+        message: t('globals.dataSaved'),
         type: 'positive',
     });
 }
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index a0b971195..3051972b2 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -12,6 +12,7 @@ import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import RouteDescriptorMenu from './RouteDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -128,6 +129,9 @@ const ticketColumns = ref([
             <template #header="{ entity }">
                 <span>{{ `${entity?.route.id} - ${entity?.route?.description}` }}</span>
             </template>
+            <template #menu="{ entity }">
+                <RouteDescriptorMenu :route="entity.route" />
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-max">
                     <VnTitle
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 3fb36b4f7..1fbb1897d 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -10,6 +10,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import VnLinkPhone from 'components/ui/VnLinkPhone.vue';
+import RoadmapDescriptorMenu from './RoadmapDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -86,6 +87,9 @@ const filter = {
             <template #header="{ entity }">
                 <span>{{ `${entity?.id} - ${entity?.name}` }}</span>
             </template>
+            <template #menu="{ entity }">
+                <RoadmapDescriptorMenu :route="entity" />
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
                     <VnTitle
diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
index 420d18dfe..7a1f9e1c0 100644
--- a/src/pages/Route/locale/en.yml
+++ b/src/pages/Route/locale/en.yml
@@ -1,4 +1,18 @@
 route:
+    params:
+        etd: ETD
+        tractorPlate: Plate
+        price: Price
+        observations: Observations
+        id: ID
+        name: Name
+        cmrFk: CMR id
+        hasCmrDms: Attached in gestdoc
+        ticketFk: Ticketd id
+        routeFk: Route id
+        shipped: Shipped
+        agencyAgreement: Agency agreement
+        agencyModeName: Agency route
     Worker: Worker
     Agency: Agency
     Vehicle: Vehicle
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
index a6ba4f370..b6f42bd5a 100644
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@@ -1,4 +1,18 @@
 route:
+    params:
+        agencyModeName: Agencia Ruta
+        agencyAgreement: Agencia Acuerdo
+        id: Id
+        name: Troncal
+        etd: ETD
+        tractorPlate: Matrícula
+        price: Precio
+        observations: Observaciones
+        cmrFk: Id CMR
+        hasCmrDms: Gestdoc
+        ticketFk: Id ticket
+        routeFK: Id ruta
+        shipped: Fecha preparación
     Worker: Trabajador
     Agency: Agencia
     Vehicle: Vehículo
diff --git a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
index 16351fdd4..447737e9c 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
@@ -4,6 +4,7 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import VnConfirm from 'components/ui/VnConfirm.vue';
+import { useRoute } from 'vue-router';
 
 const $props = defineProps({
     shelving: {
@@ -14,8 +15,11 @@ const $props = defineProps({
 
 const router = useRouter();
 const quasar = useQuasar();
+const route = useRoute();
 const { t } = useI18n();
 
+const emit = defineEmits(['onRemove']);
+
 function confirmRemove() {
     quasar.dialog({
         component: VnConfirm,
@@ -32,11 +36,12 @@ async function remove() {
         return;
     }
     await axios.delete(`Shelvings/${$props.shelving.id}`);
-    await router.push({ name: 'ShelvingList' });
+    if (route.name != 'ShelvingList') await router.push({ name: 'ShelvingList' });
     quasar.notify({
         message: t('globals.dataDeleted'),
         type: 'positive',
     });
+    emit('onRemove', {});
 }
 </script>
 <template>
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 0c1eb2a1d..39fa4639f 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -1,10 +1,11 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
+import ShelvingDescriptorMenu from './ShelvingDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -14,7 +15,7 @@ const $props = defineProps({
 });
 const route = useRoute();
 const { t } = useI18n();
-
+const summary = ref({});
 const entityId = computed(() => $props.id || route.params.id);
 
 const filter = {
@@ -43,7 +44,13 @@ const filter = {
             data-key="ShelvingSummary"
         >
             <template #header="{ entity }">
-                <div>{{ entity.id }} - {{ entity.code }}</div>
+                <div>{{ entity.code }}</div>
+            </template>
+            <template #menu="{ entity }">
+                <ShelvingDescriptorMenu
+                    :shelving="entity"
+                    @on-remove="$refs.summary.fetch()"
+                />
             </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 71791a4fe..1d9f3ab94 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -94,6 +94,7 @@ function handleLocation(data, location) {
                 <VnInput
                     v-model="data.name"
                     :label="t('supplier.fiscalData.name')"
+                    uppercase="true"
                     clearable
                 />
                 <VnInput
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index c0748af87..85cc11857 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -5,6 +5,7 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import SupplierListFilter from './SupplierListFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -23,9 +24,14 @@ const columns = computed(() => [
         align: 'left',
         label: t('globals.name'),
         name: 'socialName',
-        create: true,
+        attrs: {
+            uppercase: true,
+        },
         columnFilter: {
             name: 'search',
+            attrs: {
+                uppercase: false,
+            },
         },
         isTitle: true,
     },
@@ -118,14 +124,18 @@ const columns = computed(() => [
             formInitialData: {},
             mapper: (data) => {
                 data.name = data.socialName;
-                delete data.socialName;
+
                 return data;
             },
         }"
         :right-search="false"
         order="id ASC"
         :columns="columns"
-    />
+    >
+        <template #more-create-dialog="{ data }">
+            <VnInput :label="t('globals.name')" v-model="data.socialName" :uppercase="true" />
+            </template>
+    </VnTable>
 </template>
 
 <i18n>
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 9e06714af..166e86978 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -319,6 +319,7 @@ onMounted(async () => {
                 }
             }
         "
+        :redirect="false"
         order="created DESC"
     >
         <template #column-freightItemName="{ row }">
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 18dcaea7e..d045eadee 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -169,6 +169,7 @@ async function handleSave() {
                             :roles-allowed-to-create="['administrative']"
                             option-value="id"
                             hide-selected
+                            sort-by="name ASC"
                         >
                             <template #form>
                                 <TicketCreateServiceType
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 2f5f69e1c..2c6e34864 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -96,7 +96,6 @@ function toTicketUrl(section) {
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
         data-key="TicketSummary"
-        data-cy="ticketSummary"
     >
         <template #header-left>
             <VnToSummary
@@ -114,7 +113,7 @@ function toTicketUrl(section) {
                 {{ entity.nickname }}
             </div>
         </template>
-        <template #header-right="{ entity }">
+        <template #header-right>
             <div>
                 <QBtnDropdown
                     ref="stateBtnDropdownRef"
@@ -133,18 +132,11 @@ function toTicketUrl(section) {
                         @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 #menu="{ entity }">
+            <TicketDescriptorMenu :ticket="entity" />
+        </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle
@@ -258,7 +250,7 @@ function toTicketUrl(section) {
             <QCard class="vn-one" v-if="entity.notes.length">
                 <VnTitle
                     :url="toTicketUrl('observation')"
-                    :text="t('globals.pageTitles.notes')"
+                    :text="t('ticket.pageTitles.notes')"
                 />
                 <QVirtualScroll
                     :items="entity.notes"
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 9c8b9f1a3..7dcb834d2 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -101,7 +101,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="states">
-                    <QSelect
+                    <VnSelect
                         :label="t('State')"
                         v-model="params.stateFk"
                         @update:model-value="searchFn()"
@@ -122,7 +122,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="groupedStates">
-                    <QSelect
+                    <VnSelect
                         :label="t('Grouped state')"
                         v-model="params.groupedStates"
                         @update:model-value="searchFn()"
@@ -217,7 +217,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="provinces">
-                    <QSelect
+                    <VnSelect
                         :label="t('Province')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
@@ -238,7 +238,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="agencies">
-                    <QSelect
+                    <VnSelect
                         :label="t('Agency')"
                         v-model="params.agencyModeFk"
                         @update:model-value="searchFn()"
@@ -259,7 +259,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="warehouses">
-                    <QSelect
+                    <VnSelect
                         :label="t('Warehouse')"
                         v-model="params.warehouseFk"
                         @update:model-value="searchFn()"
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 5147af81f..64cf3d649 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -684,6 +684,7 @@ function setReference(data) {
             color="primary"
             fab
             icon="vn:invoice-in"
+            data-cy="ticketListMakeInvoiceBtn"
         />
         <QTooltip>
             {{ t('ticketList.createInvoice') }}
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 59c3a8a91..689711a74 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -9,8 +9,9 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import { toDate, toCurrency } from 'src/filters';
+import { toDate, toCurrency, toCelsius } from 'src/filters';
 import axios from 'axios';
+import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
 
 const $props = defineProps({
     id: {
@@ -96,6 +97,20 @@ const entriesTableColumns = computed(() => {
             showValue: true,
         },
         { label: 'm³', field: 'm3', name: 'm3', align: 'left', showValue: true },
+        {
+            label: t('entry.basicData.initialTemperature'),
+            field: 'initialTemperature',
+            name: 'initialTemperature',
+            align: 'left',
+            format: (val) => toCelsius(val),
+        },
+        {
+            label: t('entry.basicData.finalTemperature'),
+            field: 'finalTemperature',
+            name: 'finalTemperature',
+            align: 'left',
+            format: (val) => toCelsius(val),
+        },
         {
             label: '',
             field: 'observation',
@@ -126,14 +141,14 @@ const thermographsTableColumns = computed(() => {
             field: 'maxTemperature',
             name: 'maxTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.minTemperature'),
             field: 'minTemperature',
             name: 'minTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.state'),
@@ -242,7 +257,9 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
         <template #header>
             <span>{{ travel.id }} - {{ travel.ref }}</span>
         </template>
-
+        <template #menu="{ entity }">
+            <TravelDescriptorMenuItems :travel="entity" />
+        </template>
         <template #body>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 2bf3293a6..85781a6a4 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -10,7 +10,7 @@ import FetchData from 'src/components/FetchData.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import { toDate } from 'src/filters';
+import { toDate, toCelsius } from 'src/filters';
 import { downloadFile } from 'src/composables/downloadFile';
 
 const route = useRoute();
@@ -52,14 +52,14 @@ const TableColumns = computed(() => {
             field: 'maxTemperature',
             name: 'maxTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.minTemperature'),
             field: 'minTemperature',
             name: 'minTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.state'),
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 75b744168..273158a34 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -221,7 +221,20 @@ warehouses();
                         dense
                         outlined
                         rounded
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
@@ -232,6 +245,7 @@ warehouses();
                         :options="continentsOptions"
                         option-value="code"
                         option-label="name"
+                        :filter-options="['code', 'name']"
                         hide-selected
                         dense
                         outlined
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index bb78080ef..90901ee4d 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -140,10 +140,10 @@ en:
         Id: Contains
         ref: Reference
         agency: Agency
-        warehouseInFk: W. In
+        warehouseInFk: Warehouse In
         shipped: Shipped
         shipmentHour: Shipment Hour
-        warehouseOut: W. Out
+        warehouseOut: Warehouse Out
         landed: Landed
         landingHour: Landing Hour
         totalEntries: Σ
@@ -156,7 +156,7 @@ es:
         warehouseInFk: Alm.Entrada
         shipped: F.Envío
         shipmentHour: Hora de envío
-        warehouseOut: Alm.Entrada
+        warehouseOut: Alm.Salida
         landed: F.Entrega
         landingHour: Hora de entrega
         totalEntries: Σ
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index d66bd2608..1ada15a33 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -1,21 +1,7 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
 import WorkerDescriptor from './WorkerDescriptor.vue';
-import WorkerFilter from '../WorkerFilter.vue';
+import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 </script>
 <template>
-    <VnCard
-        data-key="Worker"
-        custom-url="Workers/summary"
-        :descriptor="WorkerDescriptor"
-        :filter-panel="WorkerFilter"
-        search-data-key="WorkerList"
-        :searchbar-props="{
-            url: 'Workers/filter',
-            label: 'Search worker',
-            info: 'You can search by worker id or name',
-            order: 'id DESC',
-        }"
-        :redirect-on-error="true"
-    />
+    <VnCardBeta data-key="Worker" custom-url="Workers/summary" :descriptor="WorkerDescriptor" />
 </template>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index f09aec816..d87fd4a54 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -6,10 +6,10 @@ import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
-import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
 import EditPictureForm from 'components/EditPictureForm.vue';
+import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 
 const $props = defineProps({
@@ -28,8 +28,6 @@ const image = ref(null);
 
 const route = useRoute();
 const { t } = useI18n();
-const state = useState();
-const user = state.getUser();
 const showEditPhotoForm = ref(false);
 const toggleEditPictureForm = () => {
     showEditPhotoForm.value = !showEditPhotoForm.value;
@@ -45,18 +43,6 @@ const getIsExcluded = async () => {
     workerExcluded.value = data.exists;
 };
 
-const handleExcluded = async () => {
-    if (workerExcluded.value)
-        await axios.delete(`WorkerDisableExcludeds/${entityId.value}`);
-    else
-        await axios.post(`WorkerDisableExcludeds`, {
-            workerFk: entityId.value,
-            dated: new Date(),
-        });
-
-    workerExcluded.value = !workerExcluded.value;
-};
-
 const handlePhotoUpdated = (evt = false) => {
     image.value.reload(evt);
 };
@@ -72,25 +58,11 @@ const handlePhotoUpdated = (evt = false) => {
         @on-fetch="getIsExcluded"
     >
         <template #menu="{ entity }">
-            <QItem v-ripple clickable @click="handleExcluded">
-                <QItemSection>
-                    {{
-                        workerExcluded
-                            ? t('Click to allow the user to be disabled')
-                            : t('Click to exclude the user from getting disabled')
-                    }}
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-if="!entity.user.emailVerified && user.id != entity.id"
-                v-ripple
-                clickable
-                @click="$refs.changePassRef.show"
-            >
-                <QItemSection>
-                    {{ t('globals.changePass') }}
-                </QItemSection>
-            </QItem>
+            <WorkerDescriptorMenu
+                :worker="entity"
+                :is-excluded="workerExcluded"
+                @show-dialog="$refs.changePassRef.show"
+            />
         </template>
         <template #before>
             <div class="relative-position">
@@ -146,12 +118,11 @@ const handlePhotoUpdated = (evt = false) => {
             />
             <VnLv :label="t('worker.list.department')">
                 <template #value>
-                        <span class="link" v-text="entity.department?.department?.name" />
-                        <DepartmentDescriptorProxy
-                            :id="entity.department?.department?.id"
-                        />
+                    <span class="link" v-text="entity.department?.department?.name" />
+                    <DepartmentDescriptorProxy :id="entity.department?.department?.id" />
                 </template>
             </VnLv>
+
             <VnLv :value="entity.phone">
                 <template #label>
                     {{ t('globals.phone') }}
@@ -211,8 +182,6 @@ const handlePhotoUpdated = (evt = false) => {
 
 <i18n>
 es:
-    Go to client: Ir a cliente
-    Go to user: Ir al usuario
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptorMenu.vue b/src/pages/Worker/Card/WorkerDescriptorMenu.vue
new file mode 100644
index 000000000..8d82dc839
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerDescriptorMenu.vue
@@ -0,0 +1,65 @@
+<script setup>
+import { computed, ref, toRefs } from 'vue';
+import axios from 'axios';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useState } from 'src/composables/useState';
+
+const $props = defineProps({
+    worker: {
+        type: Object,
+        required: true,
+    },
+    isExcluded: {
+        type: Boolean,
+        required: true,
+    },
+});
+const route = useRoute();
+const { t } = useI18n();
+const state = useState();
+const user = state.getUser();
+const { worker } = toRefs($props);
+const workerExcluded = ref($props.isExcluded);
+const entityId = computed(() => {
+    return $props.worker.id || route.params.id;
+});
+const emit = defineEmits(['show-dialog']);
+const handleExcluded = async () => {
+    if (workerExcluded.value)
+        await axios.delete(`WorkerDisableExcludeds/${entityId.value}`);
+    else
+        await axios.post(`WorkerDisableExcludeds`, {
+            workerFk: entityId.value,
+            dated: new Date(),
+        });
+
+    workerExcluded.value = !workerExcluded.value;
+};
+
+const showChangePasswordDialog = () => {
+    emit('show-dialog', true);
+};
+</script>
+
+<template>
+    <QItem v-ripple clickable @click="handleExcluded">
+        <QItemSection>
+            {{
+                workerExcluded
+                    ? t('Click to allow the user to be disabled')
+                    : t('Click to exclude the user from getting disabled')
+            }}
+        </QItemSection>
+    </QItem>
+    <QItem
+        v-if="!worker.user.emailVerified && user.id == worker.id"
+        v-ripple
+        clickable
+        @click="showChangePasswordDialog"
+    >
+        <QItemSection>
+            {{ t('globals.changePass') }}
+        </QItemSection>
+    </QItem>
+</template>
diff --git a/src/pages/Worker/Card/WorkerPBX.vue b/src/pages/Worker/Card/WorkerPBX.vue
index 547156532..12f2a4b23 100644
--- a/src/pages/Worker/Card/WorkerPBX.vue
+++ b/src/pages/Worker/Card/WorkerPBX.vue
@@ -1,68 +1,28 @@
+src/pages/Worker/Card/WorkerPBX.vue
+
 <script setup>
-import { watch, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
-import { useState } from 'src/composables/useState';
-
 import FormModel from 'src/components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
-const { t } = useI18n();
-const state = useState();
-const route = useRoute();
-const workerPBXForm = ref();
-const extension = ref(null);
-
-const filter = {
-    include: [
-        {
-            relation: 'sip',
-        },
-    ],
-};
-
-watch(
-    () => route.params.id,
-    () => state.set('extension', null)
-);
-
-const onFetch = (data) => {
-    state.set('extension', data?.sip?.extension);
-    extension.value = state.get('extension');
-};
-
-const updateModelValue = (data) => {
-    state.set('extension', data);
-    workerPBXForm.value.hasChanges = true;
-};
 </script>
 
 <template>
     <FormModel
-        ref="workerPBXForm"
-        :filter="filter"
-        :url="`Workers/${route.params.id}`"
+        model="WorkerPbx"
+        :url="`Workers/${$route.params.id}/sip`"
         url-update="Sips"
-        auto-load
         :mapper="
-            () => ({
-                userFk: +route.params.id,
+            ({ userFk, extension }) => ({
+                userFk,
                 extension,
             })
         "
-        model="DeviceProductionUser"
-        @on-fetch="onFetch"
+        auto-load
     >
-        <template #form="{}">
-            <VnRow>
-                <VnInput
-                    :label="t('worker.summary.sipExtension')"
-                    v-model="extension"
-                    @update:model-value="updateModelValue"
-                />
-            </VnRow>
+        <template #form="{ data }">
+            <VnInput
+                :label="$t('worker.summary.sipExtension')"
+                v-model="data.extension"
+            />
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 496f1ca16..bfb503f6b 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -11,6 +11,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
+import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -42,6 +43,9 @@ onBeforeMount(async () => {
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>
         </template>
+        <template #menu="{ entity }">
+            <WorkerDescriptorMenu :worker="entity" :is-excluded="workerExcluded" />
+        </template>
         <template #body="{ entity: worker }">
             <QCard class="vn-one">
                 <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
deleted file mode 100644
index a4c6c2a06..000000000
--- a/src/pages/Worker/WorkerCreate.vue
+++ /dev/null
@@ -1,254 +0,0 @@
-<script setup>
-import { onBeforeMount, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import axios from 'axios';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnRadio from 'src/components/common/VnRadio.vue';
-import { useState } from 'src/composables/useState';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-
-const { t } = useI18n();
-const user = useState().getUser();
-
-const companiesOptions = ref([]);
-const payMethodsOptions = ref([]);
-const bankEntitiesOptions = ref([]);
-const formData = ref({ companyFk: user.value.companyFk, isFreelance: false });
-const defaultPayMethod = ref();
-
-onBeforeMount(async () => {
-    defaultPayMethod.value = (
-        await axios.get('WorkerConfigs/findOne', {
-            params: { field: ['payMethodFk'] },
-        })
-    ).data.payMethodFk;
-    formData.value.payMethodFk = defaultPayMethod.value;
-});
-
-function handleLocation(data, location) {
-    const { town, code, provinceFk, countryFk } = location ?? {};
-    data.postcode = code;
-    data.city = town;
-    data.provinceFk = provinceFk;
-    data.countryFk = countryFk;
-}
-
-function generateCodeUser(worker) {
-    if (!worker.firstName || !worker.lastNames) return;
-
-    const totalName = worker.firstName.concat(' ' + worker.lastNames).toLowerCase();
-    const totalNameArray = totalName.split(' ');
-    let newCode = '';
-
-    for (let part of totalNameArray) newCode += part.charAt(0);
-
-    worker.code = newCode.toUpperCase().slice(0, 3);
-    worker.name = totalNameArray[0] + newCode.slice(1);
-
-    if (!worker.companyFk) worker.companyFk = user.companyFk;
-}
-
-async function autofillBic(worker) {
-    if (!worker || !worker.iban) return;
-
-    let bankEntityId = parseInt(worker.iban.substr(4, 4));
-    let filter = { where: { id: bankEntityId } };
-
-    const { data } = await axios.get(`BankEntities`, { params: { filter } });
-    const hasData = data && data[0];
-    if (hasData) worker.bankEntityFk = data[0].id;
-    else if (!hasData) worker.bankEntityFk = undefined;
-}
-</script>
-<template>
-    <FetchData
-        url="Companies"
-        @on-fetch="(data) => (companiesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Paymethods"
-        @on-fetch="(data) => (payMethodsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="BankEntities"
-        @on-fetch="(data) => (bankEntitiesOptions = data)"
-        auto-load
-    />
-    <QPage>
-        <VnSubToolbar>
-            <template #st-data>
-                <VnRadio
-                    v-model="formData.isFreelance"
-                    :val="false"
-                    :label="`${t('Internal')}`"
-                    @update:model-value="formData.payMethodFk = defaultPayMethod"
-                />
-                <VnRadio
-                    v-model="formData.isFreelance"
-                    :val="true"
-                    :label="`${t('External')}`"
-                    @update:model-value="delete formData.payMethodFk"
-                />
-            </template>
-        </VnSubToolbar>
-        <FormModel
-            url-create="Workers/new"
-            model="worker"
-            :form-initial-data="formData"
-            @on-data-saved="(__, { id }) => $router.push({ path: `/worker/${id}` })"
-        >
-            <template #form="{ data, validate }">
-                <VnRow>
-                    <VnInput
-                        v-model="data.firstName"
-                        :label="t('globals.name')"
-                        :rules="validate('Worker.firstName')"
-                        @update:model-value="generateCodeUser(data)"
-                    />
-                    <VnInput
-                        v-model="data.lastNames"
-                        :label="t('worker.create.lastName')"
-                        :rules="validate('Worker.lastNames')"
-                        @update:model-value="generateCodeUser(data)"
-                    />
-                    <VnInput
-                        v-model="data.code"
-                        :label="t('worker.create.code')"
-                        :rules="validate('Worker.code')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-model="data.name"
-                        :label="t('worker.create.webUser')"
-                        :rules="validate('Worker.name')"
-                    />
-                    <VnInput
-                        v-model="data.email"
-                        :label="t('worker.create.personalEmail')"
-                        :rules="validate('Worker.email')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('globals.company')"
-                        v-model="data.companyFk"
-                        :options="companiesOptions"
-                        option-value="id"
-                        option-label="code"
-                        hide-selected
-                        :rules="validate('Worker.company')"
-                    />
-                    <VnSelectWorker
-                        :label="t('worker.summary.boss')"
-                        v-model="data.bossFk"
-                        :rules="validate('Worker.boss')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-model="data.fi"
-                        :label="t('worker.create.fi')"
-                        :rules="validate('Worker.fi')"
-                    />
-                    <VnInputDate
-                        v-model="data.birth"
-                        :label="t('worker.create.birth')"
-                        :rules="validate('Worker.birth')"
-                        :disable="formData.isFreelance"
-                    />
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('globals.phone')"
-                        :rules="validate('Worker.phone')"
-                        :disable="formData.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                        :disable="formData.isFreelance"
-                    >
-                    </VnLocation>
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        :label="t('globals.street')"
-                        v-model="data.street"
-                        :rules="validate('Worker.street')"
-                        :disable="formData.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('worker.create.payMethods')"
-                        v-model="data.payMethodFk"
-                        :options="payMethodsOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                        :rules="validate('Worker.payMethodFk')"
-                        :disable="formData.isFreelance"
-                        @update:model-value="(val) => !val && delete formData.payMethodFk"
-                    />
-                    <VnInput
-                        v-model="data.iban"
-                        :label="t('worker.create.iban')"
-                        :rules="validate('Worker.iban')"
-                        :disable="formData.isFreelance"
-                        @update:model-value="autofillBic(data)"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                    <VnSelectDialog
-                        :label="t('worker.create.bankEntity')"
-                        v-model="data.bankEntityFk"
-                        :options="bankEntitiesOptions"
-                        option-label="name"
-                        option-value="id"
-                        hide-selected
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
-                        :rules="validate('Worker.bankEntity')"
-                        :disable="formData.isFreelance"
-                        @update:model-value="autofillBic(data)"
-                        :filter-options="['bic', 'name']"
-                    >
-                        <template #form>
-                            <CreateBankEntityForm
-                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection v-if="scope.opt">
-                                    <QItemLabel
-                                        >{{ scope.opt.bic }}
-                                        {{ scope.opt.name }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
-                </VnRow>
-            </template>
-        </FormModel>
-    </QPage>
-</template>
diff --git a/src/pages/Worker/WorkerDepartment.vue b/src/pages/Worker/WorkerDepartment.vue
index fe4c23051..baf6db154 100644
--- a/src/pages/Worker/WorkerDepartment.vue
+++ b/src/pages/Worker/WorkerDepartment.vue
@@ -1,11 +1,16 @@
 <script setup>
+import VnSection from 'src/components/common/VnSection.vue';
 import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md">
-        <WorkerDepartmentTree />
-    </QPage>
+    <VnSection data-key="WorkerDepartment" :search-bar="false">
+        <template #body>
+            <div class="flex flex-center q-pa-md">
+                <WorkerDepartmentTree />
+            </div>
+        </template>
+    </VnSection>
 </template>
 
 <i18n>
diff --git a/src/pages/Worker/WorkerDepartmentTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue
index f349b449d..9abf4e312 100644
--- a/src/pages/Worker/WorkerDepartmentTree.vue
+++ b/src/pages/Worker/WorkerDepartmentTree.vue
@@ -111,18 +111,16 @@ function handleEvent(type, event, node) {
     switch (type) {
         case 'path':
             state.set('TreeState', lastId);
-            node.id && router.push({ path: `/department/department/${node.id}/summary` });
+            node.id && router.push({ path: `/worker/department/${node.id}/summary` });
             break;
 
         case 'tab':
             state.set('TreeState', lastId);
-            node.id &&
-                window.open(`#/department/department/${node.id}/summary`, '_blank');
+            node.id && window.open(`#/worker/department/${node.id}/summary`, '_blank');
             break;
 
         default:
-            node.id &&
-                router.push({ path: `#/department/department/${node.id}/summary` });
+            node.id && router.push({ path: `#/worker/department/${node.id}/summary` });
             break;
     }
 }
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index c2ddfcd20..0b784b993 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -2,7 +2,6 @@
 import { onBeforeMount, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import WorkerSummary from './Card/WorkerSummary.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
@@ -14,12 +13,11 @@ import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 import FetchData from 'src/components/FetchData.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import WorkerFilter from './WorkerFilter.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-
+import VnSection from 'src/components/common/VnSection.vue';
 const { t } = useI18n();
 const tableRef = ref();
 const { viewSummary } = useSummaryDialog();
@@ -31,6 +29,7 @@ const postcodesOptions = ref([]);
 const user = useState().getUser();
 const defaultPayMethod = ref();
 const bankEntitiesRef = ref();
+const dataKey = 'WorkerList';
 const columns = computed(() => [
     {
         align: 'left',
@@ -139,7 +138,11 @@ function uppercaseStreetModel(data) {
     return {
         get: () => (data.street ? data.street.toUpperCase() : ''),
         set: (value) => {
-            data.street = value.toUpperCase();
+            if (value) {
+                data.street = value.toUpperCase();
+            } else {
+                data.street = null;
+            }
         },
     };
 }
@@ -170,11 +173,6 @@ async function autofillBic(worker) {
 }
 </script>
 <template>
-    <VnSearchbar
-        data-key="WorkerList"
-        :label="t('Search worker')"
-        :info="t('You can search by worker id or name')"
-    />
     <FetchData
         url="Companies"
         @on-fetch="(data) => (companiesOptions = data)"
@@ -191,173 +189,202 @@ async function autofillBic(worker) {
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         auto-load
     />
-    <RightMenu>
-        <template #right-panel>
+
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="workerSearch"
+        :array-data-props="{
+            url: 'Workers/filter',
+            order: ['id DESC'],
+        }"
+    >
+        <template #rightMenu>
             <WorkerFilter data-key="WorkerList" />
         </template>
-    </RightMenu>
-    <VnTable
-        v-if="defaultPayMethod"
-        ref="tableRef"
-        data-key="WorkerList"
-        url="Workers/filter"
-        :create="{
-            urlCreate: 'Workers/new',
-            title: t('Create worker'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {
-                payMethodFk: defaultPayMethod,
-                companyFk: user.companyFk,
-                isFreelance: false,
-            },
-        }"
-        :columns="columns"
-        default-mode="table"
-        redirect="worker"
-        :right-search="false"
-        :order="['id DESC']"
-    >
-        <template #more-create-dialog="{ data }">
-            <div class="q-pa-lg full-width">
-                <VnRadio
-                    v-model="data.isFreelance"
-                    :val="false"
-                    :label="`${t('Internal')}`"
-                    @update:model-value="data.payMethodFk = defaultPayMethod"
-                />
-                <VnRadio
-                    v-model="data.isFreelance"
-                    :val="true"
-                    :label="`${t('External')}`"
-                    @update:model-value="delete data.payMethodFk"
-                />
-                <VnRow>
-                    <VnInput
-                        next
-                        v-model="data.firstName"
-                        :label="t('globals.name')"
-                        @update:model-value="generateCodeUser(data)"
-                    />
-                    <VnInput
-                        v-model="data.lastNames"
-                        :label="t('worker.create.lastName')"
-                        @update:model-value="generateCodeUser(data)"
-                    />
-                    <VnInput v-model="data.code" :label="t('worker.create.code')" />
-                </VnRow>
-                <VnRow>
-                    <VnInput v-model="data.name" :label="t('worker.create.webUser')" />
-                    <VnInput
-                        v-model="data.email"
-                        type="email"
-                        :label="t('worker.create.personalEmail')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('globals.company')"
-                        v-model="data.companyFk"
-                        :options="companiesOptions"
-                        option-value="id"
-                        option-label="code"
-                        hide-selected
-                    />
-                    <VnSelectWorker
-                        :label="t('worker.summary.boss')"
-                        v-model="data.bossFk"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnInput v-model="data.fi" :label="t('worker.create.fi')" />
-                    <VnInputDate
-                        v-model="data.birth"
-                        :label="t('worker.create.birth')"
-                        :disable="data.isFreelance"
-                    />
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('globals.phone')"
-                        :disable="data.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnLocation
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
-                        :options="postcodesOptions"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                        :disable="data.isFreelance"
-                    >
-                    </VnLocation>
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        :label="t('globals.street')"
-                        :model-value="uppercaseStreetModel(data).get()"
-                        @update:model-value="uppercaseStreetModel(data).set"
-                        :disable="data.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('worker.create.payMethods')"
-                        v-model="data.payMethodFk"
-                        :options="payMethodsOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                        :disable="data.isFreelance"
-                        @update:model-value="(val) => !val && delete data.payMethodFk"
-                    />
-                    <VnInput
-                        v-model="data.iban"
-                        :label="t('worker.create.iban')"
-                        :disable="data.isFreelance"
-                        @update:model-value="autofillBic(data)"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                </VnRow>
-                <VnRow>
-                    <VnSelectDialog
-                        :label="t('worker.create.bankEntity')"
-                        v-model="data.bankEntityFk"
-                        :options="bankEntitiesOptions"
-                        option-label="name"
-                        option-value="id"
-                        hide-selected
-                        :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
-                        :disable="data.isFreelance"
-                        @update:model-value="autofillBic(data)"
-                        :filter-options="['bic', 'name']"
-                    >
-                        <template #form>
-                            <CreateBankEntityForm
-                                @on-data-saved="
-                                    (_, resp) => handleNewBankEntity(data, resp)
+        <template #body>
+            <VnTable
+                v-if="defaultPayMethod"
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'Workers/new',
+                    title: t('Create worker'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: {
+                        payMethodFk: defaultPayMethod,
+                        companyFk: user.companyFk,
+                        isFreelance: false,
+                    },
+                }"
+                default-mode="table"
+                :columns="columns"
+                redirect="worker"
+                :right-search="false"
+            >
+                <template #more-create-dialog="{ data }">
+                    <div class="q-pa-lg full-width">
+                        <VnRadio
+                            v-model="data.isFreelance"
+                            :val="false"
+                            :label="`${t('Internal')}`"
+                            @update:model-value="data.payMethodFk = defaultPayMethod"
+                        />
+                        <VnRadio
+                            v-model="data.isFreelance"
+                            :val="true"
+                            :label="`${t('External')}`"
+                            @update:model-value="delete data.payMethodFk"
+                        />
+                        <VnRow>
+                            <VnInput
+                                next
+                                v-model="data.firstName"
+                                :label="t('globals.name')"
+                                @update:model-value="generateCodeUser(data)"
+                            />
+                            <VnInput
+                                v-model="data.lastNames"
+                                :label="t('worker.create.lastName')"
+                                @update:model-value="generateCodeUser(data)"
+                            />
+                            <VnInput
+                                v-model="data.code"
+                                :label="t('worker.create.code')"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput
+                                v-model="data.name"
+                                :label="t('worker.create.webUser')"
+                            />
+                            <VnInput
+                                v-model="data.email"
+                                type="email"
+                                :label="t('worker.create.personalEmail')"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('globals.company')"
+                                v-model="data.companyFk"
+                                :options="companiesOptions"
+                                option-value="id"
+                                option-label="code"
+                                hide-selected
+                            />
+                            <VnSelectWorker
+                                :label="t('worker.summary.boss')"
+                                v-model="data.bossFk"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput v-model="data.fi" :label="t('worker.create.fi')" />
+                            <VnInputDate
+                                v-model="data.birth"
+                                :label="t('worker.create.birth')"
+                                :disable="data.isFreelance"
+                            />
+                            <VnInput
+                                v-model="data.phone"
+                                :label="t('globals.phone')"
+                                :disable="data.isFreelance"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnLocation
+                                :roles-allowed-to-create="['deliveryAssistant']"
+                                :acls="[
+                                    { model: 'Town', props: '*', accessType: 'WRITE' },
+                                ]"
+                                :options="postcodesOptions"
+                                @update:model-value="
+                                    (location) => handleLocation(data, location)
+                                "
+                                :disable="data.isFreelance"
+                            >
+                            </VnLocation>
+                        </VnRow>
+                        <VnRow>
+                            <VnInput
+                                :label="t('globals.street')"
+                                :model-value="uppercaseStreetModel(data).get()"
+                                @update:model-value="uppercaseStreetModel(data).set"
+                                :disable="data.isFreelance"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('worker.create.payMethods')"
+                                v-model="data.payMethodFk"
+                                :options="payMethodsOptions"
+                                option-value="id"
+                                option-label="name"
+                                map-options
+                                hide-selected
+                                :disable="data.isFreelance"
+                                @update:model-value="
+                                    (val) => !val && delete data.payMethodFk
                                 "
                             />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection v-if="scope.opt">
-                                    <QItemLabel
-                                        >{{ scope.opt.bic }}
-                                        {{ scope.opt.name }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
-                </VnRow>
-            </div>
+                            <VnInput
+                                v-model="data.iban"
+                                :label="t('worker.create.iban')"
+                                :disable="data.isFreelance"
+                                @update:model-value="autofillBic(data)"
+                            >
+                                <template #append>
+                                    <QIcon name="info" class="cursor-info">
+                                        <QTooltip>{{
+                                            t('components.iban_tooltip')
+                                        }}</QTooltip>
+                                    </QIcon>
+                                </template>
+                            </VnInput>
+                        </VnRow>
+                        <VnRow>
+                            <VnSelectDialog
+                                :label="t('worker.create.bankEntity')"
+                                v-model="data.bankEntityFk"
+                                :options="bankEntitiesOptions"
+                                option-label="name"
+                                option-value="id"
+                                hide-selected
+                                :acls="[
+                                    {
+                                        model: 'BankEntity',
+                                        props: '*',
+                                        accessType: 'WRITE',
+                                    },
+                                ]"
+                                :disable="data.isFreelance"
+                                @update:model-value="autofillBic(data)"
+                                :filter-options="['bic', 'name']"
+                            >
+                                <template #form>
+                                    <CreateBankEntityForm
+                                        @on-data-saved="
+                                            (_, resp) => handleNewBankEntity(data, resp)
+                                        "
+                                    />
+                                </template>
+                                <template #option="scope">
+                                    <QItem v-bind="scope.itemProps">
+                                        <QItemSection v-if="scope.opt">
+                                            <QItemLabel
+                                                >{{ scope.opt.bic }}
+                                                {{ scope.opt.name }}</QItemLabel
+                                            >
+                                        </QItemSection>
+                                    </QItem>
+                                </template>
+                            </VnSelectDialog>
+                        </VnRow>
+                    </div>
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
 
 <i18n>
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 8276977fd..1d47a0c1d 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -1,3 +1,6 @@
+workerSearch:
+    search: Search worker
+    searchInfo: Search worker by id or name
 passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
 tableColumns:
     id: ID
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 9c7618bc3..e4bb724e0 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -1,5 +1,6 @@
-Search worker: Buscar trabajador
-You can search by worker id or name: Puedes buscar por id o nombre del trabajador
+workerSearch:
+    search: Buscar trabajador
+    searchInfo: Buscar trabajador por id o nombre
 Locker: Taquilla
 Internal: Interno
 External: Externo
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 2d65476ce..c38da614c 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -100,6 +100,16 @@ const agencyOptions = ref([]);
                     required="true"
                     clearable
                 />
+                <VnInput
+                    v-model="data.priceOptimum"
+                    :label="t('Price optimum')"
+                    type="number"
+                    min="0"
+                    required="true"
+                    clearable
+                />
+            </VnRow>
+            <VnRow>
                 <VnInput
                     v-model="data.bonus"
                     :label="t('Bonus')"
@@ -107,8 +117,6 @@ const agencyOptions = ref([]);
                     min="0"
                     clearable
                 />
-            </VnRow>
-            <VnRow>
                 <VnSelect
                     :label="t('Distribution point')"
                     v-model="data.addressFk"
@@ -152,6 +160,7 @@ es:
     Traveling days: Dias de viaje
     Closing: Cierre
     Price: Precio
+    Price optimum: Precio óptimo
     Bonus: Bonificación
     Inflation: Inflación
     Volumetric: Volumétrico
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index b4096e5a2..805d03b27 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -182,13 +182,19 @@ onMounted(() => {
                     min="0"
                 />
                 <VnInput
-                    v-model="eventInclusionFormData.bonus"
-                    :label="t('zone.bonus')"
+                    v-model="eventInclusionFormData.priceOptimum"
+                    :label="t('list.priceOptimum')"
                     type="number"
                     min="0"
                 />
             </VnRow>
             <VnRow>
+                <VnInput
+                    v-model="eventInclusionFormData.bonus"
+                    :label="t('zone.bonus')"
+                    type="number"
+                    min="0"
+                />
                 <VnInput
                     v-model="eventInclusionFormData.m3Max"
                     :label="t('zone.m3Max')"
diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index 384ee1fe9..124802633 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -11,6 +11,7 @@ import { getUrl } from 'src/composables/getUrl';
 import { toCurrency } from 'filters/index';
 import { toTimeFormat } from 'src/filters/date';
 import axios from 'axios';
+import ZoneDescriptorMenuItems from './ZoneDescriptorMenuItems.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -79,6 +80,9 @@ onMounted(async () => {
         <template #header="{ entity }">
             <div>#{{ entity.id }} - {{ entity.name }}</div>
         </template>
+        <template #menu="{ entity }">
+            <ZoneDescriptorMenuItems :zone="entity" />
+        </template>
         <template #body="{ entity: zone }">
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index b277ceabb..575b12f7a 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -22,6 +22,7 @@ list:
     agency: Agencia
     close: Cierre
     price: Precio
+    priceOptimum: Precio óptimo
     create: Crear zona
     openSummary: Detalles
     searchZone: Buscar zonas
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index 8b0a70896..4dfde08da 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -1,19 +1,12 @@
 import { RouterView } from 'vue-router';
 
-export default {
-    name: 'Claim',
-    path: '/claim',
+const claimCard = {
+    name: 'ClaimCard',
+    path: ':id',
+    component: () => import('src/pages/Claim/Card/ClaimCard.vue'),
+    redirect: { name: 'ClaimSummary' },
     meta: {
-        title: 'claims',
-        icon: 'vn:claims',
-        moduleName: 'Claim',
-        keyBinding: 'r',
-    },
-    component: RouterView,
-    redirect: { name: 'ClaimMain' },
-    menus: {
-        main: ['ClaimList'],
-        card: [
+        menu: [
             'ClaimBasicData',
             'ClaimLines',
             'ClaimPhotos',
@@ -23,109 +16,125 @@ export default {
             'ClaimLog',
         ],
     },
+    children: [
+        {            
+            path: 'summary',
+            name: 'ClaimSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'ClaimBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+                acls: [{ model: 'Claim', props: 'findById', accessType: 'READ' }],
+            },
+            component: () => import('src/pages/Claim/Card/ClaimBasicData.vue'),
+        },
+        {
+            path: 'lines',
+            name: 'ClaimLines',
+            meta: {
+                title: 'lines',
+                icon: 'vn:details',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimLines.vue'),
+        },
+        {
+            path: 'photos',
+            name: 'ClaimPhotos',
+            meta: {
+                title: 'photos',
+                icon: 'image',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimPhoto.vue'),
+        },
+        {
+            path: 'notes',
+            name: 'ClaimNotes',
+            meta: {
+                title: 'notes',
+                icon: 'draft',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimNotes.vue'),
+        },
+        {
+            path: 'development',
+            name: 'ClaimDevelopment',
+            meta: {
+                title: 'development',
+                icon: 'vn:traceability',
+                acls: [
+                    {
+                        model: 'ClaimDevelopment',
+                        props: '*',
+                        accessType: 'WRITE',
+                    },
+                ],
+            },
+            component: () => import('src/pages/Claim/Card/ClaimDevelopment.vue'),
+        },
+        {
+            path: 'action',
+            name: 'ClaimAction',
+            meta: {
+                title: 'action',
+                icon: 'vn:actions',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimAction.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ClaimLog',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimLog.vue'),
+        },
+    ],
+}
+
+export default {
+    name: 'Claim',
+    path: '/claim',
+    meta: {
+        title: 'claims',
+        icon: 'vn:claims',
+        moduleName: 'Claim',
+        keyBinding: 'r',
+        menu: ['ClaimList'],
+    },
+    component: RouterView,
+    redirect: { name: 'ClaimMain' },
     children: [
         {
             name: 'ClaimMain',
             path: '',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ClaimList' },
+            redirect: { name: 'ClaimIndexMain' },
             children: [
                 {
-                    name: 'ClaimList',
-                    path: 'list',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
+                    path: '',
+                    name: 'ClaimIndexMain',
+                    redirect: { name: 'ClaimList' },
                     component: () => import('src/pages/Claim/ClaimList.vue'),
-                },
-            ],
-        },
-        {
-            name: 'ClaimCard',
-            path: ':id',
-            component: () => import('src/pages/Claim/Card/ClaimCard.vue'),
-            redirect: { name: 'ClaimSummary' },
-            children: [
-                {
-                    name: 'ClaimSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimSummary.vue'),
-                },
-                {
-                    name: 'ClaimBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                        acls: [{ model: 'Claim', props: 'findById', accessType: 'READ' }],
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimBasicData.vue'),
-                },
-                {
-                    name: 'ClaimLines',
-                    path: 'lines',
-                    meta: {
-                        title: 'lines',
-                        icon: 'vn:details',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimLines.vue'),
-                },
-                {
-                    name: 'ClaimPhotos',
-                    path: 'photos',
-                    meta: {
-                        title: 'photos',
-                        icon: 'image',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimPhoto.vue'),
-                },
-                {
-                    name: 'ClaimNotes',
-                    path: 'notes',
-                    meta: {
-                        title: 'notes',
-                        icon: 'draft',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimNotes.vue'),
-                },
-                {
-                    name: 'ClaimDevelopment',
-                    path: 'development',
-                    meta: {
-                        title: 'development',
-                        icon: 'vn:traceability',
-                        acls: [
-                            {
-                                model: 'ClaimDevelopment',
-                                props: '*',
-                                accessType: 'WRITE',
+                    children: [
+                        {
+                            name: 'ClaimList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
                             },
-                        ],
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimDevelopment.vue'),
-                },
-                {
-                    name: 'ClaimAction',
-                    path: 'action',
-                    meta: {
-                        title: 'action',
-                        icon: 'vn:actions',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimAction.vue'),
-                },
-                {
-                    name: 'ClaimLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimLog.vue'),
+                        },
+                        claimCard,
+                    ],
                 },
             ],
         },
diff --git a/src/router/modules/department.js b/src/router/modules/department.js
deleted file mode 100644
index 9aab40534..000000000
--- a/src/router/modules/department.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import { RouterView } from 'vue-router';
-
-export default {
-    path: '/department',
-    name: 'Department',
-    meta: {
-        title: 'department',
-        icon: 'vn:greuge',
-        moduleName: 'Department',
-    },
-    component: RouterView,
-    redirect: { name: 'WorkerDepartment' },
-    menus: {
-        main: [],
-        card: ['DepartmentBasicData'],
-    },
-    children: [
-        {
-            name: 'DepartmentCard',
-            path: 'department/:id',
-            component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
-            redirect: { name: 'DepartmentSummary' },
-            children: [
-                {
-                    name: 'DepartmentSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () =>
-                        import('src/pages/Department/Card/DepartmentSummary.vue'),
-                },
-                {
-                    name: 'DepartmentBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/Department/Card/DepartmentBasicData.vue'),
-                },
-            ],
-        },
-    ],
-};
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 26ce773c5..f362c7653 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -1,50 +1,123 @@
 import { RouterView } from 'vue-router';
 
+const entryCard = {
+    name: 'EntryCard',
+    path: ':id',
+    component: () => import('src/pages/Entry/Card/EntryCard.vue'),
+    redirect: { name: 'EntrySummary' },
+    meta: {
+        menu: [
+            'EntryBasicData',
+            'EntryBuys',
+            'EntryNotes',
+            'EntryDms',
+            'EntryLog',
+        ],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'EntrySummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'EntryBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Entry/Card/EntryBasicData.vue'),
+        },
+        {
+            path: 'buys',
+            name: 'EntryBuys',
+            meta: {
+                title: 'buys',
+                icon: 'vn:lines',
+            },
+            component: () => import('src/pages/Entry/Card/EntryBuys.vue'),
+        },
+        {
+            path: 'buys/import',
+            name: 'EntryBuysImport',
+            component: () => import('src/pages/Entry/Card/EntryBuysImport.vue'),
+        },
+        {
+            path: 'notes',
+            name: 'EntryNotes',
+            meta: {
+                title: 'notes',
+                icon: 'vn:notes',
+            },
+            component: () => import('src/pages/Entry/Card/EntryNotes.vue'),
+        },
+        {
+            path: 'dms',
+            name: 'EntryDms',
+            meta: {
+                title: 'dms',
+                icon: 'smb_share',
+            },
+            component: () => import('src/pages/Entry/Card/EntryDms.vue'),
+        },
+        {
+            path: 'log',
+            name: 'EntryLog',
+            meta: {
+                title: 'log',
+                icon: 'vn:History',
+            },
+            component: () => import('src/pages/Entry/Card/EntryLog.vue'),
+        },
+    ],
+};
+
 export default {
-    path: '/entry',
     name: 'Entry',
+    path: '/entry',
     meta: {
         title: 'entries',
         icon: 'vn:entry',
         moduleName: 'Entry',
         keyBinding: 'e',
-    },
-    component: RouterView,
-    redirect: { name: 'EntryMain' },
-    menus: {
-        main: [
+        menu: [
             'EntryList',
             'MyEntries',
             'EntryLatestBuys',
             'EntryStockBought',
             'EntryWasteRecalc',
-        ],
-        card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
+        ]
     },
+    component: RouterView,
+    redirect: { name: 'EntryMain' },
     children: [
         {
-            path: '',
             name: 'EntryMain',
+            path: '',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'EntryList' },
+            redirect: { name: 'EntryIndexMain' },
             children: [
                 {
-                    path: 'list',
-                    name: 'EntryList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
+                    path:'',
+                    name: 'EntryIndexMain',
+                    redirect: { name: 'EntryList' },
                     component: () => import('src/pages/Entry/EntryList.vue'),
-                },
-                {
-                    path: 'my',
-                    name: 'MyEntries',
-                    meta: {
-                        title: 'labeler',
-                        icon: 'sell',
-                    },
-                    component: () => import('src/pages/Entry/MyEntries.vue'),
+                    children: [
+                        {
+                            name: 'EntryList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        entryCard,
+                    ],
                 },
                 {
                     path: 'create',
@@ -54,6 +127,15 @@ export default {
                         icon: 'add',
                     },
                     component: () => import('src/pages/Entry/EntryCreate.vue'),
+                },                
+                {
+                    path: 'my',
+                    name: 'MyEntries',
+                    meta: {
+                        title: 'labeler',
+                        icon: 'sell',
+                    },
+                    component: () => import('src/pages/Entry/MyEntries.vue'),
                 },
                 {
                     path: 'latest-buys',
@@ -84,72 +166,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'EntryCard',
-            path: ':id',
-            component: () => import('src/pages/Entry/Card/EntryCard.vue'),
-            redirect: { name: 'EntrySummary' },
-            children: [
-                {
-                    name: 'EntrySummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
-                },
-                {
-                    path: 'basic-data',
-                    name: 'EntryBasicData',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntryBasicData.vue'),
-                },
-                {
-                    path: 'buys',
-                    name: 'EntryBuys',
-                    meta: {
-                        title: 'buys',
-                        icon: 'vn:lines',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntryBuys.vue'),
-                },
-                {
-                    path: 'buys/import',
-                    name: 'EntryBuysImport',
-                    component: () => import('src/pages/Entry/Card/EntryBuysImport.vue'),
-                },
-                {
-                    path: 'notes',
-                    name: 'EntryNotes',
-                    meta: {
-                        title: 'notes',
-                        icon: 'vn:notes',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntryNotes.vue'),
-                },
-                {
-                    path: 'dms',
-                    name: 'EntryDms',
-                    meta: {
-                        title: 'dms',
-                        icon: 'smb_share',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntryDms.vue'),
-                },
-                {
-                    path: 'log',
-                    name: 'EntryLog',
-                    meta: {
-                        title: 'log',
-                        icon: 'vn:History',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntryLog.vue'),
-                },
-            ],
-        },
     ],
-};
+};
\ No newline at end of file
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index f28fed1c2..a22d5399c 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -11,7 +11,6 @@ import Route from './route';
 import Supplier from './supplier';
 import Travel from './travel';
 import Order from './order';
-import Department from './department';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
@@ -35,7 +34,6 @@ export default [
     Travel,
     Order,
     invoiceIn,
-    Department,
     Entry,
     roadmap,
     Parking,
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 77af812cf..bdd080e7f 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -1,35 +1,102 @@
 import { RouterView } from 'vue-router';
 
+const orderCard = {
+    name: 'OrderCard',
+    path: ':id',
+    component: () => import('src/pages/Order/Card/OrderCard.vue'),
+    redirect: { name: 'OrderSummary' },
+    meta: {
+        menu: [
+            'OrderBasicData',
+            'OrderCatalog',
+            'OrderVolume',
+            'OrderLines',
+        ],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'OrderSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Order/Card/OrderSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'OrderBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Order/Card/OrderBasicData.vue'),
+        },
+        {
+            path: 'catalog',
+            name: 'OrderCatalog',
+            meta: {
+                title: 'catalog',
+                icon: 'vn:basket',
+            },
+            component: () => import('src/pages/Order/Card/OrderCatalog.vue'),
+        },
+        {
+            path: 'volume',
+            name: 'OrderVolume',
+            meta: {
+                title: 'volume',
+                icon: 'vn:volume',
+            },
+            component: () => import('src/pages/Order/Card/OrderVolume.vue'),
+        },
+        {
+            path: 'line',
+            name: 'OrderLines',
+            meta: {
+                title: 'lines',
+                icon: 'vn:lines',
+            },
+            component: () => import('src/pages/Order/Card/OrderLines.vue'),
+        },
+    ],
+};
+
 export default {
-    path: '/order',
     name: 'Order',
+    path: '/order',
     meta: {
         title: 'order',
         icon: 'vn:basket',
         moduleName: 'Order',
         keyBinding: 'o',
+        menu: ['OrderList'],
     },
     component: RouterView,
     redirect: { name: 'OrderMain' },
-    menus: {
-        main: ['OrderList'],
-        card: ['OrderBasicData', 'OrderCatalog', 'OrderVolume', 'OrderLines'],
-    },
     children: [
         {
-            path: '',
             name: 'OrderMain',
+            path: '',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'OrderList' },
+            redirect: { name: 'OrderIndexMain' },
             children: [
                 {
-                    path: 'list',
-                    name: 'OrderList',
-                    meta: {
-                        title: 'orderList',
-                        icon: 'view_list',
-                    },
+                    path: '',
+                    name: 'OrderIndexMain',            
+                    redirect: { name: 'OrderList' },
                     component: () => import('src/pages/Order/OrderList.vue'),
+                    children: [
+                        {
+                            name: 'OrderList',
+                            path: 'list',
+                            meta: {
+                                title: 'orderList',
+                                icon: 'view_list',
+                            },
+                        },
+                        orderCard,
+                    ],
                 },
                 {
                     path: 'create',
@@ -42,58 +109,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'OrderCard',
-            path: ':id',
-            component: () => import('src/pages/Order/Card/OrderCard.vue'),
-            redirect: { name: 'OrderSummary' },
-            children: [
-                {
-                    name: 'OrderSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Order/Card/OrderSummary.vue'),
-                },
-                {
-                    name: 'OrderBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('src/pages/Order/Card/OrderBasicData.vue'),
-                },
-                {
-                    name: 'OrderCatalog',
-                    path: 'catalog',
-                    meta: {
-                        title: 'catalog',
-                        icon: 'vn:basket',
-                    },
-                    component: () => import('src/pages/Order/Card/OrderCatalog.vue'),
-                },
-                {
-                    name: 'OrderVolume',
-                    path: 'volume',
-                    meta: {
-                        title: 'volume',
-                        icon: 'vn:volume',
-                    },
-                    component: () => import('src/pages/Order/Card/OrderVolume.vue'),
-                },
-                {
-                    name: 'OrderLines',
-                    path: 'line',
-                    meta: {
-                        title: 'lines',
-                        icon: 'vn:lines',
-                    },
-                    component: () => import('src/pages/Order/Card/OrderLines.vue'),
-                },
-            ],
-        },
     ],
-};
+};
\ No newline at end of file
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index c732664ec..e9fb0c4f1 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -1,19 +1,12 @@
 import { RouterView } from 'vue-router';
 
-export default {
-    path: '/worker',
-    name: 'Worker',
+const workerCard = {
+    name: 'WorkerCard',
+    path: ':id',
+    component: () => import('src/pages/Worker/Card/WorkerCard.vue'),
+    redirect: { name: 'WorkerSummary' },
     meta: {
-        title: 'workers',
-        icon: 'vn:worker',
-        moduleName: 'Worker',
-        keyBinding: 'w',
-    },
-    component: RouterView,
-    redirect: { name: 'WorkerMain' },
-    menus: {
-        main: ['WorkerList', 'WorkerDepartment'],
-        card: [
+        menu: [
             'WorkerBasicData',
             'WorkerNotes',
             'WorkerPda',
@@ -33,207 +26,247 @@ export default {
     },
     children: [
         {
-            path: '',
-            name: 'WorkerMain',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'WorkerList' },
+            name: 'WorkerSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'WorkerBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+                acls: [
+                    {
+                        model: 'Worker',
+                        props: 'updateAttributes',
+                        accessType: 'WRITE',
+                    },
+                ],
+            },
+            component: () => import('src/pages/Worker/Card/WorkerBasicData.vue'),
+        },
+        {
+            path: 'notes',
+            name: 'NotesCard',
+            redirect: { name: 'WorkerNotes' },
             children: [
                 {
-                    path: 'list',
-                    name: 'WorkerList',
+                    path: '',
+                    name: 'WorkerNotes',
                     meta: {
-                        title: 'list',
-                        icon: 'view_list',
+                        title: 'notes',
+                        icon: 'vn:notes',
                     },
-                    component: () => import('src/pages/Worker/WorkerList.vue'),
-                },
-                {
-                    path: 'department',
-                    name: 'WorkerDepartment',
-                    meta: {
-                        title: 'department',
-                        icon: 'vn:greuge',
-                    },
-                    component: () => import('src/pages/Worker/WorkerDepartment.vue'),
-                },
-                {
-                    path: 'create',
-                    name: 'WorkerCreate',
-                    meta: {
-                        title: 'workerCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Worker/WorkerCreate.vue'),
+                    component: () => import('src/pages/Worker/Card/WorkerNotes.vue'),
                 },
             ],
         },
         {
-            name: 'WorkerCard',
-            path: ':id',
-            component: () => import('src/pages/Worker/Card/WorkerCard.vue'),
-            redirect: { name: 'WorkerSummary' },
+            name: 'WorkerTimeControl',
+            path: 'time-control',
+            meta: {
+                title: 'timeControl',
+                icon: 'access_time',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerTimeControl.vue'),
+        },
+        {
+            name: 'WorkerCalendar',
+            path: 'calendar',
+            meta: {
+                title: 'calendar',
+                icon: 'calendar_today',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerCalendar.vue'),
+        },
+        {
+            name: 'WorkerPda',
+            path: 'pda',
+            meta: {
+                title: 'pda',
+                icon: 'phone_android',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerPda.vue'),
+        },
+        {
+            name: 'WorkerNotificationsManager',
+            path: 'notifications',
+            meta: {
+                title: 'notifications',
+                icon: 'notifications',
+            },
+            component: () =>
+                import('src/pages/Worker/Card/WorkerNotificationsManager.vue'),
+        },
+        {
+            path: 'pbx',
+            name: 'WorkerPBX',
+            meta: {
+                title: 'pbx',
+                icon: 'vn:pbx',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerPBX.vue'),
+        },
+        {
+            name: 'WorkerDms',
+            path: 'dms',
+            meta: {
+                title: 'dms',
+                icon: 'cloud_upload',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerDms.vue'),
+        },
+        {
+            name: 'WorkerLog',
+            path: 'log',
+            meta: {
+                title: 'log',
+                icon: 'vn:History',
+                acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
+            },
+            component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
+        },
+        {
+            name: 'WorkerLocker',
+            path: 'locker',
+            meta: {
+                title: 'locker',
+                icon: 'lock',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerLocker.vue'),
+        },
+        {
+            name: 'WorkerBalance',
+            path: 'balance',
+            meta: {
+                title: 'balance',
+                icon: 'balance',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerBalance.vue'),
+        },
+        {
+            name: 'WorkerFormation',
+            path: 'formation',
+            meta: {
+                title: 'formation',
+                icon: 'clinical_notes',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerFormation.vue'),
+        },
+        {
+            name: 'WorkerMedical',
+            path: 'medical',
+            meta: {
+                title: 'medical',
+                icon: 'medical_information',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerMedical.vue'),
+        },
+        {
+            name: 'WorkerPit',
+            path: 'pit',
+            meta: {
+                title: 'pit',
+                icon: 'lock',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerPit.vue'),
+        },
+        {
+            name: 'WorkerOperator',
+            path: 'operator',
+            meta: {
+                title: 'operator',
+                icon: 'person',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerOperator.vue'),
+        },
+    ],
+};
+
+const departmentCard = {
+    name: 'DepartmentCard',
+    path: ':id',
+    component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
+    redirect: { name: 'DepartmentSummary' },
+    meta: {
+        menu: ['DepartmentBasicData'],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'DepartmentSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Department/Card/DepartmentSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'DepartmentBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Department/Card/DepartmentBasicData.vue'),
+        },
+    ],
+};
+
+export default {
+    name: 'Worker',
+    path: '/worker',
+    meta: {
+        title: 'workers',
+        icon: 'vn:worker',
+        moduleName: 'Worker',
+        keyBinding: 'w',
+        menu: ['WorkerList', 'WorkerDepartment'],
+    },
+    component: RouterView,
+    redirect: { name: 'WorkerMain' },
+    children: [
+        {
+            path: '',
+            name: 'WorkerMain',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'WorkerIndexMain' },
             children: [
                 {
-                    name: 'WorkerSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerSummary.vue'),
-                },
-                {
-                    path: 'basic-data',
-                    name: 'WorkerBasicData',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                        acls: [
-                            {
-                                model: 'Worker',
-                                props: 'updateAttributes',
-                                accessType: 'WRITE',
-                            },
-                        ],
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerBasicData.vue'),
-                },
-                {
-                    path: 'notes',
-                    name: 'NotesCard',
-                    redirect: { name: 'WorkerNotes' },
+                    path: '',
+                    name: 'WorkerIndexMain',
+                    redirect: { name: 'WorkerList' },
+                    component: () => import('src/pages/Worker/WorkerList.vue'),
                     children: [
                         {
-                            path: '',
-                            name: 'WorkerNotes',
+                            name: 'WorkerList',
+                            path: 'list',
                             meta: {
-                                title: 'notes',
-                                icon: 'vn:notes',
+                                title: 'list',
+                                icon: 'view_list',
                             },
-                            component: () =>
-                                import('src/pages/Worker/Card/WorkerNotes.vue'),
                         },
+                        workerCard,
                     ],
                 },
                 {
-                    name: 'WorkerTimeControl',
-                    path: 'time-control',
-                    meta: {
-                        title: 'timeControl',
-                        icon: 'access_time',
-                    },
-                    component: () =>
-                        import('src/pages/Worker/Card/WorkerTimeControl.vue'),
-                },
-                {
-                    name: 'WorkerCalendar',
-                    path: 'calendar',
-                    meta: {
-                        title: 'calendar',
-                        icon: 'calendar_today',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerCalendar.vue'),
-                },
-                {
-                    name: 'WorkerPda',
-                    path: 'pda',
-                    meta: {
-                        title: 'pda',
-                        icon: 'phone_android',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerPda.vue'),
-                },
-                {
-                    name: 'WorkerNotificationsManager',
-                    path: 'notifications',
-                    meta: {
-                        title: 'notifications',
-                        icon: 'notifications',
-                    },
-                    component: () =>
-                        import('src/pages/Worker/Card/WorkerNotificationsManager.vue'),
-                },
-                {
-                    path: 'pbx',
-                    name: 'WorkerPBX',
-                    meta: {
-                        title: 'pbx',
-                        icon: 'vn:pbx',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerPBX.vue'),
-                },
-                {
-                    name: 'WorkerDms',
-                    path: 'dms',
-                    meta: {
-                        title: 'dms',
-                        icon: 'cloud_upload',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerDms.vue'),
-                },
-                {
-                    name: 'WorkerLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'vn:History',
-                        acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
-                },
-                {
-                    name: 'WorkerLocker',
-                    path: 'locker',
-                    meta: {
-                        title: 'locker',
-                        icon: 'lock',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerLocker.vue'),
-                },
-                {
-                    name: 'WorkerBalance',
-                    path: 'balance',
-                    meta: {
-                        title: 'balance',
-                        icon: 'balance',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerBalance.vue'),
-                },
-                {
-                    name: 'WorkerFormation',
-                    path: 'formation',
-                    meta: {
-                        title: 'formation',
-                        icon: 'clinical_notes',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerFormation.vue'),
-                },
-                {
-                    name: 'WorkerMedical',
-                    path: 'medical',
-                    meta: {
-                        title: 'medical',
-                        icon: 'medical_information',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerMedical.vue'),
-                },
-                {
-                    name: 'WorkerPit',
-                    path: 'pit',
-                    meta: {
-                        title: 'pit',
-                        icon: 'lock',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerPit.vue'),
-                },
-                {
-                    name: 'WorkerOperator',
-                    path: 'operator',
-                    meta: {
-                        title: 'operator',
-                        icon: 'person',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerOperator.vue'),
+                    path: 'department',
+                    name: 'Department',
+                    redirect: { name: 'WorkerDepartment' },
+                    component: () => import('src/pages/Worker/WorkerDepartment.vue'),
+                    children: [
+                        {
+                            name: 'WorkerDepartment',
+                            path: 'list',
+                            meta: { title: 'department', icon: 'vn:greuge' },
+                        },
+                        departmentCard,
+                    ],
                 },
             ],
         },
diff --git a/src/router/routes.js b/src/router/routes.js
index b9120f8c4..d84ba7e46 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -9,7 +9,6 @@ import invoiceIn from './modules/invoiceIn';
 import wagon from './modules/wagon';
 import supplier from './modules/supplier';
 import travel from './modules/travel';
-import department from './modules/department';
 import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
@@ -85,7 +84,6 @@ const routes = [
             route,
             supplier,
             travel,
-            department,
             roadmap,
             entry,
             parking,
diff --git a/test/cypress/.gitignore b/test/cypress/.gitignore
index 8d940320e..c9793a5f2 100644
--- a/test/cypress/.gitignore
+++ b/test/cypress/.gitignore
@@ -1,2 +1,3 @@
 reports/*
 screenshots/*
+downloads/*
\ No newline at end of file
diff --git a/test/cypress/integration/Order/orderCatalog.spec.js b/test/cypress/integration/Order/orderCatalog.spec.js
index 45eda6f1f..cffc47f91 100644
--- a/test/cypress/integration/Order/orderCatalog.spec.js
+++ b/test/cypress/integration/Order/orderCatalog.spec.js
@@ -11,21 +11,6 @@ describe('OrderCatalog', () => {
         cy.dataCy('catalogFilterCustomTag').contains(filterName);
     };
 
-    const checkFilterTag = (filterName = 'Plant') => {
-        cy.dataCy('vnFilterPanelChip').should('exist');
-        cy.dataCy('vnFilterPanelChip').contains(filterName);
-    };
-
-    const selectCategory = (categoryIndex = 1, categoryName = 'Plant') => {
-        cy.get(
-            `div.q-page-container div:nth-of-type(${categoryIndex}) > [data-cy='catalogFilterCategory']`
-        ).should('exist');
-        cy.get(
-            `div.q-page-container div:nth-of-type(${categoryIndex}) > [data-cy='catalogFilterCategory']`
-        ).click();
-        checkCustomFilterTag(categoryName);
-    };
-
     const searchByCustomTagInput = (option) => {
         cy.dataCy('catalogFilterValueInput').find('input').last().focus();
         cy.dataCy('catalogFilterValueInput').find('input').last().type(option);
@@ -33,31 +18,19 @@ describe('OrderCatalog', () => {
         checkCustomFilterTag(option);
     };
 
-    const selectTypeFilter = (option) => {
-        cy.selectOption(
-            'div.q-page-container div.list > div:nth-of-type(2) div:nth-of-type(3)',
-            option
-        );
-        checkFilterTag(option);
-    };
-
     it('Shows empty state', () => {
         cy.dataCy('orderCatalogPage').should('exist');
         cy.dataCy('orderCatalogPage').contains('No data to display');
     });
 
-    it('filter by category', () => {
-        selectCategory();
+    it('filter by category and type', () => {
+        cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
+        cy.selectOption('[data-cy="catalogFilterType"]', 'Anthurium');
         cy.dataCy('orderCatalogItem').should('exist');
     });
 
-    it('filters by type', () => {
-        selectCategory();
-        selectTypeFilter('Anthurium');
-    });
-
     it('filters by custom value select', () => {
-        selectCategory();
+        cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
         searchByCustomTagInput('Silver');
     });
 
@@ -67,10 +40,12 @@ describe('OrderCatalog', () => {
                 return false;
             }
         });
-        selectCategory();
-        cy.dataCy('catalogFilterValueDialogBtn').should('exist');
+        cy.get(
+            '[data-cy="vn-searchbar"] > .q-field > .q-field__inner > .q-field__control'
+        ).type('{enter}');
+        cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
         cy.dataCy('catalogFilterValueDialogBtn').last().click();
-        cy.dataCy('catalogFilterValueDialogTagSelect').should('exist');
+        cy.get('[data-cy="catalogFilterValueDialogTagSelect"]').click();
         cy.selectOption("[data-cy='catalogFilterValueDialogTagSelect']", 'Tallos');
         cy.dataCy('catalogFilterValueDialogValueInput').find('input').focus();
         cy.dataCy('catalogFilterValueDialogValueInput').find('input').type('2');
@@ -79,34 +54,16 @@ describe('OrderCatalog', () => {
     });
 
     it('removes a secondary tag', () => {
-        selectCategory();
-        selectTypeFilter('Anthurium');
+        cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
+        cy.selectOption('[data-cy="catalogFilterType"]', 'Anthurium');
         cy.dataCy('vnFilterPanelChip').should('exist');
-        cy.get(
-            "div.q-page-container [data-cy='vnFilterPanelChip'] > i.q-chip__icon--remove"
-        )
-            .contains('cancel')
-            .should('exist');
-        cy.get(
-            "div.q-page-container [data-cy='vnFilterPanelChip'] > i.q-chip__icon--remove"
-        )
-            .contains('cancel')
-            .click();
+        cy.get('[data-cy="catalogFilterCustomTag"] > .q-chip__icon--remove').click();
         cy.dataCy('vnFilterPanelChip').should('not.exist');
     });
 
     it('Removes category tag', () => {
-        selectCategory();
-        cy.get(
-            "div.q-page-container [data-cy='catalogFilterCustomTag'] > i.q-chip__icon--remove"
-        )
-            .contains('cancel')
-            .should('exist');
-        cy.get(
-            "div.q-page-container [data-cy='catalogFilterCustomTag'] > i.q-chip__icon--remove"
-        )
-            .contains('cancel')
-            .click();
+        cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
+        cy.get('.q-chip__icon--remove').click();
         cy.dataCy('catalogFilterCustomTag').should('not.exist');
     });
 });
diff --git a/test/cypress/integration/claim/claimPhoto.spec.js b/test/cypress/integration/claim/claimPhoto.spec.js
index 9b2978b19..0a7320060 100755
--- a/test/cypress/integration/claim/claimPhoto.spec.js
+++ b/test/cypress/integration/claim/claimPhoto.spec.js
@@ -1,5 +1,6 @@
 /// <reference types="cypress" />
-describe('ClaimPhoto', () => {
+// redmine.verdnatura.es/issues/8417
+describe.skip('ClaimPhoto', () => {
     beforeEach(() => {
         const claimId = 1;
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index dcded63b0..d5723375b 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -15,7 +15,7 @@ describe('Client list', () => {
         });
     });
 
-    it('Client list create new client', () => {
+    it.skip('Client list create new client', () => {
         cy.addBtnClick();
         const randomInt = Math.floor(Math.random() * 90) + 10;
 
diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index 4addec1c4..c25476419 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -8,8 +8,8 @@ describe('EntryMy when is supplier', () => {
             },
         });
     });
-
-    it('should open buyLabel when is supplier', () => {
+    // https://redmine.verdnatura.es/issues/8418
+    it.skip('should open buyLabel when is supplier', () => {
         cy.get(
             '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
         ).click();
diff --git a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
index a64f98c10..c2f111892 100644
--- a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
-
-describe('InvoiceInCorrective', () => {
-    const createRectificative = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
+// https://redmine.verdnatura.es/issues/8419
+describe.skip('InvoiceInCorrective', () => {
+    const createCorrective = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
     const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
     const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';
 
@@ -13,7 +13,7 @@ describe('InvoiceInCorrective', () => {
 
         cy.openActionsDescriptor();
 
-        cy.get(createRectificative).click();
+        cy.get(createCorrective).click();
         cy.get(saveDialog).click();
         cy.wait('@corrective').then((interception) => {
             const correctingId = interception.response.body;
diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index d9ab3f7e7..0eb495419 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -21,8 +21,8 @@ describe('InvoiceInList', () => {
                 cy.url().should('include', `/invoice-in/${id}/summary`);
             });
     });
-
-    it('should open the details', () => {
+    // https://redmine.verdnatura.es/issues/8420
+    it.skip('should open the details', () => {
         cy.get(firstDetailBtn).click();
         cy.get(summaryHeaders).eq(1).contains('Basic data');
         cy.get(summaryHeaders).eq(4).contains('Vat');
diff --git a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
new file mode 100644
index 000000000..30cc8e497
--- /dev/null
+++ b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
@@ -0,0 +1,46 @@
+/// <reference types="cypress" />
+describe('InvoiceOut list', () => {
+    const invoice = {
+        Ticket: { val: '8' },
+        Serial: { val: 'Española rapida', type: 'select' },
+    };
+    const invoiceError = {
+        Ticket: { val: '1' },
+        Serial: { val: 'Española rapida', type: 'select' },
+    };
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/invoice-out/list`);
+        cy.typeSearchbar('{enter}');
+    });
+
+    it('should search and filter an invoice and enter to the summary', () => {
+        cy.typeSearchbar('1{enter}');
+        cy.get('.q-virtual-scroll__content > :nth-child(2) > :nth-child(7)').click();
+        cy.get('.header > a.q-btn > .q-btn__content').click();
+        cy.typeSearchbar('{enter}');
+        cy.dataCy('InvoiceOutFilterAmountBtn').find('input').type('8.88{enter}');
+    });
+
+    it('should download all pdfs', () => {
+        cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+        cy.dataCy('InvoiceOutDownloadPdfBtn').click();
+        cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+    });
+
+    it('should give an error when manual invoicing a ticket that is already invoiced', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.fillInForm(invoiceError);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('This ticket is already invoiced');
+    });
+
+    it('should create a manual invoice and enter to its summary', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.fillInForm(invoice);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+    });
+});
diff --git a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
new file mode 100644
index 000000000..145f492a1
--- /dev/null
+++ b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
@@ -0,0 +1,21 @@
+/// <reference types="cypress" />
+describe('InvoiceOut manual invoice', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/ticket/list`);
+        cy.get('#searchbar input').type('{enter}');
+    });
+
+    it('should create an invoice from a ticket and go to that invoice', () => {
+        cy.searchByLabel('Customer ID', '1101');
+        cy.get(
+            '[data-q-vs-anchor=""] > :nth-child(1) > .q-checkbox > .q-checkbox__inner'
+        ).click();
+        cy.dataCy('ticketListMakeInvoiceBtn').click();
+        cy.checkNotification('Data saved');
+        cy.get('.q-virtual-scroll__content > :nth-child(1) > :nth-child(3)').click();
+        cy.get(':nth-child(8) > .value > .link').click();
+        cy.get('.header > :nth-child(3) > .q-btn__content').click();
+    });
+});
diff --git a/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js b/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
new file mode 100644
index 000000000..5f629df0b
--- /dev/null
+++ b/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
@@ -0,0 +1,16 @@
+/// <reference types="cypress" />
+describe('InvoiceOut negative bases', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/invoice-out/negative-bases`);
+    });
+
+    it('should filter and download as CSV', () => {
+        cy.get(
+            ':nth-child(7) > .full-width > :nth-child(1) > .column > div.q-px-xs > .q-field > .q-field__inner > .q-field__control'
+        ).type('23{enter}');
+        cy.get('#subToolbar > .q-btn').click();
+        cy.checkNotification('CSV downloaded successfully');
+    });
+});
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
new file mode 100644
index 000000000..44b0a9961
--- /dev/null
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -0,0 +1,44 @@
+/// <reference types="cypress" />
+describe('InvoiceOut summary', () => {
+    const transferInvoice = {
+        Client: { val: 'employee', type: 'select' },
+        Type: { val: 'Error in customer data', type: 'select' },
+    };
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/invoice-out/list`);
+    });
+
+    it('should generate the invoice PDF', () => {
+        cy.typeSearchbar('T1111111{enter}');
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(6)').click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.checkNotification('The invoice PDF document has been regenerated');
+    });
+    it('should refund the invoice ', () => {
+        cy.typeSearchbar('T1111111{enter}');
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(7)').click();
+        cy.get('#q-portal--menu--3 > .q-menu > .q-list > :nth-child(2)').click();
+        cy.checkNotification('The following refund ticket have been created');
+    });
+
+    it('should delete an invoice ', () => {
+        cy.typeSearchbar('T2222222{enter}');
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(4)').click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.checkNotification('InvoiceOut deleted');
+    });
+    it('should transfer the invoice ', () => {
+        cy.typeSearchbar('T1111111{enter}');
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(1)').click();
+        cy.fillInForm(transferInvoice);
+        cy.get('.q-mt-lg > .q-btn').click();
+        cy.checkNotification('Transferred invoice');
+    });
+});
diff --git a/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js b/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
new file mode 100644
index 000000000..06e132b39
--- /dev/null
+++ b/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
@@ -0,0 +1,28 @@
+/// <reference types="cypress" />
+describe('InvoiceOut global invoicing', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('administrative');
+        cy.visit(`/#/invoice-out/global-invoicing`);
+    });
+
+    it('should invoice the client tickets', () => {
+        cy.get('.q-mb-sm > .q-radio__inner').click();
+        cy.dataCy('InvoiceOutGlobalClientSelect').type('1102');
+        cy.get('.q-menu .q-item').contains('1102').click();
+        cy.dataCy('InvoiceOutGlobalSerialSelect').click();
+        cy.get('.q-menu .q-item').contains('global').click();
+        cy.dataCy('InvoiceOutGlobalCompanySelect').type('VNL');
+        cy.get('.q-menu .q-item').contains('VNL').click();
+        cy.dataCy('InvoiceOutGlobalPrinterSelect').type('printer1');
+        cy.get('.q-menu .q-item').contains('printer1').click();
+        cy.get(
+            '[label="Invoice date"] > .q-field > .q-field__inner > .q-field__control'
+        ).click();
+        cy.get(':nth-child(5) > div > .q-btn > .q-btn__content > .block').click();
+        cy.get('.q-date__years-content > :nth-child(2) > .q-btn').click();
+        cy.get('.q-date__calendar-days > :nth-child(6) > .q-btn').click();
+        cy.get('[label="Max date ticket"]').type('01-01-2001{enter}');
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/item/ItemFixedPrice.spec.js b/test/cypress/integration/item/ItemFixedPrice.spec.js
index 92dc27fda..edb6a63fe 100644
--- a/test/cypress/integration/item/ItemFixedPrice.spec.js
+++ b/test/cypress/integration/item/ItemFixedPrice.spec.js
@@ -14,7 +14,7 @@ describe('Handle Items FixedPrice', () => {
             '.q-header > .q-toolbar > :nth-child(1) > .q-btn__content > .q-icon'
         ).click();
     });
-    it('filter', function () {
+    it.skip('filter', function () {
         cy.get('.category-filter > :nth-child(1) > .q-btn__content > .q-icon').click();
         cy.selectOption('.list > :nth-child(2)', 'Alstroemeria');
         cy.get('.q-gutter-x-sm > .q-btn > .q-btn__content > .q-icon').click();
@@ -27,7 +27,7 @@ describe('Handle Items FixedPrice', () => {
         cy.get('.q-notification__message').should('have.text', 'Data saved');
         /* ==== End Cypress Studio ==== */
     });
-    it('Create and delete ', function () {
+    it.skip('Create and delete ', function () {
         cy.get('.q-gutter-x-sm > .q-btn > .q-btn__content > .q-icon').click();
         cy.addBtnClick();
         cy.selectOption(`${firstRow} > :nth-child(2)`, '#11');
@@ -43,7 +43,7 @@ describe('Handle Items FixedPrice', () => {
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
 
-    it('Massive edit', function () {
+    it.skip('Massive edit', function () {
         cy.get(' .bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner ').click();
         cy.get('#subToolbar > .q-btn--standard').click();
         cy.selectOption("[data-cy='field-to-edit']", 'Min price');
@@ -52,7 +52,7 @@ describe('Handle Items FixedPrice', () => {
         cy.get('.q-mt-lg > .q-btn--standard').click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
-    it('Massive remove', function () {
+    it.skip('Massive remove', function () {
         cy.get(' .bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner ').click();
         cy.get('#subToolbar > .q-btn--flat').click();
         cy.get(
diff --git a/test/cypress/integration/item/itemBarcodes.spec.js b/test/cypress/integration/item/itemBarcodes.spec.js
new file mode 100644
index 000000000..4d17fa260
--- /dev/null
+++ b/test/cypress/integration/item/itemBarcodes.spec.js
@@ -0,0 +1,25 @@
+/// <reference types="cypress" />
+describe('Item shelving', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/list`);
+        cy.typeSearchbar('1{enter}');
+    });
+
+    it('should throw an error if the barcode exists', () => {
+        cy.get('[href="#/item/1/barcode"]').click();
+        cy.get('.q-card > .q-btn > .q-btn__content > .q-icon').click();
+        cy.dataCy('Code_input').eq(3).type('1111111111');
+        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification('Codes can not be repeated');
+    });
+
+    it('should create a new barcode', () => {
+        cy.get('[href="#/item/1/barcode"]').click();
+        cy.get('.q-card > .q-btn > .q-btn__content > .q-icon').click();
+        cy.dataCy('Code_input').eq(3).type('1231231231');
+        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification('Data saved');
+    });
+});
diff --git a/test/cypress/integration/item/itemBotanical.spec.js b/test/cypress/integration/item/itemBotanical.spec.js
new file mode 100644
index 000000000..08886d9a8
--- /dev/null
+++ b/test/cypress/integration/item/itemBotanical.spec.js
@@ -0,0 +1,31 @@
+/// <reference types="cypress" />
+describe('Item botanical', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/1/botanical`);
+    });
+
+    it('should modify the botanical', () => {
+        cy.dataCy('AddGenusSelectDialog').type('Abies');
+        cy.get('.q-menu .q-item').contains('Abies').click();
+        cy.dataCy('AddSpeciesSelectDialog').type('dealbata');
+        cy.get('.q-menu .q-item').contains('dealbata').click();
+        cy.get('.q-btn-group > .q-btn--standard').click();
+        cy.checkNotification('Data saved');
+    });
+
+    it('should create a new Genus', () => {
+        cy.dataCy('Genus_icon').click();
+        cy.dataCy('Latin genus name_input').type('Test');
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+    });
+
+    it('should create a new specie', () => {
+        cy.dataCy('Species_icon').click();
+        cy.dataCy('Latin species name_input').type('Test specie');
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+    });
+});
diff --git a/test/cypress/integration/item/itemList.spec.js b/test/cypress/integration/item/itemList.spec.js
new file mode 100644
index 000000000..97e85a212
--- /dev/null
+++ b/test/cypress/integration/item/itemList.spec.js
@@ -0,0 +1,34 @@
+/// <reference types="cypress" />
+
+describe('Item list', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/list`);
+        cy.typeSearchbar('{enter}');
+    });
+
+    it('should filter the items and redirect to the summary', () => {
+        cy.dataCy('Category_select').type('Plant');
+        cy.get('.q-menu .q-item').contains('Plant').click();
+        cy.dataCy('Type_select').type('Anthurium');
+        cy.get('.q-menu .q-item').contains('Anthurium').click();
+        cy.get('.q-virtual-scroll__content > :nth-child(4) > :nth-child(4)').click();
+    });
+    // https://redmine.verdnatura.es/issues/8421
+    it.skip('should create an item', () => {
+        const data = {
+            Description: { val: `Test item` },
+            Type: { val: `Crisantemo`, type: 'select' },
+            Intrastat: { val: `Coral y materiales similares`, type: 'select' },
+            Origin: { val: `SPA`, type: 'select' },
+        };
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.fillInForm(data);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+        cy.get(
+            ':nth-child(2) > .q-drawer > .q-drawer__content > .q-scrollarea > .q-scrollarea__container > .q-scrollarea__content'
+        ).should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/item/itemSummary.spec.js b/test/cypress/integration/item/itemSummary.spec.js
new file mode 100644
index 000000000..ad8267ecf
--- /dev/null
+++ b/test/cypress/integration/item/itemSummary.spec.js
@@ -0,0 +1,24 @@
+/// <reference types="cypress" />
+describe('Item summary', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/1/summary`);
+    });
+
+    it('should clone the item', () => {
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(2) > .q-item__section').click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.waitForElement('[data-cy="itemTags"]');
+        cy.dataCy('itemTags').should('be.visible');
+    });
+
+    it('should regularize stock', () => {
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(1) > .q-item__section').click();
+        cy.dataCy('regularizeStockInput').type('10');
+        cy.dataCy('Warehouse_select').type('Warehouse One{enter}');
+        cy.checkNotification('Data created');
+    });
+});
diff --git a/test/cypress/integration/item/itemTag.spec.js b/test/cypress/integration/item/itemTag.spec.js
new file mode 100644
index 000000000..28e0a747f
--- /dev/null
+++ b/test/cypress/integration/item/itemTag.spec.js
@@ -0,0 +1,39 @@
+/// <reference types="cypress" />
+describe('Item tag', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/1/tags`);
+    });
+
+    it('should throw an error adding an existent tag', () => {
+        cy.get('.q-page').should('be.visible');
+        cy.get('.q-page-sticky > div').click();
+        cy.get('.q-page-sticky > div').click();
+        cy.dataCy('Tag_select').eq(7).type('Tallos');
+        cy.get('.q-menu .q-item').contains('Tallos').click();
+        cy.get(
+            ':nth-child(8) > [label="Value"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Value_input"]'
+        ).type('1');
+        +cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification("The tag or priority can't be repeated for an item");
+    });
+    // https://redmine.verdnatura.es/issues/8422
+    it.skip('should add a new tag', () => {
+        cy.get('.q-page').should('be.visible');
+        cy.get('.q-page-sticky > div').click();
+        cy.get('.q-page-sticky > div').click();
+        cy.dataCy('Tag_select').eq(7).click();
+        cy.get('.q-menu .q-item').contains('Ancho de la base').click();
+        cy.get(
+            ':nth-child(8) > [label="Value"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Value_input"]'
+        ).type('50');
+        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification('Data saved');
+        cy.get(
+            '[data-cy="itemTags"] > :nth-child(7) > .justify-center > .q-icon'
+        ).click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.checkNotification('Data saved');
+    });
+});
diff --git a/test/cypress/integration/item/itemTax.spec.js b/test/cypress/integration/item/itemTax.spec.js
new file mode 100644
index 000000000..6ff147135
--- /dev/null
+++ b/test/cypress/integration/item/itemTax.spec.js
@@ -0,0 +1,14 @@
+/// <reference types="cypress" />
+describe('Item tax', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/1/tax`);
+    });
+
+    it('should modify the tax for Spain', () => {
+        cy.dataCy('Class_select').eq(1).type('General VAT{enter}');
+        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification('Data saved');
+    });
+});
diff --git a/test/cypress/integration/item/itemType.spec.js b/test/cypress/integration/item/itemType.spec.js
new file mode 100644
index 000000000..b0a7b0ca9
--- /dev/null
+++ b/test/cypress/integration/item/itemType.spec.js
@@ -0,0 +1,40 @@
+/// <reference types="cypress" />
+describe('Item type', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/item/item-type`);
+    });
+
+    it('should throw an error if the code already exists', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Code_input"]'
+        ).type('ALS');
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Name_input"]'
+        ).type('Alstroemeria');
+        cy.dataCy('Worker_select').type('employeeNick');
+        cy.get('.q-menu .q-item').contains('employeeNick').click();
+        cy.dataCy('ItemCategory_select').type('Artificial');
+        cy.get('.q-menu .q-item').contains('Artificial').click();
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('An item type with the same code already exists');
+    });
+
+    it('should create a new type', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Code_input"]'
+        ).type('LIL');
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Name_input"]'
+        ).type('Lilium');
+        cy.dataCy('Worker_select').type('buyerNick');
+        cy.get('.q-menu .q-item').contains('buyerNick').click();
+        cy.dataCy('ItemCategory_select').type('Flower');
+        cy.get('.q-menu .q-item').contains('Flower').click();
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+    });
+});
diff --git a/test/cypress/integration/outLogin/login.spec.js b/test/cypress/integration/outLogin/login.spec.js
index 3db223cdb..2bd5a8c3b 100755
--- a/test/cypress/integration/outLogin/login.spec.js
+++ b/test/cypress/integration/outLogin/login.spec.js
@@ -19,6 +19,7 @@ describe('Login', () => {
     it('should fail to log in using wrong password', () => {
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('wrongPassword');
+        cy.get('.q-field__append > .q-icon');
         cy.get('button[type="submit"]').click();
         cy.get('.q-notification__message').should(
             'have.text',
diff --git a/test/cypress/integration/ticket/ticketExpedition.spec.js b/test/cypress/integration/ticket/ticketExpedition.spec.js
index d74a122a1..d957f2136 100644
--- a/test/cypress/integration/ticket/ticketExpedition.spec.js
+++ b/test/cypress/integration/ticket/ticketExpedition.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-
-describe('Ticket expedtion', () => {
+// https://redmine.verdnatura.es/issues/8423
+describe.skip('Ticket expedtion', () => {
     const tableContent = '.q-table .q-virtual-scroll__content';
     const stateTd = 'td:nth-child(9)';
 
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index b30b4cdad..3337287c4 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -9,9 +9,9 @@ describe('TicketList', () => {
     });
 
     const searchResults = (search) => {
-        cy.dataCy('vnSearchBar').find('input').focus();
-        if (search) cy.dataCy('vnSearchBar').find('input').type(search);
-        cy.dataCy('vnSearchBar').find('input').type('{enter}');
+        cy.dataCy('vn-searchbar').find('input').focus();
+        if (search) cy.dataCy('vn-searchbar').find('input').type(search);
+        cy.dataCy('vn-searchbar').find('input').type('{enter}');
         cy.dataCy('ticketListTable').should('exist');
         cy.get(firstRow).should('exist');
     };
@@ -30,14 +30,14 @@ describe('TicketList', () => {
         cy.get(firstRow).find('.q-btn:first').click();
         cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
     });
-
-    it('should open ticket summary', () => {
+    // https://redmine.verdnatura.es/issues/8424
+    it.skip('should open ticket summary', () => {
         searchResults();
         cy.get(firstRow).find('.q-btn:last').click();
         cy.dataCy('ticketSummary').should('exist');
     });
 
-    it('Client list create new client', () => {
+    it.skip('Client list create new client', () => {
         cy.dataCy('vnTableCreateBtn').should('exist');
         cy.dataCy('vnTableCreateBtn').click();
         const data = {
diff --git a/test/cypress/integration/ticket/ticketRequest.spec.js b/test/cypress/integration/ticket/ticketRequest.spec.js
index b9dc509ef..5a0ae636f 100644
--- a/test/cypress/integration/ticket/ticketRequest.spec.js
+++ b/test/cypress/integration/ticket/ticketRequest.spec.js
@@ -6,7 +6,7 @@ describe('TicketRequest', () => {
         cy.visit('/#/ticket/31/request');
     });
 
-    it('Creates a new request', () => {
+    it.skip('Creates a new request', () => {
         cy.dataCy('vnTableCreateBtn').should('exist');
         cy.dataCy('vnTableCreateBtn').click();
         const data = {
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index 60f31dbf6..aed8dc85a 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -1,7 +1,5 @@
 /// <reference types="cypress" />
 
-const c = require('croppie');
-
 describe('TicketSale', () => {
     beforeEach(() => {
         cy.login('developer');
@@ -66,7 +64,7 @@ describe('TicketSale', () => {
         cy.dataCy('ticketSaleMoreActionsDropdown').click();
         cy.dataCy('createClaimItem').click();
         cy.dataCy('VnConfirm_confirm').click();
-        cy.url().should('match', /\/claim\/\d+\/basic-data/);
+        cy.url().should('contain', 'claim/');
         // Delete created claim to avoid cluttering the database
         cy.dataCy('descriptor-more-opts').click();
         cy.dataCy('deleteClaim').click();
@@ -106,22 +104,15 @@ describe('TicketSale', () => {
         cy.checkNotification('The following refund ticket have been created');
     });
 
-    it('transfers ticket', () => {
+    it('transfer sale to a new ticket', () => {
         cy.visit('/#/ticket/32/sale');
+        cy.get('.q-item > .q-item__label').should('have.text', ' #32');
         selectFirstRow();
         cy.dataCy('ticketSaleTransferBtn').click();
         cy.dataCy('ticketTransferPopup').should('exist');
         cy.dataCy('ticketTransferNewTicketBtn').click();
-        // existen 3 elementos "tbody" necesito checkear que el segundo elemento tbody tenga una row sola
-        cy.get('tbody').eq(1).find('tr').should('have.length', 1);
-        selectFirstRow();
-        cy.dataCy('ticketSaleTransferBtn').click();
-        cy.dataCy('ticketTransferPopup').should('exist');
-        cy.dataCy('ticketTransferDestinationTicketInput').find('input').focus();
-        cy.dataCy('ticketTransferDestinationTicketInput').find('input').type('32');
-        cy.dataCy('ticketTransferTransferBtn').click();
-        // checkear que la url contenga /ticket/1000002/sale
-        cy.url().should('match', /\/ticket\/32\/sale/);
+        //check the new ticket has been created succesfully
+        cy.get('.q-item > .q-item__label').should('not.have.text', ' #32');
     });
 
     it('should redirect to ticket logs', () => {
diff --git a/test/cypress/integration/vnComponent/VnLocation.spec.js b/test/cypress/integration/vnComponent/VnLocation.spec.js
index 82d12a1e4..751b3a065 100644
--- a/test/cypress/integration/vnComponent/VnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/VnLocation.spec.js
@@ -38,10 +38,7 @@ describe('VnLocation', () => {
             const province = 'Province five';
 
             cy.selectOption(countrySelector, country);
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
-                province
-            );
+            cy.dataCy('locationProvince').type(`${province}{enter}`);
             cy.get(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) `
             ).click();
@@ -52,7 +49,8 @@ describe('VnLocation', () => {
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
-            cy.visit('/#/worker/create', { timeout: 5000 });
+            cy.visit('/#/worker/list', { timeout: 5000 });
+            cy.dataCy('vnTableCreateBtn').click();
             cy.waitForElement('.q-card');
             cy.get(inputLocation).click();
         });
@@ -134,13 +132,9 @@ describe('VnLocation', () => {
         it('Create city with country', () => {
             const cityName = 'Saskatchew'.concat(Math.random(1 * 100));
             cy.get(createLocationButton).click();
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
-                'Italia'
-            );
+            cy.dataCy('locationCountry').type('Italia{enter}');
             cy.dataCy('City_icon').click();
             cy.selectOption('[data-cy="locationProvince"]:last', 'Province four');
-            cy.countSelectOptions('[data-cy="locationProvince"]:last', 1);
 
             cy.dataCy('cityName').type(cityName);
             cy.dataCy('FormModelPopup_save').eq(1).click();
diff --git a/test/cypress/integration/vnComponent/VnLog.spec.js b/test/cypress/integration/vnComponent/VnLog.spec.js
index 80b9d07df..10917859a 100644
--- a/test/cypress/integration/vnComponent/VnLog.spec.js
+++ b/test/cypress/integration/vnComponent/VnLog.spec.js
@@ -10,14 +10,14 @@ describe('VnLog', () => {
         cy.openRightMenu();
     });
 
-    it('should filter by insert actions', () => {
+    it.skip('should filter by insert actions', () => {
         cy.checkOption(':nth-child(7) > .q-checkbox');
         cy.get('.q-page').click();
         cy.validateContent(chips[0], 'Document');
         cy.validateContent(chips[1], 'Beginning');
     });
 
-    it('should filter by entity', () => {
+    it.skip('should filter by entity', () => {
         cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim');
         cy.get('.q-page').click();
         cy.validateContent(chips[0], 'Claim');
diff --git a/test/cypress/integration/vnComponent/VnSearchBar.spec.js b/test/cypress/integration/vnComponent/VnSearchBar.spec.js
index 885e5d6b3..c710d5192 100644
--- a/test/cypress/integration/vnComponent/VnSearchBar.spec.js
+++ b/test/cypress/integration/vnComponent/VnSearchBar.spec.js
@@ -16,17 +16,20 @@ describe('VnSearchBar', () => {
     });
 
     it('should stay on the list page if there are several results or none', () => {
-        cy.writeSearchbar('salesA{enter}');
+        cy.typeSearchbar('salesA{enter}');
+        cy.typeSearchbar('salesA{enter}');
         checkTableLength(2);
 
         cy.clearSearchbar();
-        cy.writeSearchbar('0{enter}');
+
+        cy.typeSearchbar('0{enter}');
         checkTableLength(0);
     });
 
     const searchAndCheck = (searchTerm, expectedText) => {
         cy.clearSearchbar();
-        cy.writeSearchbar(`${searchTerm}{enter}`);
+        cy.typeSearchbar(`${searchTerm}{enter}`);
+        cy.typeSearchbar(`${searchTerm}{enter}`);
         cy.get(idGap).should('have.text', expectedText);
     };
 
diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index cd248d1bb..501375d8c 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -2,41 +2,22 @@ describe('WagonCreate', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
-        cy.visit('/#/wagon/create');
+        cy.visit('/#/wagon');
     });
 
     it('should create and delete a new wagon', () => {
-        cy.waitForElement('.q-card');
-        cy.get('input').eq(0).type('1234');
-        cy.get('input').eq(1).type('1234ABCD');
-        cy.get('input').eq(2).type('100');
-        cy.get('input').eq(3).click();
-        cy.get('.q-select > .q-field__inner > .q-field__control').type(
-            '{downarrow}{enter}'
-        );
-
-        // Save
-        cy.get('button[type="submit"]').click();
-
-        // Check data has been saved successfully
-        cy.waitForElement('.q-card');
-
+        cy.dataCy('vnTableCreateBtn').click();
         cy.get(
-            '[to="/null/1"] > .q-card > .no-padding > .q-py-none > .cursor-text'
-        ).should('have.text', '1234');
+            '.grid-create > [label="Label"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Label_input"]'
+        ).type('1234');
         cy.get(
-            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(1) > .vn-label-value > .value > :nth-child(1) > .row > span'
-        ).should('have.text', '1234ABCD');
+            '.grid-create > [label="Plate"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Plate_input"]'
+        ).type('1234ABCD');
         cy.get(
-            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(2) > .vn-label-value > .value > :nth-child(1) > .row > span'
-        ).should('have.text', '100');
-        cy.get(
-            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(3) > .vn-label-value > .value > :nth-child(1) > .row > span'
-        ).should('have.text', 'Wagon Type #1');
-
-        // Delete wagon type created
-        cy.get(
-            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
-        ).click();
+            '.grid-create > [label="Volume"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Volume_input"]'
+        ).type('100');
+        cy.dataCy('Type_select').type('{downarrow}{enter}');
+        // // Delete wagon type created
+        cy.get('[to="/null/1"] > .q-card > .column > [title="Remove"]').click();
     });
 });
diff --git a/test/cypress/integration/worker/workerCreate.spec.js b/test/cypress/integration/worker/workerCreate.spec.js
index 50afe1892..7f2810395 100644
--- a/test/cypress/integration/worker/workerCreate.spec.js
+++ b/test/cypress/integration/worker/workerCreate.spec.js
@@ -1,6 +1,5 @@
 describe('WorkerCreate', () => {
     const externalRadio = '.q-radio:nth-child(2)';
-    const notification = '.q-notification__message';
     const developerBossId = 120;
     const payMethodCross =
         '.grid-create .full-width > :nth-child(9) .q-select .q-field__append:not(.q-anchor--skip)';
@@ -41,7 +40,7 @@ describe('WorkerCreate', () => {
         cy.fillInForm(internal);
         cy.get(payMethodCross).click();
         cy.get(saveBtn).click();
-        cy.get(notification).should('contains.text', 'Payment method is required');
+        cy.checkNotification('Payment method is required');
     });
 
     it('should create an internal', () => {
@@ -50,13 +49,13 @@ describe('WorkerCreate', () => {
             'Pay method': { val: 'PayMethod one', type: 'select' },
         });
         cy.get(saveBtn).click();
-        cy.get(notification).should('contains.text', 'Data created');
+        cy.checkNotification('Data created');
     });
 
     it('should create an external', () => {
         cy.get(externalRadio).click();
         cy.fillInForm(external);
         cy.get(saveBtn).click();
-        cy.get(notification).should('contains.text', 'Data created');
+        cy.checkNotification('Data created');
     });
 });
diff --git a/test/cypress/integration/worker/workerList.spec.js b/test/cypress/integration/worker/workerList.spec.js
index c1c37fd32..0a45441c1 100644
--- a/test/cypress/integration/worker/workerList.spec.js
+++ b/test/cypress/integration/worker/workerList.spec.js
@@ -10,8 +10,8 @@ describe('WorkerList', () => {
 
     it('should open the worker summary', () => {
         cy.get(inputName).type('jessica{enter}');
-        cy.get(searchBtn).click();
         cy.intercept('GET', /\/api\/Workers\/summary+/).as('worker');
+        cy.get(searchBtn).click();
         cy.wait('@worker').then(() =>
             cy.get(descriptorTitle).should('include.text', 'Jessica')
         );
diff --git a/test/cypress/integration/zone/zoneBasicData.spec.js b/test/cypress/integration/zone/zoneBasicData.spec.js
index 6229039b7..95a075fb3 100644
--- a/test/cypress/integration/zone/zoneBasicData.spec.js
+++ b/test/cypress/integration/zone/zoneBasicData.spec.js
@@ -1,5 +1,4 @@
 describe('ZoneBasicData', () => {
-    const notification = '.q-notification__message';
     const priceBasicData = '[data-cy="Price_input"]';
 
     beforeEach(() => {
@@ -11,13 +10,13 @@ describe('ZoneBasicData', () => {
     it('should throw an error if the name is empty', () => {
         cy.get('[data-cy="zone-basic-data-name"] input').type('{selectall}{backspace}');
         cy.get('.q-btn-group > .q-btn--standard').click();
-        cy.get(notification).should('contains.text', "can't be blank");
+        cy.checkNotification("can't be blank");
     });
 
     it('should throw an error if the price is empty', () => {
         cy.get(priceBasicData).clear();
         cy.get('.q-btn-group > .q-btn--standard').click();
-        cy.get(notification).should('contains.text', 'cannot be blank');
+        cy.checkNotification('cannot be blank');
     });
 
     it("should edit the basicData's zone", () => {
diff --git a/test/cypress/integration/zone/zoneCreate.spec.js b/test/cypress/integration/zone/zoneCreate.spec.js
index cc5de8c6c..0f630db5d 100644
--- a/test/cypress/integration/zone/zoneCreate.spec.js
+++ b/test/cypress/integration/zone/zoneCreate.spec.js
@@ -1,6 +1,4 @@
 describe('ZoneCreate', () => {
-    const notification = '.q-notification__message';
-
     const data = {
         Name: { val: 'Zone pickup D' },
         Price: { val: '3' },
@@ -24,7 +22,7 @@ describe('ZoneCreate', () => {
         cy.get('input[aria-label="Close"]').type('10:00');
         cy.get('body').click();
         cy.get('.q-mt-lg > .q-btn--standard').click();
-        cy.get(notification).should('contains.text', 'Agency cannot be blank');
+        cy.checkNotification('Agency cannot be blank');
     });
 
     it('should create a zone', () => {
@@ -35,6 +33,6 @@ describe('ZoneCreate', () => {
         cy.get('input[aria-label="Close"]').type('10:00');
         cy.get('body').click();
         cy.get('.q-mt-lg > .q-btn--standard').click();
-        cy.get(notification).should('contains.text', 'Data created');
+        cy.checkNotification('Data created');
     });
 });
diff --git a/test/cypress/integration/zone/zoneWarehouse.spec.js b/test/cypress/integration/zone/zoneWarehouse.spec.js
index 817e26312..a55a5619e 100644
--- a/test/cypress/integration/zone/zoneWarehouse.spec.js
+++ b/test/cypress/integration/zone/zoneWarehouse.spec.js
@@ -18,8 +18,8 @@ describe('ZoneWarehouse', () => {
         cy.get(saveBtn).click();
         cy.checkNotification(dataError);
     });
-
-    it('should create & remove a warehouse', () => {
+    // https://redmine.verdnatura.es/issues/8425
+    it.skip('should create & remove a warehouse', () => {
         cy.addBtnClick();
         cy.fillInForm(data);
         cy.get(saveBtn).click();
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index df2c00e03..93f6d0054 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -101,7 +101,6 @@ Cypress.Commands.add('selectOption', (selector, option, timeout = 5000) => {
                 .then(() => {
                     cy.get('@dataUrl').then((url) => {
                         if (url) {
-                            cy.log('url: ', url);
                             // Esperar a que el menú no esté visible (desaparezca)
                             cy.get('.q-menu').should('not.be.visible');
                             // Ahora esperar a que el menú vuelva a aparecer
@@ -125,7 +124,7 @@ Cypress.Commands.add('countSelectOptions', (selector, option) => {
 });
 
 Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
-    cy.waitForElement('.q-form > .q-card');
+    cy.waitForElement(form);
     cy.get(`${form} input`).each(([el]) => {
         cy.wrap(el)
             .invoke('attr', 'aria-label')
@@ -275,15 +274,11 @@ Cypress.Commands.add('openLeftMenu', (element) => {
 
 Cypress.Commands.add('clearSearchbar', (element) => {
     if (element) cy.waitForElement(element);
-    cy.get(
-        '#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input'
-    ).clear();
+    cy.get('[data-cy="vn-searchbar"]').clear();
 });
 
-Cypress.Commands.add('writeSearchbar', (value) => {
-    cy.get('#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input').type(
-        value
-    );
+Cypress.Commands.add('typeSearchbar', (value) => {
+    cy.get('[data-cy="vn-searchbar"]').type(value);
 });
 
 Cypress.Commands.add('validateContent', (selector, expectedValue) => {