diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f493764a..c97c4181f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2418.01]
+
 ## [2416.01] - 2024-04-18
 
 ### Added
diff --git a/package.json b/package.json
index 82f21efe6..88f430d7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.16.0",
+    "version": "24.18.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 2d8886610..718d087fe 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -78,6 +78,7 @@ defineExpose({
             <div class="q-mt-lg row justify-end">
                 <QBtn
                     :label="t('globals.save')"
+                    :title="t('globals.save')"
                     type="submit"
                     color="primary"
                     :disabled="isLoading"
@@ -85,6 +86,7 @@ defineExpose({
                 />
                 <QBtn
                     :label="t('globals.cancel')"
+                    :title="t('globals.cancel')"
                     type="reset"
                     color="primary"
                     flat
diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index bf3f4d384..76864f026 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -198,11 +198,13 @@ function addDefaultData(data) {
 en:
     contentTypesInfo: Allowed file types {allowedContentTypes}
     EntryDmsDescription: Reference {reference}
+    WorkersDescription: Working of employee id {reference}
     SupplierDmsDescription: Reference {reference}
 es:
     Generate identifier for original file: Generar identificador para archivo original
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     EntryDmsDescription: Referencia {reference}
+    WorkersDescription: Laboral del empleado {reference}
     SupplierDmsDescription: Referencia {reference}
 
 </i18n>
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 23e00f5d9..f70146c58 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -5,9 +5,11 @@ import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
 import axios from 'axios';
 
-import FetchData from 'components/FetchData.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnUserLink from '../ui/VnUserLink.vue';
 import { downloadFile } from 'src/composables/downloadFile';
 
 const route = useRoute();
@@ -26,6 +28,15 @@ const $props = defineProps({
         type: String,
         default: null,
     },
+    deleteModel: {
+        type: String,
+        default: null,
+    },
+    downloadModel: {
+        type: String,
+        required: false,
+        default: null,
+    },
     defaultDmsCode: {
         type: String,
         required: true,
@@ -74,7 +85,7 @@ const dmsFilter = {
             ],
         },
     },
-    order: ['dmsFk DESC'],
+    where: { [$props.filter]: route.params.id },
 };
 
 const columns = computed(() => [
@@ -94,12 +105,12 @@ const columns = computed(() => [
         props: (prop) => ({
             readonly: true,
             borderless: true,
-            'model-value': prop.row.dmsType.name,
+            'model-value': prop.row.dmsType?.name,
         }),
     },
     {
         align: 'left',
-        field: 'order',
+        field: 'hardCopyNumber',
         label: t('globals.order'),
         name: 'order',
         component: 'span',
@@ -117,6 +128,7 @@ const columns = computed(() => [
         label: t('globals.description'),
         name: 'description',
         component: 'span',
+        props: (prop) => ({ value: prop.value?.toUpperCase() }),
     },
     {
         align: 'left',
@@ -136,21 +148,53 @@ const columns = computed(() => [
         name: 'file',
         component: 'span',
     },
+    {
+        align: 'left',
+        field: 'worker',
+        label: t('globals.worker'),
+        name: 'worker',
+        component: VnUserLink,
+        props: (prop) => ({
+            name: prop.row.worker?.user?.name.toLowerCase(),
+            workerId: prop.row.worker?.id,
+        }),
+    },
+    {
+        align: 'left',
+        field: 'created',
+        label: t('globals.created'),
+        name: 'created',
+        component: VnInputDate,
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.row.created,
+        }),
+    },
     {
         field: 'options',
         name: 'options',
         components: [
             {
                 component: QBtn,
+                name: 'download',
+                isDocuware: true,
                 props: () => ({
                     icon: 'cloud_download',
                     flat: true,
                     color: 'primary',
                 }),
-                click: (prop) => downloadFile(prop.row.id),
+                click: (prop) =>
+                    downloadFile(
+                        prop.row.id,
+                        $props.downloadModel,
+                        null,
+                        prop.row.download
+                    ),
             },
             {
                 component: QBtn,
+                name: 'edit',
+                external: false,
                 props: () => ({
                     icon: 'edit',
                     flat: true,
@@ -160,6 +204,8 @@ const columns = computed(() => [
             },
             {
                 component: QBtn,
+                name: 'delete',
+                external: false,
                 props: () => ({
                     icon: 'delete',
                     flat: true,
@@ -167,12 +213,24 @@ const columns = computed(() => [
                 }),
                 click: (prop) => deleteDms(prop.row.id),
             },
+            {
+                component: QBtn,
+                name: 'open',
+                external: true,
+                props: () => ({
+                    icon: 'open_in_new',
+                    flat: true,
+                    color: 'primary',
+                }),
+                click: (prop) => open(prop.row.url),
+            },
         ],
     },
 ]);
 
 function setData(data) {
-    const newData = data.map((value) => value.dms);
+    const newData = data.map((value) => value.dms || value);
+    newData.sort((a, b) => new Date(b.created) - new Date(a.created));
     rows.value = newData;
 }
 
@@ -186,7 +244,7 @@ function deleteDms(dmsFk) {
             },
         })
         .onOk(async () => {
-            await axios.post(`${$props.model}/${dmsFk}/removeFile`);
+            await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
             const index = rows.value.findIndex((row) => row.id == dmsFk);
             rows.value.splice(index, 1);
         });
@@ -206,84 +264,106 @@ function parseDms(data) {
     }
     return data;
 }
+
+async function open(url) {
+    window.open(url).focus();
+}
+
+function shouldRenderButton(button, isExternal = false) {
+    if (button.name == 'download') return true;
+    return button.external === isExternal;
+}
 </script>
 <template>
-    <FetchData
+    <VnPaginate
         ref="dmsRef"
+        :data-key="$props.model"
         :url="$props.model"
         :filter="dmsFilter"
-        :where="{ [$props.filter]: route.params.id }"
+        :order="['dmsFk DESC']"
+        :auto-load="true"
         @on-fetch="setData"
-        auto-load
-    />
-    <QTable
-        :columns="columns"
-        :rows="rows"
-        class="full-width q-mt-md"
-        hide-bottom
-        row-key="clientFk"
-        :grid="$q.screen.lt.sm"
     >
-        <template #body-cell="props">
-            <QTd :props="props">
-                <QTr :props="props">
-                    <component
-                        v-if="props.col.component"
-                        :is="props.col.component"
-                        v-bind="props.col.props && props.col.props(props)"
-                    >
-                        <span
-                            v-if="props.col.component == 'span'"
-                            style="white-space: wrap"
-                            >{{ props.value }}</span
-                        >
-                    </component>
-                </QTr>
-
-                <div class="flex justify-center" v-if="props.col.name == 'options'">
-                    <div v-for="button of props.col.components" :key="button.id">
-                        <component
-                            :is="button.component"
-                            v-bind="button.props(props)"
-                            @click="button.click(props)"
-                        />
-                    </div>
-                </div>
-            </QTd>
-        </template>
-        <template #item="props">
-            <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
-                <QCard
-                    bordered
-                    flat
-                    @keyup.ctrl.enter.stop="claimDevelopmentForm?.saveChanges()"
-                >
-                    <QSeparator />
-                    <QList dense>
-                        <QItem v-for="col in props.cols" :key="col.name">
-                            <div v-if="col.name != 'options'" class="row">
-                                <span class="labelColor">{{ col.label }}:</span>
-                                <span>{{ col.value }}</span>
-                            </div>
-                            <div v-if="col.name == 'options'" class="row">
-                                <div
-                                    v-for="button of col.components"
-                                    :key="button.id"
-                                    class="row"
+        <template #body>
+            <QTable
+                :columns="columns"
+                :rows="rows"
+                class="full-width q-mt-md"
+                hide-bottom
+                row-key="clientFk"
+                :grid="$q.screen.lt.sm"
+            >
+                <template #body-cell="props">
+                    <QTd :props="props">
+                        <QTr :props="props">
+                            <component
+                                v-if="props.col.component"
+                                :is="props.col.component"
+                                v-bind="props.col.props && props.col.props(props)"
+                            >
+                                <span
+                                    v-if="props.col.component == 'span'"
+                                    style="white-space: wrap"
+                                    >{{ props.value }}</span
                                 >
-                                    <component
-                                        :is="button.component"
-                                        v-bind="button.props(col)"
-                                        @click="button.click(col)"
-                                    />
-                                </div>
+                            </component>
+                        </QTr>
+
+                        <div class="row no-wrap" v-if="props.col.name == 'options'">
+                            <div v-for="button of props.col.components" :key="button.id">
+                                <component
+                                    v-if="
+                                        shouldRenderButton(button, props.row.isDocuware)
+                                    "
+                                    :is="button.component"
+                                    v-bind="button.props(props)"
+                                    @click="button.click(props)"
+                                />
                             </div>
-                        </QItem>
-                    </QList>
-                </QCard>
-            </div>
+                        </div>
+                    </QTd>
+                </template>
+                <template #item="props">
+                    <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
+                        <QCard
+                            bordered
+                            flat
+                            @keyup.ctrl.enter.stop="claimDevelopmentForm?.saveChanges()"
+                        >
+                            <QSeparator />
+                            <QList dense>
+                                <QItem v-for="col in props.cols" :key="col.name">
+                                    <div v-if="col.name != 'options'" class="row">
+                                        <span class="labelColor">{{ col.label }}:</span>
+                                        <span>{{ col.value }}</span>
+                                    </div>
+                                    <div v-if="col.name == 'options'" class="row">
+                                        <div
+                                            v-for="button of col.components"
+                                            :key="button.id"
+                                            class="row"
+                                        >
+                                            <component
+                                                v-if="
+                                                    shouldRenderButton(
+                                                        button.name,
+                                                        props.row.isDocuware
+                                                    )
+                                                "
+                                                :is="button.component"
+                                                v-bind="button.props(col)"
+                                                @click="button.click(col)"
+                                            />
+                                        </div>
+                                    </div>
+                                </QItem>
+                            </QList>
+                        </QCard>
+                    </div>
+                </template>
+            </QTable>
         </template>
-    </QTable>
+    </VnPaginate>
     <QDialog v-model="formDialog.show">
         <VnDms
             :model="updateModel ?? model"
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index d1b2f5ccb..b259bf8be 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -61,7 +61,6 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate']);
-defineExpose({ fetch });
 const isLoading = ref(false);
 const pagination = ref({
     sortBy: props.order,
@@ -78,6 +77,7 @@ const arrayData = useArrayData(props.dataKey, {
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
 });
+const hasMoreData = ref();
 const store = arrayData.store;
 
 onMounted(() => {
@@ -91,6 +91,10 @@ watch(
     }
 );
 
+const addFilter = async (filter, params) => {
+    await arrayData.addFilter({ filter, params });
+};
+
 async function fetch() {
     await arrayData.fetch({ append: false });
     if (!arrayData.hasMoreData.value) {
@@ -106,11 +110,10 @@ async function paginate() {
 
     isLoading.value = true;
     await arrayData.loadMore();
-
     if (!arrayData.hasMoreData.value) {
         if (store.userParamsChanged) arrayData.hasMoreData.value = true;
         store.userParamsChanged = false;
-        isLoading.value = false;
+        endPagination();
         return;
     }
 
@@ -120,12 +123,15 @@ async function paginate() {
     pagination.value.sortBy = sortBy;
     pagination.value.descending = descending;
 
-    isLoading.value = false;
+    endPagination();
+}
 
+function endPagination() {
+    hasMoreData.value = arrayData.hasMoreData.value;
+    isLoading.value = false;
     emit('onFetch', store.data);
     emit('onPaginate');
 }
-
 async function onLoad(index, done) {
     if (!store.data) {
         return done();
@@ -140,6 +146,8 @@ async function onLoad(index, done) {
     if (store.userParamsChanged) isDone = !arrayData.hasMoreData.value;
     done(isDone);
 }
+
+defineExpose({ fetch, addFilter });
 </script>
 
 <template>
@@ -188,6 +196,9 @@ async function onLoad(index, done) {
             <QSpinner color="orange" size="md" />
         </div>
     </QInfiniteScroll>
+    <div v-if="!isLoading && hasMoreData" class="w-full flex justify-center q-mt-md">
+        <QBtn color="primary" :label="t('Load more data')" @click="paginate()" />
+    </div>
 </template>
 
 <style lang="scss" scoped>
@@ -204,4 +215,5 @@ async function onLoad(index, done) {
 es:
     No data to display: Sin datos que mostrar
     No results found: No se han encontrado resultados
+    Load more data: Cargar más resultados
 </i18n>
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 9a99124c6..13aa05635 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -76,7 +76,7 @@ const removeNode = (node) => {
                 notify(t('department.departmentRemoved'), 'positive');
                 await fetchNodeLeaves(parentFk);
             } catch (err) {
-                console.log('Error removing department');
+                console.error('Error removing department');
             }
         });
 };
diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index 33836550a..47287c12b 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -1,5 +1,6 @@
 <script setup>
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import { useI18n } from 'vue-i18n';
 
 const $props = defineProps({
diff --git a/src/composables/downloadFile.js b/src/composables/downloadFile.js
index b26dec731..12639dcd6 100644
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@@ -1,11 +1,11 @@
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from './getUrl';
 
-const {getTokenMultimedia} = useSession();
-const token =  getTokenMultimedia();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 
-export async function downloadFile(dmsId) {
+export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
     let appUrl = await getUrl('', 'lilium');
     appUrl = appUrl.replace('/#/', '');
-    window.open(`${appUrl}/api/dms/${dmsId}/downloadFile?access_token=${token}`);
+    window.open(url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`);
 }
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 2c5a579c8..093806567 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -97,7 +97,7 @@ export function useArrayData(key, userOptions) {
 
         const { limit } = filter;
 
-        hasMoreData.value = response.data.length === limit;
+        hasMoreData.value = response.data.length >= limit;
 
         if (append) {
             if (!store.data) store.data = [];
@@ -144,6 +144,8 @@ export function useArrayData(key, userOptions) {
         store.userParams = userParams;
         store.skip = 0;
         store.filter.skip = 0;
+        page.value = 1;
+
         await fetch({ append: false });
         return { filter, params };
     }
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 77202b722..ef9c2c4cd 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -88,6 +88,8 @@ globals:
         basicData: Basic data
         log: Logs
         parkingList: Parkings list
+    created: Created
+    worker: Worker
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -500,6 +502,7 @@ claim:
         commercial: Commercial
         province: Province
         zone: Zone
+        customerId: client ID
     summary:
         customer: Customer
         assignedTo: Assigned
@@ -531,7 +534,7 @@ claim:
         assignedTo: Assigned
         created: Created
         state: State
-        picked: Picked
+        pickup: Pick up
     photo:
         fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
         noData: 'There are no images/videos, click here or drag and drop the file'
@@ -782,6 +785,9 @@ worker:
         workerCreate: New worker
         department: Department
         pda: PDA
+        notes: Notas
+        dms: My documentation
+        pbx: Private Branch Exchange
         log: Log
     list:
         name: Name
@@ -1090,6 +1096,7 @@ item:
         list: List
         diary: Diary
         tags: Tags
+        create: Create
     descriptor:
         item: Item
         buyer: Buyer
@@ -1100,6 +1107,23 @@ item:
         available: Available
         warehouseText: 'Calculated on the warehouse of { warehouseName }'
         itemDiary: Item diary
+    list:
+        id: Identifier
+        grouping: Grouping
+        packing: Packing
+        description: Description
+        stems: Stems
+        category: Category
+        typeName: Type
+        intrastat: Intrastat
+        isActive: Active
+        size: Size
+        origin: Origin
+        userName: Buyer
+        weightByPiece: Weight/Piece
+        stemMultiplier: Multiplier
+        producer: Producer
+        landed: Landed
 components:
     topbar: {}
     userPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 2c17480b3..d0de39ebc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -88,6 +88,8 @@ globals:
     basicData: Datos básicos
     log: Historial
     parkingList: Listado de parkings
+  created: Fecha creación
+  worker: Trabajador
 errors:
   statusUnauthorized: Acceso denegado
   statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -497,6 +499,7 @@ claim:
     commercial: Comercial
     province: Provincia
     zone: Zona
+    customerId: ID del cliente
   summary:
     customer: Cliente
     assignedTo: Asignada a
@@ -528,7 +531,10 @@ claim:
     assignedTo: Asignada a
     created: Creada
     state: Estado
-    picked: Recogida
+    pickup: Recogida
+    null: No
+    agency: Agencia
+    delivery: Reparto
   photo:
     fileDescription: 'Reclamacion ID {claimId} del cliente {clientName} id {clientId}'
     noData: No hay imágenes/videos haz click aquí o arrastra y suelta el archivo
@@ -776,6 +782,9 @@ worker:
     workerCreate: Nuevo trabajador
     department: Departamentos
     pda: PDA
+    notes: Notas
+    dms: Mi documentación
+    pbx: Centralita
     log: Historial
   list:
     name: Nombre
@@ -1084,6 +1093,7 @@ item:
     list: Listado
     diary: Histórico
     tags: Etiquetas
+    create: Crear
   descriptor:
     item: Artículo
     buyer: Comprador
@@ -1094,6 +1104,23 @@ item:
     available: Disponible
     warehouseText: 'Calculado sobre el almacén de { warehouseName }'
     itemDiary: Registro de compra-venta
+  list:
+    id: Identificador
+    grouping: Grouping
+    packing: Packing
+    description: Descripción
+    stems: Tallos
+    category: Reino
+    typeName: Tipo
+    intrastat: Intrastat
+    isActive: Activo
+    size: Medida
+    origin: Origen
+    weightByPiece: Peso (gramos)/tallo
+    userName: Comprador
+    stemMultiplier: Multiplicador
+    producer: Productor
+    landed: F. entrega
 components:
   topbar: {}
   userPanel:
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 19e3f00ef..427943861 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -12,6 +12,7 @@ import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -177,7 +178,7 @@ function openDialog(dmsId) {
         @on-fetch="getClaimDms"
     >
         <template #header="{ entity: { claim } }">
-            {{ claim.id }} - {{ claim.client.name }}
+            {{ claim.id }} - {{ claim.client.name }} ({{ claim.client.id }})
         </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
             <QCard class="vn-one">
@@ -214,10 +215,10 @@ function openDialog(dmsId) {
                 </VnLv>
                 <VnLv :label="t('claim.summary.customer')">
                     <template #value>
-                        <VnUserLink
-                            :name="claim.client?.name"
-                            :worker-id="claim.client?.id"
-                        />
+                        <span class="link cursor-pointer">
+                            {{ claim.client?.name }}
+                            <CustomerDescriptorProxy :id="claim.clientFk" />
+                        </span>
                     </template>
                 </VnLv>
                 <VnLv
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
index 7049d4145..e60a8c91b 100644
--- a/src/pages/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -63,7 +63,7 @@ const removeDepartment = () => {
                 router.push({ name: 'WorkerDepartment' });
                 notify('department.departmentRemoved', 'positive');
             } catch (err) {
-                console.log('Error removing department');
+                console.error('Error removing department');
             }
         });
 };
diff --git a/src/pages/Item/ItemCreate.vue b/src/pages/Item/ItemCreate.vue
new file mode 100644
index 000000000..e20f67ac3
--- /dev/null
+++ b/src/pages/Item/ItemCreate.vue
@@ -0,0 +1 @@
+<template>Item create view</template>
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 49a5dbb64..3e399e29f 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -1 +1,577 @@
-<template>Item list</template>
+<script setup>
+import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import ItemSummary from '../Item/Card/ItemSummary.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { toDateFormat } from 'src/filters/date.js';
+import { useSession } from 'composables/useSession';
+import { dashIfEmpty } from 'src/filters';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import axios from 'axios';
+
+const router = useRouter();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+const itemTypesOptions = ref([]);
+const originsOptions = ref([]);
+const buyersOptions = ref([]);
+const intrastatOptions = ref([]);
+const itemCategoriesOptions = ref([]);
+const visibleColumns = ref([]);
+const allColumnNames = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'category':
+            return { 'ic.name': value };
+        case 'buyerFk':
+            return { 'it.workerFk': value };
+        case 'grouping':
+            return { 'b.grouping': value };
+        case 'packing':
+            return { 'b.packing': value };
+        case 'origin':
+            return { 'ori.code': value };
+        case 'typeFk':
+            return { 'i.typeFk': value };
+        case 'intrastat':
+            return { 'intr.description': value };
+        case 'name':
+            return { 'i.name': { like: `%${value}%` } };
+        case 'producer':
+            return { 'pr.name': { like: `%${value}%` } };
+        case 'id':
+        case 'size':
+        case 'subname':
+        case 'isActive':
+        case 'weightByPiece':
+        case 'stemMultiplier':
+        case 'stems':
+            return { [`i.${param}`]: value };
+    }
+};
+
+const params = reactive({});
+
+const applyColumnFilter = async (col) => {
+    try {
+        const paramKey = col.columnFilter?.filterParamKey || col.field;
+        params[paramKey] = col.columnFilter.filterValue;
+        await paginateRef.value.addFilter(null, params);
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
+
+const getInputEvents = (col) => {
+    return col.columnFilter.type === 'select'
+        ? { 'update:modelValue': () => applyColumnFilter(col) }
+        : {
+              'keyup.enter': () => applyColumnFilter(col),
+          };
+};
+
+const columns = computed(() => [
+    {
+        label: '',
+        name: 'picture',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('item.list.id'),
+        name: 'id',
+        field: 'id',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('item.list.grouping'),
+        field: 'grouping',
+        name: 'grouping',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('item.list.packing'),
+        field: 'packing',
+        name: 'packing',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('globals.description'),
+        field: 'name',
+        name: 'description',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('item.list.stems'),
+        field: 'stems',
+        name: 'stems',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('item.list.size'),
+        field: 'size',
+        name: 'size',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('item.list.typeName'),
+        field: 'typeName',
+        name: 'typeName',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelectFilter,
+            filterParamKey: 'typeFk',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemTypesOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+    },
+
+    {
+        label: t('item.list.category'),
+        field: 'category',
+        name: 'category',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemCategoriesOptions.value,
+                'option-value': 'name',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+    },
+
+    {
+        label: t('item.list.intrastat'),
+        field: 'intrastat',
+        name: 'intrastat',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: intrastatOptions.value,
+                'option-value': 'description',
+                'option-label': 'description',
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('item.list.origin'),
+        field: 'origin',
+        name: 'origin',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: originsOptions.value,
+                'option-value': 'code',
+                'option-label': 'code',
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('item.list.userName'),
+        field: 'userName',
+        name: 'userName',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelectFilter,
+            filterParamKey: 'buyerFk',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: buyersOptions.value,
+                'option-value': 'id',
+                'option-label': 'nickname',
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('item.list.weightByPiece'),
+        field: 'weightByPiece',
+        name: 'weightByPiece',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('item.list.stemMultiplier'),
+        field: 'stemMultiplier',
+        name: 'stemMultiplier',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('item.list.isActive'),
+        field: 'isActive',
+        name: 'isActive',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('item.list.producer'),
+        field: 'producer',
+        name: 'producer',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('item.list.landed'),
+        field: 'landed',
+        name: 'landed',
+        align: 'left',
+        sortable: true,
+        format: (val) => dashIfEmpty(toDateFormat(val)),
+        columnFilter: null,
+    },
+    {
+        label: '',
+        name: 'actions',
+        align: 'left',
+        columnFilter: null,
+    },
+]);
+
+const redirectToItemCreate = () => {
+    router.push({ name: 'ItemCreate' });
+};
+
+const redirectToItemSummary = (id) => {
+    router.push({ name: 'ItemSummary', params: { id } });
+};
+
+const cloneItem = async (itemFk) => {
+    try {
+        const { data } = await axios.post(`Items/${itemFk}/clone`);
+        if (!data) return;
+        router.push({ name: 'ItemTags', params: { id: data.id } });
+    } catch (err) {
+        console.error('Error cloning item', err);
+    }
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    const filteredColumns = columns.value.filter(
+        (col) => col.name !== 'picture' && col.name !== 'actions'
+    );
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        url="ItemTypes"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        auto-load
+        @on-fetch="(data) => (itemTypesOptions = data)"
+    />
+    <FetchData
+        url="ItemCategories"
+        :filter="{ fields: ['name'], order: 'name ASC' }"
+        auto-load
+        @on-fetch="(data) => (itemCategoriesOptions = data)"
+    />
+    <FetchData
+        url="Intrastats"
+        :filter="{ fields: ['description'], order: 'description ASC' }"
+        auto-load
+        @on-fetch="(data) => (intrastatOptions = data)"
+    />
+    <FetchData
+        url="Origins"
+        :filter="{ fields: ['code'], order: 'code ASC' }"
+        auto-load
+        @on-fetch="(data) => (originsOptions = data)"
+    />
+    <FetchData
+        url="TicketRequests/getItemTypeWorker"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
+        auto-load
+        @on-fetch="(data) => (buyersOptions = data)"
+    />
+
+    <QToolbar class="bg-vn-dark justify-end">
+        <div id="st-data">
+            <TableVisibleColumns
+                :all-columns="allColumnNames"
+                table-code="itemsIndex"
+                labels-traductions-path="item.list"
+                @on-config-saved="visibleColumns = ['picture', ...$event, 'actions']"
+            />
+        </div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+    <QPage class="column items-center q-pa-md">
+        <VnPaginate
+            ref="paginateRef"
+            data-key="ItemList"
+            url="Items/filter"
+            :order="['isActive DESC', 'name', 'id']"
+            :limit="12"
+            :expr-builder="exprBuilder"
+            :user-params="params"
+            :offset="50"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QTable
+                    :rows="rows"
+                    :columns="columns"
+                    row-key="id"
+                    :pagination="{ rowsPerPage: 0 }"
+                    class="full-width q-mt-md"
+                    :visible-columns="visibleColumns"
+                    :no-data-label="t('globals.noResults')"
+                    @row-click="(_, row) => redirectToItemSummary(row.id)"
+                >
+                    <template #top-row="{ cols }">
+                        <QTr>
+                            <QTd
+                                v-for="(col, index) in cols"
+                                :key="index"
+                                style="max-width: 100px"
+                            >
+                                <component
+                                    :is="col.columnFilter.component"
+                                    v-if="col.columnFilter"
+                                    v-model="col.columnFilter.filterValue"
+                                    v-bind="col.columnFilter.attrs"
+                                    v-on="col.columnFilter.event(col)"
+                                    dense
+                                />
+                            </QTd>
+                        </QTr>
+                    </template>
+                    <template #body-cell-picture="{ row }">
+                        <QTd>
+                            <QImg
+                                :src="`/api/Images/catalog/50x50/${row.id}/download?access_token=${token}`"
+                                spinner-color="primary"
+                                :ratio="1"
+                                height="50px"
+                                width="50px"
+                                class="image"
+                            />
+                        </QTd>
+                    </template>
+                    <template #body-cell-id="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary">
+                                {{ row.id }}
+                            </QBtn>
+                            <ItemDescriptorProxy :id="row.id" />
+                        </QTd>
+                    </template>
+                    <template #body-cell-userName="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary" dense>
+                                {{ row.userName }}
+                            </QBtn>
+                            <WorkerDescriptorProxy :id="row.buyerFk" />
+                        </QTd>
+                    </template>
+                    <template #body-cell-description="{ row }">
+                        <QTd class="col">
+                            <span>{{ row.name }} {{ row.subName }}</span>
+                            <fetched-tags :item="row" :max-length="6" />
+                        </QTd>
+                    </template>
+                    <template #body-cell-isActive="{ row }">
+                        <QTd>
+                            <QCheckbox :model-value="!!row.isActive" disable />
+                        </QTd>
+                    </template>
+                    <template #body-cell-actions="{ row }">
+                        <QTd>
+                            <QIcon
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t(`All it's properties will be copied`),
+                                        t('Do you want to clone this item?'),
+                                        () => cloneItem(row.id)
+                                    )
+                                "
+                                class="q-ml-sm"
+                                color="primary"
+                                name="vn:clone"
+                                size="sm"
+                            >
+                                <QTooltip>
+                                    {{ t('Clone') }}
+                                </QTooltip>
+                            </QIcon>
+                            <QIcon
+                                @click.stop="viewSummary(row.id, ItemSummary)"
+                                class="q-ml-md"
+                                color="primary"
+                                name="preview"
+                                size="sm"
+                            >
+                                <QTooltip class="text-no-wrap">
+                                    {{ t('Preview') }}
+                                </QTooltip>
+                            </QIcon>
+                        </QTd>
+                    </template>
+                </QTable>
+            </template>
+        </VnPaginate>
+
+        <QPageSticky :offset="[20, 20]">
+            <QBtn @click="redirectToItemCreate()" color="primary" fab icon="add" />
+            <QTooltip class="text-no-wrap">
+                {{ t('New item') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    New item: Nuevo artículo
+    All it's properties will be copied: Todas sus propiedades serán copiadas
+    Do you want to clone this item?: ¿Desea clonar este artículo?
+    Clone: Clonar
+    Preview: Vista previa
+</i18n>
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 1c770194a..60e86d04e 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -61,7 +61,7 @@ const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
     data.value = useCardDescription(entity.client.name, entity.id);
-    state.set('ClaimDescriptor', entity);
+    state.set('OrderDescriptor', entity);
 };
 
 const getConfirmationValue = (isConfirmed) => {
diff --git a/src/pages/Worker/Card/WorkerDms.vue b/src/pages/Worker/Card/WorkerDms.vue
new file mode 100644
index 000000000..a4f7ef5a9
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerDms.vue
@@ -0,0 +1,15 @@
+<script setup>
+import VnDmsList from 'src/components/common/VnDmsList.vue';
+import { useRoute } from 'vue-router';
+const route = useRoute();
+</script>
+<template>
+    <VnDmsList
+        :model="`WorkerDms/${route.params.id}/filter`"
+        update-model="Workers"
+        delete-model="WorkerDms"
+        download-model="WorkerDms"
+        default-dms-code="hhrrData"
+        filter="worker"
+    />
+</template>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index d3462e15c..d16022f79 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ItemMain' },
     menus: {
-        main: [],
+        main: ['ItemList'],
         card: [],
     },
     children: [
@@ -18,7 +18,7 @@ export default {
             path: '',
             name: 'ItemMain',
             component: () => import('src/pages/Item/ItemMain.vue'),
-            redirect: { name: 'Itemlist' },
+            redirect: { name: 'ItemList' },
             children: [
                 {
                     path: 'list',
@@ -29,6 +29,14 @@ export default {
                     },
                     component: () => import('src/pages/Item/ItemList.vue'),
                 },
+                {
+                    path: 'create',
+                    name: 'ItemCreate',
+                    meta: {
+                        title: 'create',
+                    },
+                    component: () => import('src/pages/Item/ItemCreate.vue'),
+                },
             ],
         },
         {
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 68f096220..4af2eea50 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -19,6 +19,7 @@ export default {
             'WorkerNotificationsManager',
             'WorkerPBX',
             'WorkerLog',
+            'WorkerDms',
         ],
         departmentCard: ['BasicData'],
     },
@@ -127,6 +128,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/Card/WorkerPBX.vue'),
                 },
+                {
+                    name: 'WorkerDms',
+                    path: 'dms',
+                    meta: {
+                        title: 'dms',
+                        icon: 'cloud_upload',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerDms.vue'),
+                },
                 {
                     name: 'WorkerLog',
                     path: 'log',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index afd3af0c0..f075301f6 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -7,6 +7,7 @@ import routes from 'src/router/modules';
 
 export const useNavigationStore = defineStore('navigationStore', () => {
     const modules = [
+        'item',
         'shelving',
         'order',
         'customer',
diff --git a/test/cypress/integration/entry/entryDms.spec.js b/test/cypress/integration/entry/entryDms.spec.js
index 79a9c5162..5f9fae3dd 100644
--- a/test/cypress/integration/entry/entryDms.spec.js
+++ b/test/cypress/integration/entry/entryDms.spec.js
@@ -5,37 +5,40 @@ describe('WagonTypeCreate', () => {
         cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/entry/${entryId}/dms`);
-
     });
 
     it('should create edit and remove new dms', () => {
         cy.addRow();
-        cy.get('.icon-attach').click()
+        cy.get('.icon-attach').click();
         cy.get('.q-file').selectFile('test/cypress/fixtures/image.jpg', {
             force: true,
         });
 
-        cy.get("tbody > tr").then((value) => {
+        cy.get('tbody > tr').then((value) => {
+            const u = undefined;
+
             //Create and check if exist new row
             let newFileTd = Cypress.$(value).length;
             cy.get('.q-btn--standard > .q-btn__content > .block').click();
             expect(value).to.have.length(newFileTd++);
-            const newRowSelector = `tbody > :nth-child(${newFileTd})`
+            const newRowSelector = `tbody > :nth-child(${newFileTd})`;
             cy.waitForElement(newRowSelector);
+            cy.validateRow(newRowSelector, [u, u, u, u, 'ENTRADA ID 1']);
 
             //Edit new dms
-            const u = undefined;
-            cy.validateRow(newRowSelector, [u,u,u,u,'ENTRADA ID 1'])
-            cy.get(`tbody :nth-child(${newFileTd}) > .text-right > .flex > :nth-child(2) > .q-btn > .q-btn__content > .q-icon`).click();
-        })
-        // cy.log('newFileTd', newFileTd)
+            const newDescription = 'entry id 1 modified';
+            const textAreaSelector =
+                '.q-textarea > .q-field__inner > .q-field__control > .q-field__control-container';
+            cy.get(
+                `tbody :nth-child(${newFileTd}) > .text-right > .no-wrap > :nth-child(2) > .q-btn > .q-btn__content > .q-icon`
+            ).click();
 
-        // //Create and check if exist new row
-        // cy.log('newFileTd:', newFileTd);
-        // cy.get(`tbody :nth-child(${newFileTd}) > .text-right > .flex > :nth-child(2) > .q-btn > .q-btn__content > .q-icon`).click()
+            cy.get(textAreaSelector).clear();
+            cy.get(textAreaSelector).type(newDescription);
+            cy.saveCard();
+            cy.reload();
 
-        // cy.get(`tbody :nth-child(${newFileTd}) > :nth-child(5) > .q-tr > :nth-child(1) > span`).then((value) => {
-        //     cy.log(value)
-        // });
+            cy.validateRow(newRowSelector, [u, u, u, u, newDescription]);
+        });
     });
 });
diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index 811374b98..2f045f32c 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -37,6 +37,7 @@ describe('InvoiceInVat', () => {
 
     it('should throw an error if there are fields undefined', () => {
         cy.get(inputBtns).eq(0).click();
+        cy.get(':nth-child(1) > .q-td.q-table--col-auto-width > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .default-icon').click();
         cy.get(dialogBtns).eq(2).click();
         cy.get('.q-notification__message').should('have.text', "The code can't be empty");
     });
@@ -44,7 +45,7 @@ describe('InvoiceInVat', () => {
     it('should correctly handle expense addition', () => {
         cy.get(inputBtns).eq(0).click();
 
-        cy.get(dialogInputs).eq(0).click();
+        cy.get(':nth-child(1) > .q-td.q-table--col-auto-width > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .default-icon').click();
         cy.get(dialogInputs).eq(0).type(randomInt);
         cy.get(dialogInputs).eq(1).click();
         cy.get(dialogInputs).eq(1).type('This is a dummy expense');
diff --git a/test/cypress/integration/worker/workerList.spec.js b/test/cypress/integration/worker/workerList.spec.js
index c950f9fed..38e7ea6d0 100644
--- a/test/cypress/integration/worker/workerList.spec.js
+++ b/test/cypress/integration/worker/workerList.spec.js
@@ -8,9 +8,9 @@ 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(0).should('have.text', 'jessicajones');
+        cy.get(workerFieldNames).eq(1).should('have.text', 'brucebanner');
+        cy.get(workerFieldNames).eq(2).should('have.text', 'charlesxavier');
     });
 
     it('should open the worker summary', () => {
diff --git a/test/cypress/integration/worker/workerNotificationsManager.spec.js b/test/cypress/integration/worker/workerNotificationsManager.spec.js
index 175933277..ac452c4ff 100644
--- a/test/cypress/integration/worker/workerNotificationsManager.spec.js
+++ b/test/cypress/integration/worker/workerNotificationsManager.spec.js
@@ -60,7 +60,6 @@ describe('WorkerNotificationsManager', () => {
     it('should active a notification if you are their boss', () => {
         cy.login('salesBoss');
         cy.visit(`/#/worker/${salesPersonId}/notifications`);
-        cy.waitForElement(activeList);
         cy.waitForElement(availableList);
 
         cy.get(activeList)
diff --git a/test/cypress/integration/worker/workerSummary.spec.js b/test/cypress/integration/worker/workerSummary.spec.js
index 7228b4b31..3d70fdf96 100644
--- a/test/cypress/integration/worker/workerSummary.spec.js
+++ b/test/cypress/integration/worker/workerSummary.spec.js
@@ -6,7 +6,8 @@ describe('WorkerSummary', () => {
     });
 
     it('should load worker summary', () => {
-        cy.get('.summaryHeader > div').should('have.text', '19 - salesBoss salesBoss');
+        cy.waitForElement('.summaryHeader');
+        cy.get('.summaryHeader > div').should('have.text', '19 - salesboss salesboss');
         cy.get(':nth-child(1) > :nth-child(2) > .value > span').should(
             'have.text',
             'salesBossNick'