diff --git a/CHANGELOG.md b/CHANGELOG.md
index 250aa01a2..778d04638 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto
+-   (Worker) => Se añade la opción de crear un trabajador ajeno a la empresa
+-   (Route) => Ahora se muestran todos los cmrs
 
 ## [2418.01]
 
diff --git a/package.json b/package.json
index 87546bb66..cdb185ba1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.26.1",
+    "version": "24.26.2",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 3ae05a268..691d3db8f 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, computed } from 'vue';
+import { onMounted, computed, ref } from 'vue';
 import { Dark, Quasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
@@ -10,13 +10,12 @@ import { localeEquivalence } from 'src/i18n/index';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
+import { useClipboard } from 'src/composables/useClipboard';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
-import { useClipboard } from 'src/composables/useClipboard';
-import { ref } from 'vue';
 const { copyText } = useClipboard();
 const userLocale = computed({
     get() {
@@ -91,6 +90,15 @@ function logout() {
 function copyUserToken() {
     copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
 }
+
+function localUserData() {
+    state.setUser(user.value);
+}
+
+function saveUserData(param, value) {
+    axios.post('UserConfigs/setUserConfig', { [param]: value });
+    localUserData();
+}
 </script>
 
 <template>
@@ -180,6 +188,7 @@ function copyUserToken() {
                     option-value="id"
                     input-debounce="0"
                     hide-selected
+                    @update:model-value="localUserData"
                 />
                 <VnSelect
                     :label="t('components.userPanel.localBank')"
@@ -189,6 +198,7 @@ function copyUserToken() {
                     option-value="id"
                     input-debounce="0"
                     hide-selected
+                    @update:model-value="localUserData"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -210,6 +220,7 @@ function copyUserToken() {
                     option-label="code"
                     option-value="id"
                     input-debounce="0"
+                    @update:model-value="localUserData"
                 />
                 <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
@@ -219,6 +230,7 @@ function copyUserToken() {
                     option-label="name"
                     option-value="id"
                     input-debounce="0"
+                    @update:model-value="(v) => saveUserData('warehouseFk', v)"
                 />
             </VnRow>
             <VnRow>
@@ -232,6 +244,7 @@ function copyUserToken() {
                     style="flex: 0"
                     dense
                     input-debounce="0"
+                    @update:model-value="(v) => saveUserData('companyFk', v)"
                 />
             </VnRow>
         </div>
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 6144f975d..c84a55122 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -13,6 +13,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    info: {
+        type: String,
+        default: '',
+    },
 });
 
 const { t } = useI18n();
@@ -83,6 +87,11 @@ const inputRules = [
                     v-if="hover && value && !$attrs.disabled"
                     @click="value = null"
                 ></QIcon>
+                <QIcon v-if="info" name="info">
+                    <QTooltip max-width="350px">
+                        {{ info }}
+                    </QTooltip>
+                </QIcon>
             </template>
         </QInput>
     </div>
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 9599ff29f..9d672bc3f 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -622,145 +622,140 @@ setLogTree();
             </QList>
         </div>
     </div>
-    <QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
-        <QScrollArea class="fit text-grey-8">
-            <QList dense>
-                <QSeparator />
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.search')"
-                        v-model="searchInput"
-                        class="full-width"
-                        clearable
-                        clear-icon="close"
-                        @keyup.enter="() => selectFilter('search')"
-                        @focusout="() => selectFilter('search')"
-                        @clear="() => selectFilter('search')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem>
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+        <QList dense>
+            <QSeparator />
+            <QItem class="q-mt-sm">
+                <QInput
+                    :label="t('globals.search')"
+                    v-model="searchInput"
+                    class="full-width"
+                    clearable
+                    clear-icon="close"
+                    @keyup.enter="() => selectFilter('search')"
+                    @focusout="() => selectFilter('search')"
+                    @clear="() => selectFilter('search')"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </QInput>
+            </QItem>
+            <QItem>
+                <VnSelect
+                    class="full-width"
+                    :label="t('globals.entity')"
+                    v-model="selectedFilters.changedModel"
+                    option-label="locale"
+                    option-value="value"
+                    :options="actions"
+                    @update:model-value="selectFilter('action')"
+                    hide-selected
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QOptionGroup
+                    size="sm"
+                    v-model="userRadio"
+                    :options="userTypes"
+                    color="primary"
+                    @update:model-value="selectFilter('userRadio')"
+                    right-label
+                >
+                    <template #label="{ label }">
+                        {{ t(`Users.${label}`) }}
+                    </template>
+                </QOptionGroup>
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers && userRadio !== null">
                     <VnSelect
                         class="full-width"
-                        :label="t('globals.entity')"
-                        v-model="selectedFilters.changedModel"
-                        option-label="locale"
-                        option-value="value"
-                        :options="actions"
-                        @update:model-value="selectFilter('action')"
+                        :label="t('globals.user')"
+                        v-model="userSelect"
+                        option-label="name"
+                        option-value="id"
+                        :options="workers"
+                        @update:model-value="selectFilter('userSelect')"
                         hide-selected
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QOptionGroup
-                        size="sm"
-                        v-model="userRadio"
-                        :options="userTypes"
-                        color="primary"
-                        @update:model-value="selectFilter('userRadio')"
-                        right-label
                     >
-                        <template #label="{ label }">
-                            {{ t(`Users.${label}`) }}
+                        <template #option="{ opt, itemProps }">
+                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                                <QItemSection class="col-3 items-center">
+                                    <VnAvatar :worker-id="opt.id" />
+                                </QItemSection>
+                                <QItemSection class="col-9 justify-center">
+                                    <span>{{ opt.name }}</span>
+                                    <span class="text-grey">{{ opt.nickname }}</span>
+                                </QItemSection>
+                            </QItem>
                         </template>
-                    </QOptionGroup>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers && userRadio !== null">
-                        <VnSelect
-                            class="full-width"
-                            :label="t('globals.user')"
-                            v-model="userSelect"
-                            option-label="name"
-                            option-value="id"
-                            :options="workers"
-                            @update:model-value="selectFilter('userSelect')"
-                            hide-selected
-                        >
-                            <template #option="{ opt, itemProps }">
-                                <QItem
-                                    v-bind="itemProps"
-                                    class="q-pa-xs row items-center"
-                                >
-                                    <QItemSection class="col-3 items-center">
-                                        <VnAvatar :worker-id="opt.id" />
-                                    </QItemSection>
-                                    <QItemSection class="col-9 justify-center">
-                                        <span>{{ opt.name }}</span>
-                                        <span class="text-grey">{{ opt.nickname }}</span>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.changes')"
-                        v-model="changeInput"
-                        class="full-width"
-                        clearable
-                        clear-icon="close"
-                        @keyup.enter="selectFilter('change')"
-                        @focusout="selectFilter('change')"
-                        @clear="selectFilter('change')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip max-width="250px">{{
-                                    t('tooltips.changes')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem
-                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                    v-for="(checkboxOption, index) in checkboxOptions"
-                    :key="index"
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QInput
+                    :label="t('globals.changes')"
+                    v-model="changeInput"
+                    class="full-width"
+                    clearable
+                    clear-icon="close"
+                    @keyup.enter="selectFilter('change')"
+                    @focusout="selectFilter('change')"
+                    @clear="selectFilter('change')"
                 >
-                    <QCheckbox
-                        size="sm"
-                        v-model="checkboxOption.selected"
-                        :label="t(`actions.${checkboxOption.label}`)"
-                        @update:model-value="selectFilter"
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        class="full-width"
-                        :label="t('globals.date')"
-                        @click="dateFromDialog = true"
-                        @focus="(evt) => evt.target.blur()"
-                        @clear="selectFilter('date', 'to')"
-                        v-model="dateFrom"
-                        clearable
-                        clear-icon="close"
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        class="full-width"
-                        :label="t('to')"
-                        @click="dateToDialog = true"
-                        @focus="(evt) => evt.target.blur()"
-                        @clear="selectFilter('date', 'from')"
-                        v-model="dateTo"
-                        clearable
-                        clear-icon="close"
-                    />
-                </QItem>
-            </QList>
-        </QScrollArea>
-    </QDrawer>
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip max-width="250px">{{
+                                t('tooltips.changes')
+                            }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </QInput>
+            </QItem>
+            <QItem
+                :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
+                v-for="(checkboxOption, index) in checkboxOptions"
+                :key="index"
+            >
+                <QCheckbox
+                    size="sm"
+                    v-model="checkboxOption.selected"
+                    :label="t(`actions.${checkboxOption.label}`)"
+                    @update:model-value="selectFilter"
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QInput
+                    class="full-width"
+                    :label="t('globals.date')"
+                    @click="dateFromDialog = true"
+                    @focus="(evt) => evt.target.blur()"
+                    @clear="selectFilter('date', 'to')"
+                    v-model="dateFrom"
+                    clearable
+                    clear-icon="close"
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QInput
+                    class="full-width"
+                    :label="t('to')"
+                    @click="dateToDialog = true"
+                    @focus="(evt) => evt.target.blur()"
+                    @clear="selectFilter('date', 'from')"
+                    v-model="dateTo"
+                    clearable
+                    clear-icon="close"
+                />
+            </QItem>
+        </QList>
+    </Teleport>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"
diff --git a/src/components/common/VnRadio.vue b/src/components/common/VnRadio.vue
new file mode 100644
index 000000000..4eeb9dbe9
--- /dev/null
+++ b/src/components/common/VnRadio.vue
@@ -0,0 +1,6 @@
+<script setup>
+const model = defineModel({ type: Boolean, required: true });
+</script>
+<template>
+    <QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
+</template>
diff --git a/src/components/ui/CardList.vue b/src/components/ui/CardList.vue
index e8392b13e..c9b062457 100644
--- a/src/components/ui/CardList.vue
+++ b/src/components/ui/CardList.vue
@@ -28,7 +28,7 @@ const toggleCardCheck = (item) => {
                         <div class="title text-primary text-weight-bold text-h5">
                             {{ $props.title }}
                         </div>
-                        <QChip class="q-chip-color" outline size="sm">
+                        <QChip v-if="$props.id" class="q-chip-color" outline size="sm">
                             {{ t('ID') }}: {{ $props.id }}
                         </QChip>
                     </div>
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index c0d129613..8c86c056a 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -18,7 +18,7 @@ onMounted(() => {
     const observer = new MutationObserver(
         () =>
             (hasContent.value =
-                actions.value.childNodes.length + data.value.childNodes.length)
+                actions.value?.childNodes?.length + data.value?.childNodes?.length)
     );
     if (actions.value) observer.observe(actions.value, opts);
     if (data.value) observer.observe(data.value, opts);
diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
new file mode 100644
index 000000000..46aaa3c25
--- /dev/null
+++ b/src/composables/useAcl.js
@@ -0,0 +1,33 @@
+import axios from 'axios';
+import { useState } from './useState';
+
+export function useAcl() {
+    const state = useState();
+
+    async function fetch() {
+        const { data } = await axios.get('VnUsers/acls');
+        const acls = {};
+        data.forEach((acl) => {
+            acls[acl.model] = acls[acl.model] || {};
+            acls[acl.model][acl.property] = acls[acl.model][acl.property] || {};
+            acls[acl.model][acl.property][acl.accessType] = true;
+        });
+
+        state.setAcls(acls);
+    }
+
+    function hasAny(model, prop, accessType) {
+        const acls = state.getAcls().value[model];
+        if (acls) 
+            return ['*', prop].some((key) => {
+                const acl = acls[key];
+                return acl && (acl['*'] || acl[accessType]);
+            });
+    }
+
+    return {
+        fetch,
+        hasAny,
+        state,
+    };
+}
diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 56bce0279..ca2abef00 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -1,5 +1,6 @@
 import { useState } from './useState';
 import { useRole } from './useRole';
+import { useAcl } from './useAcl';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
 import useNotify from './useNotify';
@@ -88,6 +89,7 @@ export function useSession() {
         setSession(data);
 
         await useRole().fetch();
+        await useAcl().fetch();
         await useUserConfig().fetch();
         await useTokenConfig().fetch();
 
diff --git a/src/composables/useState.js b/src/composables/useState.js
index 9b9c9d642..c2ac1740c 100644
--- a/src/composables/useState.js
+++ b/src/composables/useState.js
@@ -11,8 +11,11 @@ const user = ref({
     companyFk: null,
     warehouseFk: null,
 });
+if (sessionStorage.getItem('user'))
+    user.value = JSON.parse(sessionStorage.getItem('user'));
 
 const roles = ref([]);
+const acls = ref([]);
 const tokenConfig = ref({});
 const drawer = ref(true);
 const headerMounted = ref(false);
@@ -25,7 +28,10 @@ export function useState() {
     }
 
     function setUser(data) {
-        user.value = data;
+        const currentUser = { ...JSON.parse(sessionStorage.getItem('user')), ...data };
+        sessionStorage.setItem('user', JSON.stringify(currentUser));
+        user.value = currentUser;
+        return currentUser;
     }
 
     function getRoles() {
@@ -37,6 +43,14 @@ export function useState() {
     function setRoles(data) {
         roles.value = data;
     }
+
+    function getAcls() {
+        return computed(() => acls.value);
+    }
+
+    function setAcls(data) {
+        acls.value = data;
+    }
     function getTokenConfig() {
         return computed(() => {
             return tokenConfig.value;
@@ -64,6 +78,8 @@ export function useState() {
         setUser,
         getRoles,
         setRoles,
+        getAcls,
+        setAcls,
         getTokenConfig,
         setTokenConfig,
         set,
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index cc8bfb6b4..771250abd 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -473,6 +473,7 @@ ticket:
         agency: Agency
         zone: Zone
         warehouse: Warehouse
+        collection: Collection
         route: Route
         invoice: Invoice
         shipped: Shipped
@@ -963,7 +964,7 @@ roadmap:
 route:
     pageTitles:
         routes: Routes
-        cmrsList: External CMRs list
+        cmrsList: CMRs list
         RouteList: List
         routeCreate: New route
         basicData: Basic Data
@@ -1178,6 +1179,7 @@ item:
         available: Available
         warehouseText: 'Calculated on the warehouse of { warehouseName }'
         itemDiary: Item diary
+        producer: Producer
     list:
         id: Identifier
         grouping: Grouping
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index a42775b9a..cfadd57b3 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -471,6 +471,7 @@ ticket:
         agency: Agencia
         zone: Zona
         warehouse: Almacén
+        collection: Colección
         route: Ruta
         invoice: Factura
         shipped: Enviado
@@ -951,7 +952,7 @@ roadmap:
 route:
     pageTitles:
         routes: Rutas
-        cmrsList: Listado de CMRs externos
+        cmrsList: Listado de CMRs
         RouteList: Listado
         routeCreate: Nueva ruta
         basicData: Datos básicos
@@ -1167,6 +1168,7 @@ item:
         available: Disponible
         warehouseText: 'Calculado sobre el almacén de { warehouseName }'
         itemDiary: Registro de compra-venta
+        producer: Productor
     list:
         id: Identificador
         grouping: Grouping
diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
new file mode 100644
index 000000000..3d7dda899
--- /dev/null
+++ b/src/pages/Account/AccountAccounts.vue
@@ -0,0 +1,104 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const onSynchronizeAll = async () => {
+    try {
+        notify(t('Synchronizing in the background'), 'positive');
+        await axios.patch(`Accounts/syncAll`);
+    } catch (error) {
+        console.error('Error synchronizing all accounts', error);
+    }
+};
+
+const onSynchronizeRoles = async () => {
+    try {
+        await axios.patch(`RoleInherits/sync`);
+        notify(t('Roles synchronized!'), 'positive');
+    } catch (error) {
+        console.error('Error synchronizing roles', error);
+    }
+};
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            :url="`AccountConfigs/${1}`"
+            :url-update="`AccountConfigs/${1}`"
+            model="AccountAccounts"
+            auto-load
+        >
+            <template #moreActions>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('accounts.syncAll')"
+                    @click="onSynchronizeAll()"
+                />
+                <QBtn
+                    color="primary"
+                    :label="t('accounts.syncRoles')"
+                    @click="onSynchronizeRoles()"
+                />
+            </template>
+            <template #form="{ data }">
+                <div class="q-gutter-y-sm">
+                    <VnInput :label="t('accounts.homedir')" v-model="data.homedir" />
+                    <VnInput :label="t('accounts.shell')" v-model="data.shell" />
+                    <VnInput
+                        :label="t('accounts.idBase')"
+                        v-model="data.idBase"
+                        type="number"
+                        min="0"
+                    />
+                    <VnRow>
+                        <VnInput
+                            :label="t('accounts.min')"
+                            v-model="data.min"
+                            type="number"
+                            min="0"
+                        />
+                        <VnInput
+                            :label="t('accounts.max')"
+                            v-model="data.max"
+                            type="number"
+                            min="0"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('accounts.warn')"
+                            v-model="data.warn"
+                            type="number"
+                            min="0"
+                        />
+                        <VnInput
+                            :label="t('accounts.inact')"
+                            v-model="data.inact"
+                            type="number"
+                            min="0"
+                        />
+                    </VnRow>
+                </div>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Roles synchronized!: ¡Roles sincronizados!
+    Synchronizing in the background: Sincronizando en segundo plano
+</i18n>
diff --git a/src/pages/Account/AccountAcls.vue b/src/pages/Account/AccountAcls.vue
index 82d171ce7..bd7f0f9ae 100644
--- a/src/pages/Account/AccountAcls.vue
+++ b/src/pages/Account/AccountAcls.vue
@@ -8,12 +8,12 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import AclFilter from './Acls/AclFilter.vue';
+import AclFormView from './Acls/AclFormView.vue';
 
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import AclFormView from './Acls/AclFormView.vue';
 
 defineProps({
     id: {
diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
new file mode 100644
index 000000000..29e8d4d78
--- /dev/null
+++ b/src/pages/Account/AccountAliasList.vue
@@ -0,0 +1,105 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import AliasSummary from './Alias/Card/AliasSummary.vue';
+import AliasCreateForm from './Alias/AliasCreateForm.vue';
+
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useStateStore } from 'stores/useStateStore';
+
+defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const router = useRouter();
+const stateStore = useStateStore();
+const aliasCreateDialogRef = ref(null);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : { alias: { like: `%${value}%` } };
+    }
+};
+
+const navigate = (id) => router.push({ name: 'AliasSummary', params: { id } });
+
+const openCreateModal = () => aliasCreateDialogRef.value.show();
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="AccountAliasList"
+                url="MailAliases"
+                :expr-builder="exprBuilder"
+                :label="t('mailAlias.search')"
+                :info="t('mailAlias.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <QPage class="flex justify-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AccountAliasList"
+                url="MailAliases"
+                :expr-builder="exprBuilder"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.alias"
+                        @click="navigate(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('mailAlias.alias')" :value="row.alias">
+                            </VnLv>
+                            <VnLv
+                                :label="t('mailAlias.description')"
+                                :value="row.description"
+                            >
+                            </VnLv>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, AliasSummary)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            ref="aliasCreateDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <AliasCreateForm />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="openCreateModal()">
+                <QTooltip class="text-no-wrap">{{ t('mailAlias.newAlias') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
new file mode 100644
index 000000000..98208e5f2
--- /dev/null
+++ b/src/pages/Account/AccountConnections.vue
@@ -0,0 +1,112 @@
+<script setup>
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import { toDateTimeFormat } from 'src/filters/date.js';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+const filter = {
+    fields: ['id', 'created', 'userId'],
+    include: {
+        relation: 'user',
+        scope: {
+            fields: ['username'],
+        },
+    },
+    order: 'created DESC',
+};
+
+const urlPath = 'AccessTokens';
+
+const refresh = () => paginateRef.value.fetch();
+
+const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
+
+const killSession = async (id) => {
+    try {
+        await axios.delete(`${urlPath}/${id}`);
+        paginateRef.value.fetch();
+        notify(t('Session killed'), 'positive');
+    } catch (error) {
+        console.error('Error killing session', error);
+    }
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                :data-key="urlPath"
+                ref="paginateRef"
+                :filter="filter"
+                :url="urlPath"
+                order="created DESC"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :key="row.id"
+                        :title="row.user?.username"
+                        @click="navigate(row.userId)"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <div style="flex-direction: column; width: 100%">
+                                <VnLv
+                                    :label="t('connections.username')"
+                                    :value="row.user?.username"
+                                >
+                                </VnLv>
+                                <VnLv
+                                    :label="t('connections.created')"
+                                    :value="toDateTimeFormat(row.created)"
+                                >
+                                </VnLv>
+                            </div>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                class="q-mt-xs"
+                                :label="t('connections.killSession')"
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('Session will be killed'),
+                                        t('Are you sure you want to continue?'),
+                                        () => killSession(row.id)
+                                    )
+                                "
+                                outline
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="refresh" color="primary" @click="refresh()">
+                <QTooltip>{{ t('connections.refresh') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Session killed: Sesión matada
+    Session will be killed: Se va a matar la sesión
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+</i18n>
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
new file mode 100644
index 000000000..77c4d89f8
--- /dev/null
+++ b/src/pages/Account/AccountLdap.vue
@@ -0,0 +1,171 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+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';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const arrayData = useArrayData('AccountLdap');
+
+const URL_UPDATE = `LdapConfigs/${1}`;
+const URL_CREATE = `LdapConfigs`;
+const DEFAULT_DATA = {
+    id: 1,
+    hasData: false,
+    groupDn: null,
+    password: null,
+    rdn: null,
+    server: null,
+    userDn: null,
+};
+
+const initialData = ref({
+    ...DEFAULT_DATA,
+});
+
+const hasData = computed({
+    get: () => initialData.value.hasData,
+    set: (val) => {
+        initialData.value.hasData = val;
+        if (!val) formCustomFn.value = deleteMailForward;
+        else formCustomFn.value = null;
+    },
+});
+
+const initialDataLoaded = ref(false);
+const formUrlCreate = ref(null);
+const formUrlUpdate = ref(null);
+const formCustomFn = ref(null);
+
+const onTestConection = async () => {
+    try {
+        await axios.get(`LdapConfigs/test`);
+        notify(t('LDAP connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
+};
+
+const getInitialLdapConfig = async () => {
+    try {
+        initialDataLoaded.value = false;
+        const { data } = await axios.get(URL_UPDATE);
+        initialData.value = data;
+        hasData.value = true;
+        return data;
+    } catch (error) {
+        hasData.value = false;
+        arrayData.destroy();
+        console.error('Error fetching initial LDAP config', error);
+        return null;
+    } finally {
+        // Si asignamos un valor a urlUpdate, debemos asignar null a urlCreate y viceversa, ya puede causar problemas en formModel
+        if (hasData.value) {
+            formUrlUpdate.value = URL_UPDATE;
+            formUrlCreate.value = null;
+        } else {
+            formUrlUpdate.value = null;
+            formUrlCreate.value = URL_CREATE;
+        }
+        initialDataLoaded.value = true;
+    }
+};
+
+const deleteMailForward = async () => {
+    try {
+        await axios.delete(URL_UPDATE);
+        initialData.value = { ...DEFAULT_DATA };
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
+};
+
+onMounted(async () => await getInitialLdapConfig());
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            :key="initialDataLoaded"
+            model="AccountLdap"
+            :form-initial-data="initialData"
+            :url-create="formUrlCreate"
+            :url-update="formUrlUpdate"
+            :save-fn="formCustomFn"
+            auto-load
+            @on-data-saved="getInitialLdapConfig()"
+        >
+            <template #moreActions>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('ldap.testConnection')"
+                    @click="onTestConection()"
+                >
+                    <QTooltip>
+                        {{ t('ldap.testConnection') }}
+                    </QTooltip>
+                </QBtn>
+            </template>
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('ldap.enableSync')"
+                            v-model="data.hasData"
+                            @update:model-value="($event) => (hasData = $event)"
+                            :toggle-indeterminate="false"
+                        />
+                    </div>
+                </VnRow>
+                <template v-if="hasData">
+                    <VnInput
+                        :label="t('ldap.server')"
+                        clearable
+                        v-model="data.server"
+                        :required="true"
+                        :rules="validate('LdapConfig.server')"
+                    />
+                    <VnInput
+                        :label="t('ldap.rdn')"
+                        clearable
+                        v-model="data.rdn"
+                        :required="true"
+                        :rules="validate('LdapConfig.rdn')"
+                    />
+                    <VnInput
+                        :label="t('ldap.password')"
+                        clearable
+                        type="password"
+                        v-model="data.password"
+                        :required="true"
+                        :rules="validate('LdapConfig.password')"
+                    />
+                    <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
+                    <VnInput
+                        :label="t('ldap.groupDN')"
+                        clearable
+                        v-model="data.groupDn"
+                    />
+                </template>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    LDAP connection established!: ¡Conexión con LDAP establecida!
+</i18n>
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
new file mode 100644
index 000000000..25428a674
--- /dev/null
+++ b/src/pages/Account/AccountSamba.vue
@@ -0,0 +1,187 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+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';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const arrayData = useArrayData('AccountSamba');
+
+const formModel = ref(null);
+
+const URL_UPDATE = `SambaConfigs/${1}`;
+const URL_CREATE = `SambaConfigs`;
+
+const DEFAULT_DATA = {
+    id: 1,
+    hasData: false,
+    adDomain: null,
+    adController: null,
+    adUser: null,
+    adPassword: null,
+    userDn: null,
+    verifyCert: false,
+};
+
+const initialData = ref({
+    ...DEFAULT_DATA,
+});
+
+const hasData = computed({
+    get: () => initialData.value.hasData,
+    set: (val) => {
+        initialData.value.hasData = val;
+        if (!val) formCustomFn.value = deleteMailForward;
+        else formCustomFn.value = null;
+    },
+});
+
+const initialDataLoaded = ref(false);
+const formUrlCreate = ref(null);
+const formUrlUpdate = ref(null);
+const formCustomFn = ref(null);
+
+const onTestConection = async () => {
+    try {
+        await axios.get(`SambaConfigs/test`);
+        notify(t('Samba connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
+};
+
+const getInitialSambaConfig = async () => {
+    try {
+        initialDataLoaded.value = false;
+        const { data } = await axios.get(URL_UPDATE);
+        initialData.value = data;
+        hasData.value = true;
+        return data;
+    } catch (error) {
+        hasData.value = false;
+        arrayData.destroy();
+        console.error('Error fetching initial Samba config', error);
+        return null;
+    } finally {
+        if (hasData.value) {
+            formUrlUpdate.value = URL_UPDATE;
+            formUrlCreate.value = null;
+        } else {
+            formUrlUpdate.value = null;
+            formUrlCreate.value = URL_CREATE;
+        }
+        initialDataLoaded.value = true;
+    }
+};
+
+const deleteMailForward = async () => {
+    try {
+        await axios.delete(URL_UPDATE);
+        initialData.value = { ...DEFAULT_DATA };
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
+};
+
+onMounted(async () => await getInitialSambaConfig());
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            ref="formModel"
+            :key="initialDataLoaded"
+            model="AccountSamba"
+            :form-initial-data="initialData"
+            :url-create="formUrlCreate"
+            :url-update="formUrlUpdate"
+            :save-fn="formCustomFn"
+            auto-load
+            @on-data-saved="getInitialSambaConfig()"
+        >
+            <template #moreActions>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('samba.testConnection')"
+                    :disable="formModel.hasChanges"
+                    @click="onTestConection()"
+                >
+                    <QTooltip>
+                        {{ t('samba.testConnection') }}
+                    </QTooltip>
+                </QBtn>
+            </template>
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('samba.enableSync')"
+                            v-model="data.hasData"
+                            @update:model-value="($event) => (hasData = $event)"
+                            :toggle-indeterminate="false"
+                        />
+                    </div>
+                </VnRow>
+                <template v-if="hasData">
+                    <VnInput
+                        :label="t('samba.domainAD')"
+                        clearable
+                        v-model="data.adDomain"
+                        :required="true"
+                        :rules="validate('SambaConfigs.server')"
+                    />
+                    <VnInput
+                        :label="t('samba.domainController')"
+                        clearable
+                        v-model="data.adController"
+                        :required="true"
+                        :rules="validate('SambaConfigs.adController')"
+                    />
+                    <VnInput
+                        :label="t('samba.userAD')"
+                        clearable
+                        v-model="data.adUser"
+                        :rules="validate('SambaConfigs.adUser')"
+                    />
+                    <VnInput
+                        :label="t('samba.passwordAD')"
+                        clearable
+                        type="password"
+                        v-model="data.adPassword"
+                    />
+                    <VnInput
+                        :label="t('samba.domainPart')"
+                        clearable
+                        v-model="data.userDn"
+                        :required="true"
+                        :rules="validate('SambaConfigs.userDn')"
+                    />
+                    <QCheckbox
+                        :label="t('samba.verifyCertificate')"
+                        v-model="data.verifyCert"
+                        :rules="validate('SambaConfigs.groupDn')"
+                        :toggle-indeterminate="false"
+                    />
+                </template>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Samba connection established!: ¡Conexión con LDAP establecida!
+</i18n>
diff --git a/src/pages/Account/Alias/AliasCreateForm.vue b/src/pages/Account/Alias/AliasCreateForm.vue
new file mode 100644
index 000000000..d4d61a804
--- /dev/null
+++ b/src/pages/Account/Alias/AliasCreateForm.vue
@@ -0,0 +1,57 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const router = useRouter();
+const { t } = useI18n();
+const arrayData = useArrayData('AliasCreate');
+const { store } = arrayData;
+
+const defaultInitialData = {
+    alias: null,
+    description: null,
+};
+
+const onDataSaved = ({ id }) => {
+    router.push({ name: 'AliasBasicData', params: { id } });
+    store.data = null;
+};
+</script>
+
+<template>
+    <FormModelPopup
+        :title="t('Create alias')"
+        ref="formModelPopupRef"
+        url-create="MailAliases"
+        model="AliasCreate"
+        :form-initial-data="defaultInitialData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('mailAlias.description')"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        Create alias: Crear alias
+</i18n>
diff --git a/src/pages/Account/Alias/Card/AliasBasicData.vue b/src/pages/Account/Alias/Card/AliasBasicData.vue
new file mode 100644
index 000000000..ba940cda5
--- /dev/null
+++ b/src/pages/Account/Alias/Card/AliasBasicData.vue
@@ -0,0 +1,20 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+</script>
+
+<template>
+    <FormModel model="Alias">
+        <template #form="{ data }">
+            <div class="column q-gutter-y-md">
+                <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                <VnInput v-model="data.description" :label="t('mailAlias.description')" />
+                <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
+            </div>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
new file mode 100644
index 000000000..f5103cf03
--- /dev/null
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@@ -0,0 +1,33 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
+
+import VnCard from 'components/common/VnCard.vue';
+import AliasDescriptor from './AliasDescriptor.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const customRouteRedirectName = computed(() => {
+    return routeName.value;
+});
+const searchBarDataKeys = {
+    AliasBasicData: 'AliasBasicData',
+    AliasUsers: 'AliasUsers',
+};
+</script>
+
+<template>
+    <VnCard
+        data-key="Alias"
+        base-url="MailAliases"
+        :descriptor="AliasDescriptor"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="customRouteRedirectName"
+        :search-redirect="!!customRouteRedirectName"
+        :searchbar-label="t('mailAlias.search')"
+        :searchbar-info="t('mailAlias.searchInfo')"
+    />
+</template>
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
new file mode 100644
index 000000000..963f84547
--- /dev/null
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -0,0 +1,88 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import useCardDescription from 'src/composables/useCardDescription';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+const route = useRoute();
+const quasar = useQuasar();
+const router = useRouter();
+const { notify } = useNotify();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
+
+const removeAlias = () => {
+    quasar
+        .dialog({
+            title: t('Alias will be removed'),
+            message: t('Are you sure you want to continue?'),
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.delete(`MailAliases/${entityId.value}`);
+                notify(t('Alias removed'), 'positive');
+                router.push({ name: 'AccountAlias' });
+            } catch (err) {
+                console.error('Error removing alias');
+            }
+        });
+};
+</script>
+
+<template>
+    <CardDescriptor
+        ref="descriptor"
+        :url="`MailAliases/${entityId}`"
+        module="Alias"
+        @on-fetch="setData"
+        data-key="aliasData"
+        :title="data.title"
+        :subtitle="data.subtitle"
+    >
+        <template #menu>
+            <QItem v-ripple clickable @click="removeAlias()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+    en:
+        accountRate: Claming rate
+    es:
+        accountRate: Ratio de reclamación
+        Delete: Eliminar
+        Alias will be removed: El alias será eliminado
+        Are you sure you want to continue?: ¿Seguro que quieres continuar?
+        Alias removed: Alias eliminado
+</i18n>
diff --git a/src/pages/Account/Alias/Card/AliasSummary.vue b/src/pages/Account/Alias/Card/AliasSummary.vue
new file mode 100644
index 000000000..cedae28b7
--- /dev/null
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@@ -0,0 +1,49 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { store } = useArrayData('Alias');
+const alias = ref(store.data);
+const entityId = computed(() => $props.id || route.params.id);
+</script>
+
+<template>
+    <CardSummary
+        ref="summary"
+        :url="`MailAliases/${entityId}`"
+        @on-fetch="(data) => (alias = data)"
+    >
+        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
+        <template #body>
+            <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <router-link
+                        :to="{ name: 'AliasBasicData', params: { id: entityId } }"
+                        class="header header-link"
+                    >
+                        {{ t('globals.summary.basicData') }}
+                        <QIcon name="open_in_new" />
+                    </router-link>
+                </QCardSection>
+                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
+                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
diff --git a/src/pages/Account/Alias/Card/AliasUsers.vue b/src/pages/Account/Alias/Card/AliasUsers.vue
new file mode 100644
index 000000000..4a9c449e4
--- /dev/null
+++ b/src/pages/Account/Alias/Card/AliasUsers.vue
@@ -0,0 +1,122 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { computed, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+
+const arrayData = useArrayData('AliasUsers');
+const { store } = arrayData;
+
+const data = computed(() => {
+    const dataCopy = JSON.parse(JSON.stringify(store.data));
+    return dataCopy.sort((a, b) => a.user?.name.localeCompare(b.user?.name));
+});
+
+const filter = {
+    include: {
+        relation: 'user',
+        scope: {
+            fields: ['id', 'name'],
+        },
+    },
+};
+
+const urlPath = computed(() => `MailAliases/${route.params.id}/accounts`);
+
+const columns = computed(() => [
+    {
+        name: 'alias',
+    },
+    {
+        name: 'action',
+    },
+]);
+
+const deleteAlias = async (row) => {
+    try {
+        await axios.delete(`${urlPath.value}/${row.id}`);
+        notify(t('User removed'), 'positive');
+        fetchAliases();
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter = filter;
+        fetchAliases();
+    }
+);
+
+const fetchAliases = () => paginateRef.value.fetch();
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="full-width" style="max-width: 400px">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AliasUsers"
+                :filter="filter"
+                :url="urlPath"
+                :limit="0"
+                auto-load
+            >
+                <template #body>
+                    <QTable :rows="data" :columns="columns" hide-header>
+                        <template #body="{ row }">
+                            <QTr>
+                                <QTd>
+                                    <span>{{ row.user?.name }}</span>
+                                </QTd>
+                                <QTd style="width: 50px !important">
+                                    <QIcon
+                                        name="delete"
+                                        size="sm"
+                                        class="cursor-pointer"
+                                        color="primary"
+                                        @click="
+                                            openConfirmationModal(
+                                                t('User will be removed from alias'),
+                                                t('Are you sure you want to continue?'),
+                                                () => deleteAlias(row)
+                                            )
+                                        "
+                                    >
+                                        <QTooltip>
+                                            {{ t('Delete') }}
+                                        </QTooltip>
+                                    </QIcon>
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    User will be removed from alias: El usuario será borrado del alias
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+    User removed: Usuario borrado
+    Delete: Eliminar
+</i18n>
diff --git a/src/pages/Account/Role/Card/RoleBasicData.vue b/src/pages/Account/Role/Card/RoleBasicData.vue
index bf9b3307d..1f3b3b6da 100644
--- a/src/pages/Account/Role/Card/RoleBasicData.vue
+++ b/src/pages/Account/Role/Card/RoleBasicData.vue
@@ -23,6 +23,11 @@ const { t } = useI18n();
                     />
                 </div>
             </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
+                </div>
+            </VnRow>
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
new file mode 100644
index 000000000..89712b0b9
--- /dev/null
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -0,0 +1,92 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute, useRouter } 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 { useQuasar } from 'quasar';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const route = useRoute();
+
+const quasar = useQuasar();
+const router = useRouter();
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
+const filter = {
+    where: { id: entityId },
+};
+const removeRole = () => {
+    quasar
+        .dialog({
+            title: 'Are you sure you want to delete it?',
+            message: 'Delete department',
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.post(
+                    `/Departments/${entityId.value}/removeChild`,
+                    entityId.value
+                );
+                router.push({ name: 'WorkerDepartment' });
+                notify('department.departmentRemoved', 'positive');
+            } catch (err) {
+                console.error('Error removing department');
+            }
+        });
+};
+</script>
+
+<template>
+    <CardDescriptor
+        ref="descriptor"
+        :url="`VnRoles`"
+        :filter="filter"
+        module="Role"
+        @on-fetch="setData"
+        data-key="accountData"
+        :title="data.title"
+        :subtitle="data.subtitle"
+    >
+        <template #menu>
+            <QItem v-ripple clickable @click="removeRole()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('role.card.description')" :value="entity.description" />
+        </template>
+    </CardDescriptor>
+</template>
+<style scoped>
+.q-item__label {
+    margin-top: 0;
+}
+</style>
+<i18n>
+    en:
+        accountRate: Claming rate
+    es:
+        accountRate: Ratio de reclamación
+</i18n>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index c330b706e..dca9b45d9 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -46,6 +46,18 @@ role:
     searchInfo: Search role by id or name
     name: Name
     description: Description
+    id: Id
+mailAlias:
+    pageTitles:
+        aliasUsers: Users
+    search: Search mail alias
+    searchInfo: Search alias by id or name
+    alias: Alias
+    description: Description
+    id: Id
+    newAlias: New alias
+    name: Name
+    isPublic: Public
 ldap:
     enableSync: Enable synchronization
     server: Server
@@ -55,6 +67,7 @@ ldap:
     groupDN: Group DN
     testConnection: Test connection
     success: LDAP connection established!
+    password: Password
 samba:
     enableSync: Enable synchronization
     domainController: Domain controller
@@ -66,6 +79,21 @@ samba:
     verifyCertificate: Verify certificate
     testConnection: Test connection
     success: Samba connection established!
+accounts:
+    homedir: Homedir base
+    shell: Shell
+    idBase: User and role base id
+    min: Min
+    max: Max
+    warn: Warn
+    inact: Inact
+    syncAll: Synchronize all
+    syncRoles: Synchronize roles
+connections:
+    refresh: Refresh
+    username: Username
+    created: Created
+    killSession: Kill session
 acls:
     role: Role
     accessType: Access type
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index 7ba81b583..896cc8ea9 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -57,7 +57,20 @@ role:
     searchInfo: Buscar rol por id o nombre
     name: Nombre
     description: Descripción
+    id: Id
+mailAlias:
+    pageTitles:
+        aliasUsers: Usuarios
+    search: Buscar alias de correo
+    searchInfo: Buscar alias por id o nombre
+    alias: Alias
+    description: Descripción
+    id: Id
+    newAlias: Nuevo alias
+    name: Nombre
+    isPublic: Público
 ldap:
+    password: Contraseña
     enableSync: Habilitar sincronización
     server: Servidor
     rdn: RDN
@@ -74,9 +87,24 @@ samba:
     userAD: Usuario AD
     passwordAD: Contraseña AD
     domainPart: DN usuarios (sin la parte del dominio)
-    Verify certificate: Verificar certificado
+    verifyCertificate: Verificar certificado
     testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
+accounts:
+    homedir: Directorio base para carpetas de usuario
+    shell: Intérprete de línea de comandos
+    idBase: Id base usuarios y roles
+    min: Min
+    max: Max
+    warn: Warn
+    inact: Inact
+    syncAll: Sincronizar todo
+    syncRoles: Sincronizar roles
+connections:
+    refresh: Actualizar
+    username: Nombre de usuario
+    created: Creado
+    killSession: Matar sesión
 acls:
     role: Rol
     accessType: Tipo de acceso
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 0886383de..02f230c03 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -234,7 +234,7 @@ const showBalancePdf = (balance) => {
                 <template #body-cell-employee="{ row }">
                     <QTd auto-width @click.stop>
                         <QBtn color="blue" flat no-caps>{{ row.userName }}</QBtn>
-                        <WorkerDescriptorProxy :id="row.clientFk" />
+                        <WorkerDescriptorProxy :id="row.workerFk" />
                     </QTd>
                 </template>
 
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 656f8d5fd..807ccdae4 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -34,7 +34,7 @@ const entryFilter = {
         {
             relation: 'travel',
             scope: {
-                fields: ['id', 'landed', 'agencyModeFk', 'warehouseOutFk'],
+                fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'],
                 include: [
                     {
                         relation: 'agency',
@@ -125,10 +125,8 @@ watch;
                 :label="t('entry.descriptor.agency')"
                 :value="entity.travel?.agency?.name"
             />
-            <VnLv
-                :label="t('entry.descriptor.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('entry.descriptor.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 5c56146b9..d47c0f69c 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -221,10 +221,7 @@ const fetchEntryBuys = async () => {
                     :value="entry.travel.agency.name"
                 />
 
-                <VnLv
-                    :label="t('entry.summary.travelShipped')"
-                    :value="toDate(entry.travel.shipped)"
-                />
+                <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
 
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
@@ -236,10 +233,7 @@ const fetchEntryBuys = async () => {
                     v-model="entry.travel.isDelivered"
                     :disable="true"
                 />
-                <VnLv
-                    :label="t('entry.summary.travelLanded')"
-                    :value="toDate(entry.travel.landed)"
-                />
+                <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
 
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 805b49190..e5d37900c 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -78,10 +78,7 @@ onMounted(async () => {
                             </QIcon>
                         </template>
                         <template #list-items>
-                            <VnLv
-                                :label="t('entry.list.landed')"
-                                :value="toDate(row.landed)"
-                            />
+                            <VnLv :label="t('landed')" :value="toDate(row.landed)" />
                             <VnLv
                                 :label="t('entry.list.booked')"
                                 :value="!!row.isBooked"
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 1956140ed..9a476c80c 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -6,3 +6,5 @@ entryFilter:
     filter:
         search: General search
         reference: Reference
+landed: Landed
+shipped: Shipped
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 5d317a24a..fba6c5460 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -8,3 +8,6 @@ entryFilter:
     filter:
         search: Búsqueda general
         reference: Referencia
+
+landed: F. llegada
+shipped: F. salida
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 8dfb96eba..ede9af825 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -19,7 +19,8 @@ const { t } = useI18n();
 const dms = ref({});
 const route = useRoute();
 const editDownloadDisabled = ref(false);
-const invoiceIn = computed(() => useArrayData().store.data);
+const arrayData = useArrayData();
+const invoiceIn = computed(() => arrayData.store.data);
 const userConfig = ref(null);
 const invoiceId = computed(() => +route.params.id);
 
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
index dc62440c8..7735747f9 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
@@ -12,7 +12,7 @@ const { push, currentRoute } = useRouter();
 const { t } = useI18n();
 
 const invoiceId = +currentRoute.value.params.id;
-const arrayData = useArrayData(currentRoute.value.meta.moduleName);
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const invoiceInCorrectionRef = ref();
 const filter = {
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index c435bf368..68dc5be4b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -27,9 +27,9 @@ const quasar = useQuasar();
 const { hasAny } = useRole();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
-const { store } = useArrayData(currentRoute.value.meta.moduleName);
+const arrayData = useArrayData();
 
-const invoiceIn = computed(() => store.data);
+const invoiceIn = computed(() => arrayData.store.data);
 const cardDescriptorRef = ref();
 const correctionDialogRef = ref();
 const entityId = computed(() => $props.id || +currentRoute.value.params.id);
@@ -184,7 +184,7 @@ async function toUnbook() {
         : t('isNotLinked', { bookEntry });
 
     quasar.notify({ type, message });
-    if (!isLinked) store.data.isBooked = false;
+    if (!isLinked) arrayData.store.data.isBooked = false;
 }
 
 async function deleteInvoice() {
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 67c197636..a7b9110f5 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -11,7 +11,8 @@ import { useArrayData } from 'src/composables/useArrayData';
 const { t } = useI18n();
 
 const route = useRoute();
-const currency = computed(() => useArrayData().store.data?.currency?.code);
+const arrayData = useArrayData();
+const currency = computed(() => arrayData.store.data?.currency?.code);
 const invoceInIntrastat = ref([]);
 const rowsSelected = ref([]);
 const countries = ref([]);
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index b7f8adf50..428e7a7a1 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -14,9 +14,10 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 const props = defineProps({ id: { type: [Number, String], default: 0 } });
 const { t } = useI18n();
 const route = useRoute();
+const arrayData = useArrayData();
 
 const entityId = computed(() => props.id || +route.params.id);
-const invoiceIn = computed(() => useArrayData().store.data);
+const invoiceIn = computed(() => arrayData.store.data);
 const currency = computed(() => invoiceIn.value?.currency?.code);
 const invoiceInUrl = ref();
 const amountsNotMatch = ref(null);
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 305d29b8b..155c9eb4c 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -16,6 +16,7 @@ import useCardDescription from 'src/composables/useCardDescription';
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
+import { dashIfEmpty } from 'src/filters';
 
 const $props = defineProps({
     id: {
@@ -182,6 +183,10 @@ const openCloneDialog = async () => {
                     </span>
                 </template>
             </VnLv>
+            <VnLv
+                :label="t('item.descriptor.producer')"
+                :value="dashIfEmpty(entity.subName)"
+            />
             <VnLv
                 v-if="entity.value5"
                 :label="t('item.descriptor.color')"
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 648016c22..97f40b84d 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -56,7 +56,7 @@ const params = reactive({});
 const arrayData = useArrayData('ItemFixedPrices', {
     url: 'FixedPrices/filter',
     userParams: params,
-    order: ['itemFk'],
+    order: ['name ASC', 'itemFk'],
     exprBuilder: exprBuilder,
 });
 const store = arrayData.store;
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index 553f19431..32040ddd6 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -1,11 +1,11 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -16,10 +16,11 @@ const props = defineProps({
 });
 
 const countries = ref();
+const warehouses = ref();
 </script>
-
 <template>
     <FetchData url="Countries" @on-fetch="(data) => (countries = data)" auto-load />
+    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -93,13 +94,13 @@ const countries = ref();
                 <QItemSection v-if="!countries">
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
-                <QItemSection v-if="countries" class="q-mb-sm">
-                    <QSelect
+                <QItemSection v-if="countries">
+                    <VnSelect
                         :label="t('route.cmr.list.country')"
                         v-model="params.country"
                         :options="countries"
-                        option-value="country"
-                        option-label="country"
+                        option-label="name"
+                        option-value="id"
                         transition-show="jump-down"
                         transition-hide="jump-up"
                         emit-value
@@ -111,9 +112,23 @@ const countries = ref();
                         <template #prepend>
                             <QIcon name="flag" size="sm"></QIcon>
                         </template>
-                    </QSelect>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <VnSelect
+                    :label="t('globals.warehouse')"
+                    :options="warehouses"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="params.warehouseFk"
+                    rounded
+                    dense
+                    outlined
+                >
+                </VnSelect>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInputDate
@@ -126,7 +141,6 @@ const countries = ref();
         </template>
     </VnFilterPanel>
 </template>
-
 <i18n>
     en:
         params:
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 154e49977..cbfc3751a 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -14,6 +14,7 @@ const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const selected = ref([]);
+const warehouses = ref([]);
 
 const columns = computed(() => [
     {
@@ -63,6 +64,13 @@ const columns = computed(() => [
         sortable: true,
         headerStyle: 'padding-left: 33px',
     },
+    {
+        name: 'warehouseFk',
+        label: t('globals.warehouse'),
+        field: ({ warehouseFk }) => warehouseFk,
+        align: 'center',
+        sortable: true,
+    },
     {
         name: 'icons',
         align: 'center',
@@ -99,7 +107,7 @@ function downloadPdfs() {
         <div class="list">
             <VnPaginate
                 data-key="CmrList"
-                :url="`Routes/getExternalCmrs`"
+                :url="`Routes/cmrs`"
                 order="cmrFk DESC"
                 limit="null"
                 auto-load
@@ -147,6 +155,11 @@ function downloadPdfs() {
                                 <CustomerDescriptorProxy :id="value" />
                             </QTd>
                         </template>
+                        <template #body-cell-warehouseFk="{ value }">
+                            <QTd align="center">
+                                {{ warehouses.find(({ id }) => id === value)?.name }}
+                            </QTd>
+                        </template>
                         <template #body-cell-icons="{ value }">
                             <QTd align="center">
                                 <a :href="getCmrUrl(value)" target="_blank">
diff --git a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
index 810ef42c8..f20619033 100644
--- a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
+++ b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
@@ -34,7 +34,7 @@ const updateDefaultStop = (data) => {
 const onSave = async () => {
     isLoading.value = true;
     try {
-        await axios.post('ExpeditionTrucks', { ...roadmapStopForm });
+        await axios.post('RoadmapStops', { ...roadmapStopForm });
         emit('ok');
     } finally {
         isLoading.value = false;
diff --git a/src/pages/Route/Roadmap/RoadmapAddStopForm.vue b/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
index 736280e99..6cc21fd4d 100644
--- a/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
+++ b/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
@@ -23,28 +23,43 @@ const props = defineProps({
 });
 
 const { t } = useI18n();
-const warehouseList = ref([]);
+const addressList = ref([]);
 const form = computed(() => props.formData);
 const isDialog = computed(() => props.layout === 'dialog');
+const onFetch = (data) => {
+    addressList.value = data.map((roadmap) => ({
+        id: roadmap.addressFk,
+        nickname: roadmap.address ? roadmap.address.nickname : '',
+    }));
+};
 </script>
+
 <template>
     <FetchData
-        url="Warehouses"
+        url="RoadmapAddresses"
         auto-load
-        :filter="{ fields: ['id', 'name'] }"
-        sort-by="name"
+        :filter="{
+            include: [
+                {
+                    relation: 'address',
+                    scope: {
+                        fields: ['nickname'],
+                    },
+                },
+            ],
+        }"
         limit="30"
-        @on-fetch="(data) => (warehouseList = data)"
+        @on-fetch="onFetch"
     />
     <div :class="[isDialog ? 'column' : 'form-gap', 'full-width flex']">
         <QCardSection class="flex-grow q-px-none flex-1">
             <VnSelect
-                v-model.number="form.warehouseFk"
+                v-model.number="form.addressFk"
                 class="full-width"
-                :label="t('Warehouse')"
-                :options="warehouseList"
+                :label="t('Address')"
+                :options="addressList"
                 option-value="id"
-                option-label="name"
+                option-label="nickname"
                 emit-value
                 map-options
                 use-input
@@ -80,6 +95,7 @@ const isDialog = computed(() => props.layout === 'dialog');
         </QCardSection>
     </div>
 </template>
+
 <style lang="scss" scoped>
 .form-gap {
     gap: 16px;
@@ -93,9 +109,10 @@ const isDialog = computed(() => props.layout === 'dialog');
     flex: 2;
 }
 </style>
+
 <i18n>
 es:
-    Warehouse: Almacén
+    Address: Dirección
     ETA date: Fecha ETA
     ETA hour: Hora ETA
     Description: Descripción
diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index a6c2f7d4d..19b6a1b3d 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -3,7 +3,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModel from 'components/FormModel.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
@@ -22,7 +21,6 @@ const onSave = (data, response) => {
 };
 </script>
 <template>
-    <VnSubToolbar />
     <FetchData
         url="Suppliers"
         auto-load
diff --git a/src/pages/Route/Roadmap/RoadmapCard.vue b/src/pages/Route/Roadmap/RoadmapCard.vue
index d6b02824b..4e8f8dd50 100644
--- a/src/pages/Route/Roadmap/RoadmapCard.vue
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@@ -1,21 +1,17 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
-import RoadmapDescriptor from "pages/Route/Roadmap/RoadmapDescriptor.vue";
-
-const stateStore = useStateStore();
+import VnCard from 'components/common/VnCard.vue';
+import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
+import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <RoadmapDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <RouterView></RouterView>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Roadmap"
+        base-url="Roadmaps"
+        :descriptor="RoadmapDescriptor"
+        :filter-panel="RoadmapFilter"
+        search-data-key="RoadmapList"
+        search-url="Roadmaps"
+        searchbar-label="Search roadmap"
+        searchbar-info="You can search by roadmap id or customer name"
+    />
 </template>
diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
index 5c3bd51e7..8ff044d2d 100644
--- a/src/pages/Route/Roadmap/RoadmapStops.vue
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import FetchData from 'components/FetchData.vue';
 import { ref } from 'vue';
 import CrudModel from 'components/CrudModel.vue';
@@ -23,7 +22,6 @@ const updateDefaultStop = (data) => {
 };
 </script>
 <template>
-    <VnSubToolbar />
     <FetchData
         :url="`Roadmaps/${route.params?.id}`"
         auto-load
@@ -33,9 +31,9 @@ const updateDefaultStop = (data) => {
     <div class="q-pa-lg">
         <CrudModel
             ref="roadmapStopsCrudRef"
-            data-key="ExpeditionTrucks"
-            url="ExpeditionTrucks"
-            model="ExpeditionTrucks"
+            data-key="RoadmapStops"
+            url="RoadmapStops"
+            model="RoadmapStops"
             :filter="{ where: { roadmapFk: route.params?.id } }"
             :default-remove="false"
             :data-required="defaultStop"
@@ -86,7 +84,7 @@ const updateDefaultStop = (data) => {
 </template>
 <i18n>
 es:
-    Warehouse: Almacén
+    Address: Consignatario
     ETA date: Fecha ETA
     ETA hour: Hora ETA
     Description: Descripción
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 9aa8f40d7..e9969c2f7 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -35,9 +35,9 @@ onUnmounted(hideRightDrawer);
 
 const columns = ref([
     {
-        name: 'warehouse',
-        label: t('Warehouse'),
-        field: (row) => dashIfEmpty(row?.warehouse?.name),
+        name: 'address',
+        label: t('Address'),
+        field: (row) => dashIfEmpty(row?.address?.nickname),
         sortable: true,
         align: 'left',
     },
@@ -54,8 +54,17 @@ const filter = {
         { relation: 'supplier' },
         { relation: 'worker' },
         {
-            relation: 'expeditionTruck',
-            scope: { include: [{ relation: 'warehouse' }] },
+            relation: 'roadmapStop',
+            scope: {
+                include: [
+                    {
+                        relation: 'address',
+                        scope: {
+                            fields: ['nickname'],
+                        },
+                    },
+                ],
+            },
         },
     ],
 };
@@ -151,11 +160,9 @@ const openAddStopDialog = () => {
                     </div>
                     <QTable
                         :columns="columns"
-                        :rows="entity?.expeditionTruck"
+                        :rows="entity?.roadmapStop"
                         :rows-per-page-options="[0]"
                         row-key="id"
-                        flat
-                        hide-pagination
                     />
                 </QCard>
             </template>
@@ -171,7 +178,7 @@ es:
     Worker: Trabajador
     Observations: Observaciones
     Stops: Paradas
-    Warehouse: Almacén
+    Address: Dirección
     Go to stops: Ir a paradas
     Add stop: Añadir parada
 </i18n>
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index e26c63881..cecc2b2c3 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -266,9 +266,9 @@ function navigateToRoadmapSummary(event, row) {
 <i18n>
 es:
     Search roadmaps: Buscar troncales
-    You can search by roadmap reference: Puedes buscar por referencia de la troncal
+    You can search by roadmap reference: Puedes buscar por referencia del troncal
     Delete roadmap(s): Eliminar troncal(es)
-    Selected roadmaps will be removed: Las troncales seleccionadas serán eliminadas
+    Selected roadmaps will be removed: Los troncales seleccionadas serán eliminados
     Are you sure you want to continue?: ¿Seguro que quieres continuar?
     The date can't be empty: La fecha no puede estar vacía
     Clone Selected Routes: Clonar rutas seleccionadas
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index f55669619..0715cf7ba 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -35,6 +35,7 @@ const ticket = ref();
 const salesLines = ref(null);
 const editableStates = ref([]);
 const ticketUrl = ref();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -159,6 +160,20 @@ async function changeState(value) {
                     :label="t('ticket.summary.warehouse')"
                     :value="ticket.warehouse?.name"
                 />
+                <VnLv
+                    :label="t('ticket.summary.collection')"
+                    :value="ticket.ticketCollections[0]?.collectionFk"
+                >
+                    <template #value>
+                        <a
+                            :href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${ticket.ticketCollections[0]?.collectionFk}`"
+                            target="_blank"
+                            class="grafana"
+                        >
+                            {{ ticket.ticketCollections[0]?.collectionFk }}
+                        </a>
+                    </template>
+                </VnLv>
                 <VnLv :label="t('ticket.summary.route')" :value="ticket.routeFk" />
                 <VnLv :label="t('ticket.summary.invoice')">
                     <template #value>
@@ -487,4 +502,7 @@ async function changeState(value) {
 .fetched-tags {
     max-width: 70%;
 }
+.grafana {
+    color: $primary-light;
+}
 </style>
diff --git a/src/pages/Worker/Card/WorkerChangePasswordForm.vue b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
new file mode 100644
index 000000000..ef75ba55a
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
@@ -0,0 +1,99 @@
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'src/components/FormPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const emit = defineEmits(['onSubmit']);
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const formData = reactive({
+    newPassword: null,
+    repeatPassword: null,
+});
+
+const passRequirements = ref([]);
+
+const setPassword = async () => {
+    try {
+        if (!formData.newPassword) {
+            notify(t('You must enter a new password'), 'negative');
+            return;
+        }
+
+        if (formData.newPassword != formData.repeatPassword) {
+            notify(t(`Passwords don't match`), 'negative');
+            return;
+        }
+
+        await axios.patch(`Workers/${$props.id}/setPassword`, {
+            newPass: formData.newPassword,
+        });
+        notify(t('Password changed!'), 'positive');
+        emit('onSubmit');
+    } catch (err) {
+        console.error('Error setting password', err);
+    }
+};
+
+const getPassRequirements = async () => {
+    const { data } = await axios.get('UserPasswords/findOne');
+    passRequirements.value = data;
+};
+
+onMounted(async () => await getPassRequirements());
+</script>
+
+<template>
+    <FormPopup :title="t('Reset password')" @on-submit="setPassword()">
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    :label="t('New password')"
+                    v-model="formData.newPassword"
+                    type="password"
+                    :required="true"
+                    :info="
+                        t('passwordRequirements', {
+                            length: passRequirements.length,
+                            nAlpha: passRequirements.nAlpha,
+                            nUpper: passRequirements.nUpper,
+                            nDigits: passRequirements.nDigits,
+                            nPunct: passRequirements.nPunct,
+                        })
+                    "
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    :label="t('Repeat password')"
+                    v-model="formData.repeatPassword"
+                    type="password"
+                />
+            </VnRow>
+        </template>
+    </FormPopup>
+</template>
+
+<i18n>
+es:
+    Reset password: Restablecer contraseña
+    New password: Nueva contraseña
+    Repeat password: Repetir contraseña
+    You must enter a new password: Debes introducir la nueva contraseña
+    Passwords don't match: Las contraseñas no coinciden
+</i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index daa290ea1..86c846aca 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -6,8 +6,10 @@ import { useSession } from 'src/composables/useSession';
 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 WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePasswordForm.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import { useState } from 'src/composables/useState';
+import axios from 'axios';
 
 const $props = defineProps({
     id: {
@@ -25,12 +27,16 @@ const route = useRoute();
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const state = useState();
+const user = state.getUser();
+const changePasswordFormDialog = ref(null);
+const cardDescriptorRef = ref(null);
 
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
 const worker = ref();
+const workerExcluded = ref(false);
 const filter = {
     include: [
         {
@@ -71,14 +77,44 @@ function getWorkerAvatar() {
     const token = getTokenMultimedia();
     return `/api/Images/user/160x160/${entityId.value}/download?access_token=${token}`;
 }
+
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
     data.value = useCardDescription(entity.user.nickname, entity.id);
 };
+
+const openChangePasswordForm = () => changePasswordFormDialog.value.show();
+
+const getIsExcluded = async () => {
+    try {
+        const { data } = await axios.get(
+            `WorkerDisableExcludeds/${entityId.value}/exists`
+        );
+        if (!data) return;
+        workerExcluded.value = data.exists;
+    } catch (err) {
+        console.error('Error getting worker excluded: ', err);
+    }
+};
+
+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 refetch = async () => await cardDescriptorRef.value.getData();
 </script>
 <template>
     <CardDescriptor
+        ref="cardDescriptorRef"
         module="Worker"
         data-key="workerData"
         :url="`Workers/${entityId}`"
@@ -90,9 +126,34 @@ const setData = (entity) => {
             (data) => {
                 worker = data;
                 setData(data);
+                getIsExcluded();
             }
         "
     >
+        <template #menu="{}">
+            <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="openChangePasswordForm()"
+            >
+                <QItemSection>
+                    {{ t('Change password') }}
+                    <QDialog ref="changePasswordFormDialog">
+                        <WorkerChangePasswordForm @on-submit="refetch()" :id="entityId" />
+                    </QDialog>
+                </QItemSection>
+            </QItem>
+        </template>
         <template #before>
             <QImg :src="getWorkerAvatar()" class="photo">
                 <template #error>
@@ -139,3 +200,10 @@ const setData = (entity) => {
     height: 256px;
 }
 </style>
+
+<i18n>
+es:
+    Click to allow the user to be disabled: Marcar para deshabilitar
+    Click to exclude the user from getting disabled: Marcar para no deshabilitar
+    Change password: Cambiar contraseña
+</i18n>
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index d9a650d9a..f466c4f9a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -460,7 +460,7 @@ onMounted(async () => {
                     style="margin-left: 1px"
                 />
             </QBtnGroup>
-            <QBtnGroup push class="q-gutter-x-sm" flat style="margin-left: 0px">
+            <QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
                 <QBtn
                     v-if="reason && state && (isHimSelf || isHr)"
                     :label="t('Reason')"
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 9d962e450..5e81a3070 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -1,59 +1,29 @@
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
+import axios from 'axios';
+import { useUserConfig } from 'src/composables/useUserConfig';
 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 VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-import { useUserConfig } from 'src/composables/useUserConfig';
+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';
 
 const { t } = useI18n();
 
-const workerConfigFilter = {
-    field: ['payMethodFk'],
-};
-
-const newWorkerForm = ref({
-    companyFk: null,
-    payMethodFk: null,
-    firstName: null,
-    lastNames: null,
-    birth: null,
-    fi: null,
-    code: null,
-    phone: null,
-    postcode: null,
-    provinceFk: null,
-    city: null,
-    street: null,
-    name: null,
-    email: null,
-    bossFk: null,
-    iban: null,
-    bankEntityFk: null,
-});
-
 const companiesOptions = ref([]);
 const workersOptions = ref([]);
 const payMethodsOptions = ref([]);
 const bankEntitiesOptions = ref([]);
 const postcodesOptions = ref([]);
-
-const onFetchWorkerConfig = (workerConfig) => {
-    newWorkerForm.value.payMethodFk = workerConfig.payMethodFk;
-};
-
-const onBankEntityCreated = (data) => {
-    bankEntitiesOptions.value.push(data);
-};
+const formData = ref({ isFreelance: false });
+const defaultPayMethod = ref(0);
 
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
@@ -63,20 +33,18 @@ function handleLocation(data, location) {
     data.countryFk = countryFk;
 }
 
-onMounted(async () => {
+onBeforeMount(async () => {
     const userInfo = await useUserConfig().fetch();
-    newWorkerForm.value = { companyFk: userInfo.companyFk };
+    formData.value.companyFk = userInfo.companyFk;
+
+    const { data } = await axios.get('WorkerConfigs/findOne', {
+        params: { field: ['payMethodFk'] },
+    });
+    defaultPayMethod.value = data.payMethodFk;
+    formData.value.payMethodFk = defaultPayMethod.value;
 });
 </script>
-
 <template>
-    <FetchData
-        url="WorkerConfigs/findOne"
-        @on-fetch="(data) => onFetchWorkerConfig(data)"
-        :filter="workerConfigFilter"
-        auto-load
-    />
-
     <FetchData
         url="Companies"
         @on-fetch="(data) => (companiesOptions = data)"
@@ -97,16 +65,31 @@ onMounted(async () => {
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         auto-load
     />
-
     <QPage>
-        <VnSubToolbar />
+        <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="newWorkerForm"
+            :form-initial-data="formData"
+            @on-data-saved="(__, { id }) => $router.push({ path: `/worker/${id}` })"
         >
             <template #form="{ data, validate }">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnInput
                         v-model="data.firstName"
                         :label="t('worker.create.name')"
@@ -117,47 +100,13 @@ onMounted(async () => {
                         :label="t('worker.create.lastName')"
                         :rules="validate('Worker.lastNames')"
                     />
-                    <VnInputDate
-                        v-model="data.birth"
-                        :label="t('worker.create.birth')"
-                        :rules="validate('Worker.birth')"
-                    />
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <VnInput
-                        v-model="data.fi"
-                        :label="t('worker.create.fi')"
-                        :rules="validate('Worker.fi')"
-                    />
                     <VnInput
                         v-model="data.code"
                         :label="t('worker.create.code')"
                         :rules="validate('Worker.code')"
                     />
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('worker.create.phone')"
-                        :rules="validate('Worker.phone')"
-                    />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
-                        v-model="data.location"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                    >
-                    </VnLocation>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <VnInput
-                        :label="t('worker.create.street')"
-                        v-model="data.street"
-                        :rules="validate('Worker.street')"
-                    />
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnInput
                         v-model="data.name"
                         :label="t('worker.create.webUser')"
@@ -169,7 +118,7 @@ onMounted(async () => {
                         :rules="validate('Worker.email')"
                     />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnSelect
                         :label="t('worker.create.company')"
                         v-model="data.companyFk"
@@ -201,7 +150,45 @@ onMounted(async () => {
                         </template>
                     </VnSelect>
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <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('worker.create.phone')"
+                        :rules="validate('Worker.phone')"
+                        :disable="formData.isFreelance"
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnLocation
+                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        v-model="data.location"
+                        @update:model-value="(location) => handleLocation(data, location)"
+                        :disable="formData.isFreelance"
+                    >
+                    </VnLocation>
+                </VnRow>
+                <VnRow>
+                    <VnInput
+                        :label="t('worker.create.street')"
+                        v-model="data.street"
+                        :rules="validate('Worker.street')"
+                        :disable="formData.isFreelance"
+                    />
+                </VnRow>
+                <VnRow>
                     <VnSelect
                         :label="t('worker.create.payMethods')"
                         v-model="data.payMethodFk"
@@ -211,11 +198,14 @@ onMounted(async () => {
                         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"
                     >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
@@ -232,10 +222,11 @@ onMounted(async () => {
                         hide-selected
                         :roles-allowed-to-create="['salesAssistant', 'hr']"
                         :rules="validate('Worker.bankEntity')"
+                        :disable="formData.isFreelance"
                     >
                         <template #form>
                             <CreateBankEntityForm
-                                @on-data-saved="onBankEntityCreated($event)"
+                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
                             />
                         </template>
                         <template #option="scope">
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
new file mode 100644
index 000000000..f947b30e7
--- /dev/null
+++ b/src/pages/Worker/locale/en.yml
@@ -0,0 +1 @@
+passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index a960dffe6..d2478535a 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -1,3 +1,6 @@
 Search worker: Buscar trabajador
 You can search by worker id or name: Puedes buscar por id o nombre del trabajador
 Locker: Taquilla
+Internal: Interno
+External: Externo
+passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
diff --git a/src/pages/Zone/Card/ZoneCalendar.vue b/src/pages/Zone/Card/ZoneCalendar.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/router/index.js b/src/router/index.js
index 7a0aedcae..41ff4c1da 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -13,6 +13,7 @@ import { useRole } from 'src/composables/useRole';
 import { useUserConfig } from 'src/composables/useUserConfig';
 import { toLowerCamel } from 'src/filters';
 import { useTokenConfig } from 'src/composables/useTokenConfig';
+import { useAcl } from 'src/composables/useAcl';
 
 const state = useState();
 const session = useSession();
@@ -55,6 +56,7 @@ export default route(function (/* { store, ssrContext } */) {
             const stateRoles = state.getRoles().value;
             if (stateRoles.length === 0) {
                 await useRole().fetch();
+                await useAcl().fetch();
                 await useUserConfig().fetch();
                 await useTokenConfig().fetch();
             }
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index d8846ede1..f325a8dcd 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -11,7 +11,16 @@ export default {
     component: RouterView,
     redirect: { name: 'AccountMain' },
     menus: {
-        main: ['AccountRoles', 'AccountAcls'],
+        main: [
+            'AccountList',
+            'AccountAliasList',
+            'AccountRoles',
+            'AccountAccounts',
+            'AccountLdap',
+            'AccountSamba',
+            'AccountAcls',
+            'AccountConnections',
+        ],
         card: [],
     },
     children: [
@@ -30,6 +39,63 @@ export default {
                     },
                     component: () => import('src/pages/Account/AccountList.vue'),
                 },
+                {
+                    path: 'role-list',
+                    name: 'AccountRoles',
+                    meta: {
+                        title: 'roles',
+                        icon: 'group',
+                    },
+                    component: () => import('src/pages/Account/Role/AccountRoles.vue'),
+                },
+                {
+                    path: 'alias-list',
+                    name: 'AccountAliasList',
+                    meta: {
+                        title: 'alias',
+                        icon: 'email',
+                    },
+                    component: () => import('src/pages/Account/AccountAliasList.vue'),
+                },
+                {
+                    path: 'connections',
+                    name: 'AccountConnections',
+                    meta: {
+                        title: 'connections',
+                        icon: 'check',
+                    },
+                    component: () => import('src/pages/Account/AccountConnections.vue'),
+                },
+                {
+                    path: 'accounts',
+                    name: 'AccountAccounts',
+                    meta: {
+                        title: 'accounts',
+                        icon: 'accessibility',
+                        roles: ['itManagement'],
+                    },
+                    component: () => import('src/pages/Account/AccountAccounts.vue'),
+                },
+                {
+                    path: 'ldap',
+                    name: 'AccountLdap',
+                    meta: {
+                        title: 'ldap',
+                        icon: 'account_tree',
+                        roles: ['itManagement'],
+                    },
+                    component: () => import('src/pages/Account/AccountLdap.vue'),
+                },
+                {
+                    path: 'samba',
+                    name: 'AccountSamba',
+                    meta: {
+                        title: 'samba',
+                        icon: 'preview',
+                        roles: ['itManagement'],
+                    },
+                    component: () => import('src/pages/Account/AccountSamba.vue'),
+                },
                 {
                     path: 'acls',
                     name: 'AccountAcls',
@@ -44,15 +110,6 @@ export default {
                     name: 'AccountAclForm',
                     component: () => import('src/pages/Account/Acls/AclFormView.vue'),
                 },
-                {
-                    path: 'role-list',
-                    name: 'AccountRoles',
-                    meta: {
-                        title: 'roles',
-                        icon: 'group',
-                    },
-                    component: () => import('src/pages/Account/Role/AccountRoles.vue'),
-                },
             ],
         },
     ],
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 78d4d94cc..bf7e46b00 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -20,6 +20,8 @@ import ItemType from './itemType';
 import Zone from './zone';
 import Account from './account';
 import Monitor from './monitor';
+import MailAlias from './mailAlias';
+import Role from './role';
 
 export default [
     Item,
@@ -43,5 +45,7 @@ export default [
     ItemType,
     Zone,
     Account,
+    MailAlias,
     Monitor,
+    Role,
 ];
diff --git a/src/router/modules/mailAlias.js b/src/router/modules/mailAlias.js
new file mode 100644
index 000000000..8e0f8abdc
--- /dev/null
+++ b/src/router/modules/mailAlias.js
@@ -0,0 +1,57 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: 'account/alias',
+    name: 'Alias',
+    meta: {
+        title: 'alias',
+        icon: 'email',
+        moduleName: 'Alias',
+    },
+    component: RouterView,
+    redirect: { name: 'AccountAliasList' },
+    menus: {
+        main: [],
+        card: ['AliasBasicData', 'AliasUsers'],
+    },
+    children: [
+        {
+            name: 'AliasCard',
+            path: ':id',
+            component: () => import('src/pages/Account/Alias/Card/AliasCard.vue'),
+            redirect: { name: 'AliasSummary' },
+            children: [
+                {
+                    name: 'AliasSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () =>
+                        import('src/pages/Account/Alias/Card/AliasSummary.vue'),
+                },
+                {
+                    name: 'AliasBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Account/Alias/Card/AliasBasicData.vue'),
+                },
+                {
+                    name: 'AliasUsers',
+                    path: 'users',
+                    meta: {
+                        title: 'aliasUsers',
+                        icon: 'group',
+                    },
+                    component: () =>
+                        import('src/pages/Account/Alias/Card/AliasUsers.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/routes.js b/src/router/routes.js
index 8ae50402b..805eefb8c 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -2,14 +2,15 @@ import item from './modules/item';
 import customer from './modules/customer';
 import ticket from './modules/ticket';
 import claim from './modules/claim';
+import route from './modules/route';
 import worker from './modules/worker';
 import invoiceOut from './modules/invoiceOut';
 import invoiceIn from './modules/invoiceIn';
 import wagon from './modules/wagon';
 import supplier from './modules/Supplier';
-import route from './modules/route';
 import travel from './modules/travel';
 import department from './modules/department';
+import role from './modules/role';
 import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
@@ -20,6 +21,7 @@ import agency from 'src/router/modules/agency';
 import zone from 'src/router/modules/zone';
 import account from './modules/account';
 import monitor from 'src/router/modules/monitor';
+import mailAlias from './modules/mailAlias';
 
 const routes = [
     {
@@ -81,6 +83,8 @@ const routes = [
             ItemType,
             zone,
             account,
+            role,
+            mailAlias,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',
diff --git a/test/cypress/integration/worker/workerCreate.spec.js b/test/cypress/integration/worker/workerCreate.spec.js
new file mode 100644
index 000000000..26ce899c8
--- /dev/null
+++ b/test/cypress/integration/worker/workerCreate.spec.js
@@ -0,0 +1,59 @@
+describe('WorkerCreate', () => {
+    const externalRadio = '.q-toolbar .q-radio:nth-child(2)';
+    const notification = '.q-notification__message';
+    const developerBossId = 120;
+
+    const internal = {
+        Fi: { val: '78457139E' },
+        'Web user': { val: 'manolo' },
+        Name: { val: 'Manolo' },
+        'Last name': { val: 'Hurtado' },
+        'Personal email': { val: 'manolo@mydomain.com' },
+        Street: { val: 'S/ DEFAULTWORKERSTREET' },
+        Location: { val: 1, type: 'select' },
+        Phone: { val: '123456789' },
+        'Worker code': { val: 'DWW' },
+        Boss: { val: developerBossId, type: 'select' },
+        Birth: { val: '2022-12-11T23:00:00.000Z', type: 'date', day: 11 },
+    };
+    const external = {
+        Fi: { val: 'Z4531219V' },
+        'Web user': { val: 'pepe' },
+        Name: { val: 'PEPE' },
+        'Last name': { val: 'GARCIA' },
+        'Personal email': { val: 'pepe@gmail.com' },
+        'Worker code': { val: 'PG' },
+        Boss: { val: developerBossId, type: 'select' },
+    };
+
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('hr');
+        cy.visit('/#/worker/create');
+    });
+
+    it('should throw an error if a pay method has not been selected', () => {
+        cy.fillInForm(internal);
+        cy.saveCard();
+        cy.get(notification).should(
+            'contains.text',
+            'That payment method requires an IBAN'
+        );
+    });
+
+    it('should create an internal', () => {
+        cy.fillInForm({
+            ...internal,
+            'Pay method': { val: 'PayMethod one', type: 'select' },
+        });
+        cy.saveCard();
+        cy.get(notification).should('contains.text', 'Data created');
+    });
+
+    it('should create an external', () => {
+        cy.get(externalRadio).click();
+        cy.fillInForm(external);
+        cy.saveCard();
+        cy.get(notification).should('contains.text', 'Data created');
+    });
+});
diff --git a/test/cypress/integration/worker/workerList.spec.js b/test/cypress/integration/worker/workerList.spec.js
index 1e9292626..9808fd157 100644
--- a/test/cypress/integration/worker/workerList.spec.js
+++ b/test/cypress/integration/worker/workerList.spec.js
@@ -8,13 +8,13 @@ describe('WorkerList', () => {
     });
 
     it('should load workers', () => {
-        cy.get(workerFieldNames).eq(0).should('have.text', 'jessicajones');
-        cy.get(workerFieldNames).eq(1).should('have.text', 'brucebanner');
-        cy.get(workerFieldNames).eq(2).should('have.text', 'charlesxavier');
+        cy.get(workerFieldNames).eq(2).should('have.text', 'jessicajones');
+        cy.get(workerFieldNames).eq(3).should('have.text', 'brucebanner');
+        cy.get(workerFieldNames).eq(4).should('have.text', 'charlesxavier');
     });
 
     it('should open the worker summary', () => {
-        cy.openListSummary(0);
+        cy.openListSummary(2);
         cy.get('.summaryHeader div').should('have.text', '1110 - Jessica Jones');
         cy.get('.summary .header-link')
             .eq(0)
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index a237622e6..055cb8021 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -86,6 +86,36 @@ Cypress.Commands.add('selectOption', (selector, option) => {
     cy.get('.q-menu .q-item').contains(option).click();
 });
 
+Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
+    const days = '.q-date__calendar-days .q-date__calendar-item--in';
+    cy.waitForElement('.q-form > .q-card');
+    cy.get(`${form} input`).each(([el]) => {
+        cy.wrap(el)
+            .invoke('attr', 'aria-label')
+            .then((ariaLabel) => {
+                const field = obj[ariaLabel];
+                if (!field) return;
+
+                const { type, val, day } = field;
+                switch (type) {
+                    case 'select':
+                        cy.wrap(el).type(val);
+                        cy.get('.q-menu .q-item').contains(val).click();
+                        break;
+                    case 'date':
+                        cy.wrap(el).click();
+                        cy.get(days)
+                            .eq(day ? day - 1 : 0)
+                            .click();
+                        break;
+                    default:
+                        cy.wrap(el).type(val);
+                        break;
+                }
+            });
+    });
+});
+
 Cypress.Commands.add('checkOption', (selector) => {
     cy.get(selector).find('.q-checkbox__inner').click();
 });
@@ -198,11 +228,15 @@ Cypress.Commands.add('closeSideMenu', (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(
+        '#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input'
+    ).clear();
 });
 
 Cypress.Commands.add('writeSearchbar', (value) => {
-    cy.get('#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input').type(value);
+    cy.get('#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input').type(
+        value
+    );
 });
 Cypress.Commands.add('validateContent', (selector, expectedValue) => {
     cy.get(selector).should('have.text', expectedValue);
diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/test/vitest/__tests__/composables/useAcl.spec.js
new file mode 100644
index 000000000..a2b44b5e7
--- /dev/null
+++ b/test/vitest/__tests__/composables/useAcl.spec.js
@@ -0,0 +1,88 @@
+import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
+import { axios, flushPromises } from 'app/test/vitest/helper';
+import { useAcl } from 'src/composables/useAcl';
+
+describe('useAcl', () => {
+    const acl = useAcl();
+    const mockAcls = [
+        {
+            model: 'Address',
+            property: '*',
+            accessType: '*',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: 'employee',
+        },
+        {
+            model: 'Worker',
+            property: 'holidays',
+            accessType: 'READ',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: 'employee',
+        },
+        {
+            model: 'Url',
+            property: 'getByUser',
+            accessType: 'READ',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: '$everyone',
+        },
+        {
+            model: 'TpvTransaction',
+            property: 'start',
+            accessType: 'WRITE',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: '$authenticated',
+        },
+    ];
+
+    beforeAll(async () => {
+        vi.spyOn(axios, 'get').mockResolvedValue({ data: mockAcls });
+        await acl.fetch();
+    });
+
+    afterAll(async () => await flushPromises());
+
+    describe('hasAny', () => {
+        it('should return false if no roles matched', async () => {
+            expect(acl.hasAny('Worker', 'updateAttributes', 'WRITE')).toBeFalsy();
+        });
+
+        it('should return false if no roles matched', async () => {
+            expect(acl.hasAny('Worker', 'holidays', 'READ')).toBeTruthy();
+        });
+
+        describe('*', () => {
+            it('should return true if an acl matched', async () => {
+                expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy();
+            });
+
+            it('should return false if no acls matched', async () => {
+                expect(acl.hasAny('Worker', '*', 'READ')).toBeFalsy();
+            });
+        });
+
+        describe('$authenticated', () => {
+            it('should return false if no acls matched', async () => {
+                expect(acl.hasAny('Url', 'getByUser', '*')).toBeFalsy();
+            });
+
+            it('should return true if an acl matched', async () => {
+                expect(acl.hasAny('Url', 'getByUser', 'READ')).toBeTruthy();
+            });
+        });
+
+        describe('$everyone', () => {
+            it('should return false if no acls matched', async () => {
+                expect(acl.hasAny('TpvTransaction', 'start', 'READ')).toBeFalsy();
+            });
+
+            it('should return false if an acl matched', async () => {
+                expect(acl.hasAny('TpvTransaction', 'start', 'WRITE')).toBeTruthy();
+            });
+        });
+    });
+});
diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 2292859a9..831acbf18 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -1,5 +1,5 @@
 import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import { axios } from 'app/test/vitest/helper';
 import { useSession } from 'composables/useSession';
 import { useState } from 'composables/useState';
 
@@ -87,13 +87,17 @@ describe('session', () => {
                     },
                 },
             ];
+            beforeEach(() => {
+                vi.spyOn(axios, 'get').mockImplementation((url) => {
+                    if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+                    return Promise.resolve({
+                        data: { roles: rolesData, user: expectedUser },
+                    });
+                });
+            });
 
             it('should fetch the user roles and then set token in the sessionStorage', async () => {
                 const expectedRoles = ['salesPerson', 'admin'];
-                vi.spyOn(axios, 'get').mockResolvedValue({
-                    data: { roles: rolesData, user: expectedUser },
-                });
-
                 const expectedToken = 'mySessionToken';
                 const expectedTokenMultimedia = 'mySessionTokenMultimedia';
                 const keepLogin = false;
@@ -117,10 +121,6 @@ describe('session', () => {
 
             it('should fetch the user roles and then set token in the localStorage', async () => {
                 const expectedRoles = ['salesPerson', 'admin'];
-                vi.spyOn(axios, 'get').mockResolvedValue({
-                    data: { roles: rolesData, user: expectedUser },
-                });
-
                 const expectedToken = 'myLocalToken';
                 const expectedTokenMultimedia = 'myLocalTokenMultimedia';
                 const keepLogin = true;
diff --git a/test/vitest/__tests__/pages/Login/Login.spec.js b/test/vitest/__tests__/pages/Login/Login.spec.js
index 6e2de9870..9b9968736 100644
--- a/test/vitest/__tests__/pages/Login/Login.spec.js
+++ b/test/vitest/__tests__/pages/Login/Login.spec.js
@@ -23,8 +23,9 @@ describe('Login', () => {
             },
         };
         vi.spyOn(axios, 'post').mockResolvedValueOnce({ data: { token: 'token' } });
-        vi.spyOn(axios, 'get').mockResolvedValue({
-            data: { roles: [], user: expectedUser , multimediaToken: {id:'multimediaToken' }},
+        vi.spyOn(axios, 'get').mockImplementation((url) => {
+            if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+            return Promise.resolve({data: { roles: [], user: expectedUser , multimediaToken: {id:'multimediaToken' }}});
         });
         vi.spyOn(vm.quasar, 'notify');