diff --git a/CHANGELOG.md b/CHANGELOG.md
index f589b5e9e..778d04638 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ 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/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/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/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/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..035ba0e8b
--- /dev/null
+++ b/src/pages/Account/Alias/Card/AliasBasicData.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const route = useRoute();
+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..babedae70 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
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index 7ba81b583..36125f361 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -57,6 +57,18 @@ 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:
     enableSync: Habilitar sincronización
     server: Servidor
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/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/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/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 9d962e450..ebde15b72 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/es.yml b/src/pages/Worker/locale/es.yml
index a960dffe6..f74cb4fdb 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -1,3 +1,5 @@
 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
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/modules/account.js b/src/router/modules/account.js
index d8846ede1..bc95719ef 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'AccountMain' },
     menus: {
-        main: ['AccountRoles', 'AccountAcls'],
+        main: ['AccountList', 'AccountAliasList', 'AccountRoles', 'AccountAcls'],
         card: [],
     },
     children: [
@@ -30,6 +30,15 @@ export default {
                     },
                     component: () => import('src/pages/Account/AccountList.vue'),
                 },
+                {
+                    path: 'alias-list',
+                    name: 'AccountAliasList',
+                    meta: {
+                        title: 'alias',
+                        icon: 'email',
+                    },
+                    component: () => import('src/pages/Account/AccountAliasList.vue'),
+                },
                 {
                     path: 'acls',
                     name: 'AccountAcls',
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..8d5202dda 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -2,12 +2,12 @@ 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 ItemType from './modules/itemType';
@@ -20,6 +20,8 @@ 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';
+import role from './modules/role';
 
 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);