diff --git a/CHANGELOG.md b/CHANGELOG.md
index e34523545..b72bc2c8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+-   (Worker) => Se crea la sección Taquilla
+-   (General) => Se mantiene el filtro lateral en cualquier parte de la seccíon.
+
 ### Fixed
 
 -   (General) => Se vuelven a mostrar los parámetros en la url al aplicar un filtro
diff --git a/package.json b/package.json
index 7be20a842..38a1d06a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.22.0",
+    "version": "24.24.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 4acc7b749..b2c5226e6 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -8,12 +8,7 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
-const props = defineProps({
-    showEntityField: {
-        type: Boolean,
-        default: true,
-    },
-});
+defineProps({ showEntityField: { type: Boolean, default: true } });
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
@@ -26,7 +21,7 @@ const bankEntityFormData = reactive({
 });
 
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
+    fields: ['id', 'name', 'code'],
 };
 
 const countriesOptions = ref([]);
@@ -58,23 +53,19 @@ onMounted(async () => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('name')"
-                        v-model="data.name"
-                        :required="true"
-                        :rules="validate('bankEntity.name')"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        ref="bicInputRef"
-                        :label="t('swift')"
-                        v-model="data.bic"
-                        :required="true"
-                        :rules="validate('bankEntity.bic')"
-                    />
-                </div>
+                <VnInput
+                    :label="t('name')"
+                    v-model="data.name"
+                    :required="true"
+                    :rules="validate('bankEntity.name')"
+                />
+                <VnInput
+                    ref="bicInputRef"
+                    :label="t('swift')"
+                    v-model="data.bic"
+                    :required="true"
+                    :rules="validate('bankEntity.bic')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -83,7 +74,7 @@ onMounted(async () => {
                         v-model="data.countryFk"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="country"
+                        option-label="name"
                         hide-selected
                         :required="true"
                         :rules="validate('bankEntity.countryFk')"
diff --git a/src/components/CreateDepartmentChild.vue b/src/components/CreateDepartmentChild.vue
index 8f5b4b874..1f1b1335b 100644
--- a/src/components/CreateDepartmentChild.vue
+++ b/src/components/CreateDepartmentChild.vue
@@ -52,9 +52,7 @@ onMounted(() => {
             </span>
             <h1 class="title">{{ t('New department') }}</h1>
             <VnRow class="row q-gutter-md q-mb-md" style="min-width: 250px">
-                <div class="col">
-                    <VnInput :label="t('Name')" v-model="data.name" />
-                </div>
+                <VnInput :label="t('Name')" v-model="data.name" />
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn
diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
index 8ac3552ad..f3d4de605 100644
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@@ -72,69 +72,57 @@ const onDataSaved = async (formData, requestResponse) => {
                 {{ t('Invoicing in progress...') }}
             </span>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Ticket')"
-                        :options="ticketsOptions"
-                        hide-selected
-                        option-label="id"
-                        option-value="id"
-                        v-model="data.ticketFk"
-                        @update:model-value="data.clientFk = null"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                    <QItemLabel caption>{{
-                                        scope.opt?.nickname
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
+                <VnSelect
+                    :label="t('Ticket')"
+                    :options="ticketsOptions"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="data.ticketFk"
+                    @update:model-value="data.clientFk = null"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
                 <span class="row items-center" style="max-width: max-content">{{
                     t('Or')
                 }}</span>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Client')"
-                        :options="clientsOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.clientFk"
-                        @update:model-value="data.ticketFk = null"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
-                </div>
+                <VnSelect
+                    :label="t('Client')"
+                    :options="clientsOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.clientFk"
+                    @update:model-value="data.ticketFk = null"
+                />
+                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Serial')"
-                        :options="invoiceOutSerialsOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="code"
-                        v-model="data.serial"
-                        :required="true"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Area')"
-                        :options="taxAreasOptions"
-                        hide-selected
-                        option-label="code"
-                        option-value="code"
-                        v-model="data.taxArea"
-                        :required="true"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Serial')"
+                    :options="invoiceOutSerialsOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="code"
+                    v-model="data.serial"
+                    :required="true"
+                />
+                <VnSelect
+                    :label="t('Area')"
+                    :options="taxAreasOptions"
+                    hide-selected
+                    option-label="code"
+                    option-value="code"
+                    v-model="data.taxArea"
+                    :required="true"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index a78312d08..45fa61dff 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -40,24 +40,20 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Name')"
-                        v-model="data.name"
-                        :rules="validate('city.name')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Province')"
-                        :options="provincesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.provinceFk"
-                        :rules="validate('city.provinceFk')"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Name')"
+                    v-model="data.name"
+                    :rules="validate('city.name')"
+                />
+                <VnSelect
+                    :label="t('Province')"
+                    :options="provincesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.provinceFk"
+                    :rules="validate('city.provinceFk')"
+                />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index a44363a7c..25a61a0ca 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -30,21 +30,21 @@ const townsLocationOptions = ref([]);
 
 const onDataSaved = (formData) => {
     const newPostcode = {
-        ...formData
+        ...formData,
     };
     const townObject = townsLocationOptions.value.find(
-        ({id}) => id === formData.townFk
+        ({ id }) => id === formData.townFk
     );
     newPostcode.town = townObject?.name;
     const provinceObject = provincesOptions.value.find(
-        ({id}) => id === formData.provinceFk
+        ({ id }) => id === formData.provinceFk
     );
     newPostcode.province = provinceObject?.name;
     const countryObject = countriesOptions.value.find(
-        ({id}) => id === formData.countryFk
+        ({ id }) => id === formData.countryFk
     );
     newPostcode.country = countryObject?.country;
-    emit('onDataSaved', newPostcode);  
+    emit('onDataSaved', newPostcode);
 };
 
 const onCityCreated = async ({ name, provinceFk }, formData) => {
@@ -92,63 +92,55 @@ const onProvinceCreated = async ({ name }, formData) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Postcode')"
-                        v-model="data.code"
-                        :rules="validate('postcode.code')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelectDialog
-                        :label="t('City')"
-                        :options="townsLocationOptions"
-                        v-model="data.townFk"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        :rules="validate('postcode.city')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                    >
-                        <template #form>
-                            <CreateNewCityForm
-                                @on-data-saved="onCityCreated($event, data)"
-                            />
-                        </template>
-                    </VnSelectDialog>
-                </div>
+                <VnInput
+                    :label="t('Postcode')"
+                    v-model="data.code"
+                    :rules="validate('postcode.code')"
+                />
+                <VnSelectDialog
+                    :label="t('City')"
+                    :options="townsLocationOptions"
+                    v-model="data.townFk"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    :rules="validate('postcode.city')"
+                    :roles-allowed-to-create="['deliveryAssistant']"
+                >
+                    <template #form>
+                        <CreateNewCityForm @on-data-saved="onCityCreated($event, data)" />
+                    </template>
+                </VnSelectDialog>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-xl">
-                <div class="col">
-                    <VnSelectDialog
-                        :label="t('Province')"
-                        :options="provincesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.provinceFk"
-                        :rules="validate('postcode.provinceFk')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                    >
-                        <template #form>
-                            <CreateNewProvinceForm
-                                @on-data-saved="onProvinceCreated($event, data)"
-                            />
-                        </template>
-                    </VnSelectDialog>
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Country')"
-                        :options="countriesOptions"
-                        hide-selected
-                        option-label="country"
-                        option-value="id"
-                        v-model="data.countryFk"
-                        :rules="validate('postcode.countryFk')"
-                    />
-                </div> </VnRow
-        ></template>
+                <VnSelectDialog
+                    :label="t('Province')"
+                    :options="provincesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.provinceFk"
+                    :rules="validate('postcode.provinceFk')"
+                    :roles-allowed-to-create="['deliveryAssistant']"
+                >
+                    <template #form>
+                        <CreateNewProvinceForm
+                            @on-data-saved="onProvinceCreated($event, data)"
+                        />
+                    </template> </VnSelectDialog
+            ></VnRow>
+            <VnRow class="row q-gutter-md q-mb-xl"
+                ><VnSelect
+                    :label="t('Country')"
+                    :options="countriesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.countryFk"
+                    :rules="validate('postcode.countryFk')"
+                />
+            </VnRow>
+        </template>
     </FormModelPopup>
 </template>
 
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index d38ff94df..2d626ed99 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -40,24 +40,20 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Name')"
-                        v-model="data.name"
-                        :rules="validate('province.name')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Autonomy')"
-                        :options="autonomiesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.autonomyFk"
-                        :rules="validate('province.autonomyFk')"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Name')"
+                    v-model="data.name"
+                    :rules="validate('province.name')"
+                />
+                <VnSelect
+                    :label="t('Autonomy')"
+                    :options="autonomiesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.autonomyFk"
+                    :rules="validate('province.autonomyFk')"
+                />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/components/CreateThermographForm.vue b/src/components/CreateThermographForm.vue
index 60c531529..061c47712 100644
--- a/src/components/CreateThermographForm.vue
+++ b/src/components/CreateThermographForm.vue
@@ -54,51 +54,42 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Identifier')"
-                        v-model="data.thermographId"
-                        :required="true"
-                        :rules="validate('thermograph.id')"
-                    />
-                </div>
-
-                <div class="col">
-                    <VnSelect
-                        :label="t('Model')"
-                        :options="thermographsModels"
-                        hide-selected
-                        option-label="value"
-                        option-value="value"
-                        v-model="data.model"
-                        :required="true"
-                        :rules="validate('thermograph.model')"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Identifier')"
+                    v-model="data.thermographId"
+                    :required="true"
+                    :rules="validate('thermograph.id')"
+                />
+                <VnSelect
+                    :label="t('Model')"
+                    :options="thermographsModels"
+                    hide-selected
+                    option-label="value"
+                    option-value="value"
+                    v-model="data.model"
+                    :required="true"
+                    :rules="validate('thermograph.model')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-xl">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Warehouse')"
-                        :options="warehousesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.warehouseId"
-                        :required="true"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Temperature')"
-                        :options="temperaturesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="code"
-                        v-model="data.temperatureFk"
-                        :required="true"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Warehouse')"
+                    :options="warehousesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.warehouseId"
+                    :required="true"
+                />
+                <VnSelect
+                    :label="t('Temperature')"
+                    :options="temperaturesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    v-model="data.temperatureFk"
+                    :required="true"
+                />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index 66873b476..4adfa37ea 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -250,61 +250,55 @@ const makeRequest = async () => {
 
                 <div class="column">
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QOptionGroup
-                                :options="uploadMethodsOptions"
-                                type="radio"
-                                v-model="uploadMethodSelected"
-                            />
-                        </div>
+                        <QOptionGroup
+                            :options="uploadMethodsOptions"
+                            type="radio"
+                            v-model="uploadMethodSelected"
+                        />
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QFile
-                                v-if="uploadMethodSelected === 'computer'"
-                                ref="inputFileRef"
-                                :label="t('File')"
-                                :multiple="false"
-                                v-model="newPhoto.files"
-                                @update:model-value="updatePhotoPreview($event)"
-                                :accept="allowedContentTypes"
-                                class="required cursor-pointer"
-                            >
-                                <template #append>
-                                    <QIcon
-                                        name="vn:attach"
-                                        class="cursor-pointer q-mr-sm"
-                                        @click="openInputFile()"
-                                    >
-                                        <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
-                                    </QIcon>
-                                    <QIcon name="info" class="cursor-pointer">
-                                        <QTooltip>{{
-                                            t('globals.allowedFilesText', {
-                                                allowedContentTypes: allowedContentTypes,
-                                            })
-                                        }}</QTooltip>
-                                    </QIcon>
-                                </template>
-                            </QFile>
-                            <VnInput
-                                v-if="uploadMethodSelected === 'URL'"
-                                v-model="newPhoto.url"
-                                @update:model-value="updatePhotoPreview($event)"
-                                placeholder="https://"
-                            />
-                        </div>
+                        <QFile
+                            v-if="uploadMethodSelected === 'computer'"
+                            ref="inputFileRef"
+                            :label="t('File')"
+                            :multiple="false"
+                            v-model="newPhoto.files"
+                            @update:model-value="updatePhotoPreview($event)"
+                            :accept="allowedContentTypes"
+                            class="required cursor-pointer"
+                        >
+                            <template #append>
+                                <QIcon
+                                    name="vn:attach"
+                                    class="cursor-pointer q-mr-sm"
+                                    @click="openInputFile()"
+                                >
+                                    <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
+                                </QIcon>
+                                <QIcon name="info" class="cursor-pointer">
+                                    <QTooltip>{{
+                                        t('globals.allowedFilesText', {
+                                            allowedContentTypes: allowedContentTypes,
+                                        })
+                                    }}</QTooltip>
+                                </QIcon>
+                            </template>
+                        </QFile>
+                        <VnInput
+                            v-if="uploadMethodSelected === 'URL'"
+                            v-model="newPhoto.url"
+                            @update:model-value="updatePhotoPreview($event)"
+                            placeholder="https://"
+                        />
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <VnSelect
-                                :label="t('Orientation')"
-                                :options="viewportTypes"
-                                hide-selected
-                                option-label="description"
-                                v-model="viewportSelection"
-                            />
-                        </div>
+                        <VnSelect
+                            :label="t('Orientation')"
+                            :options="viewportTypes"
+                            hide-selected
+                            option-label="description"
+                            v-model="viewportSelection"
+                        />
                     </VnRow>
                     <div class="q-mt-lg row justify-end">
                         <QBtn
diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
index d9dd06e4d..956acb7ea 100644
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@@ -152,48 +152,32 @@ const selectItem = ({ id }) => {
             </span>
             <h1 class="title">{{ t('Filter item') }}</h1>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('entry.buys.name')"
-                        v-model="itemFilterParams.name"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('entry.buys.size')"
-                        v-model="itemFilterParams.size"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.buys.producer')"
-                        :options="producersOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="itemFilterParams.producerFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.buys.type')"
-                        :options="ItemTypesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="itemFilterParams.typeFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.buys.color')"
-                        :options="InksOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="itemFilterParams.inkFk"
-                    />
-                </div>
+                <VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
+                <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
+                <VnSelect
+                    :label="t('entry.buys.producer')"
+                    :options="producersOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="itemFilterParams.producerFk"
+                />
+                <VnSelect
+                    :label="t('entry.buys.type')"
+                    :options="ItemTypesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="itemFilterParams.typeFk"
+                />
+                <VnSelect
+                    :label="t('entry.buys.color')"
+                    :options="InksOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="itemFilterParams.inkFk"
+                />
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index 2f28eb623..d1d0f5e8f 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -145,48 +145,38 @@ const selectTravel = ({ id }) => {
             </span>
             <h1 class="title">{{ t('Filter travels') }}</h1>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.agency')"
-                        :options="agenciesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="travelFilterParams.agencyModeFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.warehouseOut')"
-                        :options="warehousesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="travelFilterParams.warehouseOutFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.warehouseIn')"
-                        :options="warehousesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="travelFilterParams.warehouseInFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate
-                        :label="t('entry.basicData.shipped')"
-                        v-model="travelFilterParams.shipped"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate
-                        :label="t('entry.basicData.landed')"
-                        v-model="travelFilterParams.landed"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('entry.basicData.agency')"
+                    :options="agenciesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="travelFilterParams.agencyModeFk"
+                />
+                <VnSelect
+                    :label="t('entry.basicData.warehouseOut')"
+                    :options="warehousesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="travelFilterParams.warehouseOutFk"
+                />
+                <VnSelect
+                    :label="t('entry.basicData.warehouseIn')"
+                    :options="warehousesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="travelFilterParams.warehouseInFk"
+                />
+                <VnInputDate
+                    :label="t('entry.basicData.shipped')"
+                    v-model="travelFilterParams.shipped"
+                />
+                <VnInputDate
+                    :label="t('entry.basicData.landed')"
+                    v-model="travelFilterParams.landed"
+                />
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index b18433d4e..2c2acb61c 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -156,9 +156,12 @@ const startFormWatcher = () => {
 
 async function fetch() {
     try {
-        const { data } = await axios.get($props.url, {
+        let { data } = await axios.get($props.url, {
             params: { filter: JSON.stringify($props.filter) },
         });
+
+        if (Array.isArray(data)) data = data[0] ?? {};
+
         state.set($props.model, data);
         originalData.value = data && JSON.parse(JSON.stringify(data));
 
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index c5caf9778..25213a8b7 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -6,7 +6,7 @@ import FormModel from 'components/FormModel.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',
diff --git a/src/components/FormPopup.vue b/src/components/FormPopup.vue
index e203a7c75..2da986006 100644
--- a/src/components/FormPopup.vue
+++ b/src/components/FormPopup.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['onSubmit']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',
diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
index 098f8464d..4f97033b3 100644
--- a/src/components/RegularizeStockForm.vue
+++ b/src/components/RegularizeStockForm.vue
@@ -50,13 +50,11 @@ const onDataSaved = (data) => {
     >
         <template #form-inputs="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('Type the visible quantity')"
-                        v-model.number="data.quantity"
-                        autofocus
-                    />
-                </div>
+                <QInput
+                    :label="t('Type the visible quantity')"
+                    v-model.number="data.quantity"
+                    autofocus
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index de3196e2c..f013e80fb 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -83,74 +83,66 @@ const transferInvoice = async () => {
     >
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Client')"
-                        :options="clientsOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="transferInvoiceParams.newClientFk"
-                        :required="true"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        #{{ scope.opt?.id }} -
-                                        {{ scope.opt?.name }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Rectificative type')"
-                        :options="rectificativeTypeOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="transferInvoiceParams.cplusRectificationTypeFk"
-                        :required="true"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Client')"
+                    :options="clientsOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="transferInvoiceParams.newClientFk"
+                    :required="true"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    #{{ scope.opt?.id }} -
+                                    {{ scope.opt?.name }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('Rectificative type')"
+                    :options="rectificativeTypeOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="id"
+                    v-model="transferInvoiceParams.cplusRectificationTypeFk"
+                    :required="true"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Class')"
-                        :options="siiTypeInvoiceOutsOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
-                        :required="true"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ scope.opt?.code }} -
-                                        {{ scope.opt?.description }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Type')"
-                        :options="invoiceCorrectionTypesOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
-                        :required="true"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Class')"
+                    :options="siiTypeInvoiceOutsOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="id"
+                    v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
+                    :required="true"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ scope.opt?.code }} -
+                                    {{ scope.opt?.description }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('Type')"
+                    :options="invoiceCorrectionTypesOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="id"
+                    v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
+                    :required="true"
+                />
             </VnRow>
         </template>
     </FormPopup>
diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index c2011639f..3ae05a268 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -178,6 +178,8 @@ function copyUserToken() {
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
+                    input-debounce="0"
+                    hide-selected
                 />
                 <VnSelect
                     :label="t('components.userPanel.localBank')"
@@ -185,6 +187,8 @@ function copyUserToken() {
                     :options="accountBankData"
                     option-label="bank"
                     option-value="id"
+                    input-debounce="0"
+                    hide-selected
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -201,10 +205,11 @@ function copyUserToken() {
                 <VnSelect
                     :label="t('components.userPanel.localCompany')"
                     hide-selected
-                    v-model="user.companyFk"
+                    v-model="user.localCompanyFk"
                     :options="companiesData"
                     option-label="code"
                     option-value="id"
+                    input-debounce="0"
                 />
                 <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
@@ -213,6 +218,7 @@ function copyUserToken() {
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
+                    input-debounce="0"
                 />
             </VnRow>
             <VnRow>
@@ -224,6 +230,8 @@ function copyUserToken() {
                     option-label="code"
                     option-value="id"
                     style="flex: 0"
+                    dense
+                    input-debounce="0"
                 />
             </VnRow>
         </div>
diff --git a/src/components/common/RightMenu.vue b/src/components/common/RightMenu.vue
new file mode 100644
index 000000000..e288fbc87
--- /dev/null
+++ b/src/components/common/RightMenu.vue
@@ -0,0 +1,55 @@
+<script setup>
+import { ref, onMounted, useSlots } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+
+const slots = useSlots();
+const hasContent = ref(false);
+const rightPanel = ref(null);
+
+onMounted(() => {
+    rightPanel.value = document.querySelector('#right-panel');
+    if (rightPanel.value.childNodes.length) hasContent.value = true;
+
+    // Check if there's content to display
+    const observer = new MutationObserver(() => {
+        hasContent.value = rightPanel.value.childNodes.length;
+    });
+
+    if (rightPanel.value)
+        observer.observe(rightPanel.value, {
+            subtree: true,
+            childList: true,
+            attributes: true,
+        });
+
+    if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
+});
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+</script>
+<template>
+    <Teleport to="#actions-append">
+        <div class="row q-gutter-x-sm">
+            <QBtn
+                v-if="hasContent || $slots['right-panel']"
+                flat
+                @click="stateStore.toggleRightDrawer()"
+                round
+                dense
+                icon="menu"
+            >
+                <QTooltip bottom anchor="bottom right">
+                    {{ t('globals.collapseMenu') }}
+                </QTooltip>
+            </QBtn>
+        </div>
+    </Teleport>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <div id="right-panel"></div>
+            <slot v-if="!hasContent" name="right-panel" />
+        </QScrollArea>
+    </QDrawer>
+</template>
diff --git a/src/components/common/SendEmailDialog.vue b/src/components/common/SendEmailDialog.vue
index 501c48a4d..d73133921 100644
--- a/src/components/common/SendEmailDialog.vue
+++ b/src/components/common/SendEmailDialog.vue
@@ -29,10 +29,12 @@ async function confirm() {
     const response = { address: address.value };
     if (props.promise) {
         isLoading.value = true;
-        const { address: _address, ...restData } = props.data;
 
         try {
-            Object.assign(response, restData);
+            const dataCopy = JSON.parse(JSON.stringify({ ...props.data }));
+            delete dataCopy.address;
+
+            Object.assign(response, dataCopy);
             await props.promise(response);
         } finally {
             isLoading.value = false;
diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 6d0badffb..58cb12708 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -1,13 +1,13 @@
 <script setup>
-import { onBeforeMount, computed } from 'vue';
+import { onBeforeMount, computed, watchEffect } from 'vue';
 import { useRoute, onBeforeRouteUpdate } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import LeftMenu from 'components/LeftMenu.vue';
+import RightMenu from 'components/common/RightMenu.vue';
 
 const props = defineProps({
     dataKey: { type: String, required: true },
@@ -15,13 +15,13 @@ const props = defineProps({
     customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
-    searchbarDataKey: { type: String, default: undefined },
-    searchbarUrl: { type: String, default: undefined },
+    filterPanel: { type: Object, default: undefined },
+    searchDataKey: { type: String, default: undefined },
+    searchUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
 });
 
-const { t } = useI18n();
 const stateStore = useStateStore();
 const route = useRoute();
 const url = computed(() => {
@@ -47,26 +47,38 @@ if (props.baseUrl) {
         }
     });
 }
+
+watchEffect(() => {
+    if (Array.isArray(arrayData.store.data))
+        arrayData.store.data = arrayData.store.data[0];
+});
 </script>
 <template>
-    <Teleport
-        to="#searchbar"
-        v-if="stateStore.isHeaderMounted() && props.searchbarDataKey"
-    >
-        <VnSearchbar
-            :data-key="props.searchbarDataKey"
-            :url="props.searchbarUrl"
-            :label="t(props.searchbarLabel)"
-            :info="t(props.searchbarInfo)"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <component :is="descriptor" />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar" v-if="props.searchDataKey">
+            <slot name="searchbar">
+                <VnSearchbar
+                    :data-key="props.searchDataKey"
+                    :url="props.searchUrl"
+                    :label="props.searchbarLabel"
+                    :info="props.searchbarInfo"
+                />
+            </slot>
+        </Teleport>
+        <slot v-else name="searchbar" />
+        <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+            <QScrollArea class="fit">
+                <component :is="descriptor" />
+                <QSeparator />
+                <LeftMenu source="card" />
+            </QScrollArea>
+        </QDrawer>
+        <RightMenu>
+            <template #right-panel v-if="props.filterPanel">
+                <component :is="props.filterPanel" :data-key="props.searchDataKey" />
+            </template>
+        </RightMenu>
+    </template>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index e3cb2874a..769ba9959 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -35,7 +35,7 @@ const $props = defineProps({
     downloadModel: {
         type: String,
         required: false,
-        default: null,
+        default: undefined,
     },
     defaultDmsCode: {
         type: String,
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 684770e9c..8358cd6e6 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -37,14 +37,6 @@ const styleAttrs = computed(() => {
         : {};
 });
 
-const onEnterPress = () => {
-    emit('keyup.enter');
-};
-
-const handleValue = (val = null) => {
-    value.value = val;
-};
-
 const focus = () => {
     vnInputRef.value.focus();
 };
@@ -73,7 +65,7 @@ const inputRules = [
             v-bind="{ ...$attrs, ...styleAttrs }"
             :type="$attrs.type"
             :class="{ required: $attrs.required }"
-            @keyup.enter="onEnterPress()"
+            @keyup.enter="emit('keyup.enter')"
             :clearable="false"
             :rules="inputRules"
             :lazy-rules="true"
@@ -82,14 +74,14 @@ const inputRules = [
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
             </template>
-
+            
             <template #append>
-                <slot name="append" v-if="$slots.append" />
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value"
-                    @click="handleValue(null)"
+                    v-if="$slots.append && hover && value && !$attrs.disabled"
+                    @click="value = null"
                 ></QIcon>
             </template>
         </QInput>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index e8083dec2..493f094ce 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -22,6 +22,10 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    optionFilter: {
+        type: String,
+        default: null,
+    },
     url: {
         type: String,
         default: '',
@@ -59,7 +63,7 @@ const $props = defineProps({
 const { t } = useI18n();
 const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
 
-const { optionLabel, optionValue, options, modelValue } = toRefs($props);
+const { optionLabel, optionValue, optionFilter, options, modelValue } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
@@ -109,9 +113,9 @@ async function fetchFilter(val) {
     const { fields, sortBy, limit } = $props;
     let key = optionLabel.value;
 
-    if (new RegExp(/\d/g).test(val)) key = optionValue.value;
+    if (new RegExp(/\d/g).test(val)) key = optionFilter.value ?? optionValue.value;
 
-    const where = { [key]: { like: `%${val}%` } };
+    const where = { ...{ [key]: { like: `%${val}%` } }, ...$props.where };
     return dataRef.value.fetch({ fields, where, order: sortBy, limit });
 }
 
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 1a4514ef5..57d1cb19a 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -54,6 +54,13 @@ async function fetch() {
     emit('onFetch', Array.isArray(data) ? data[0] : data);
     isLoading.value = false;
 }
+
+const showRedirectToSummaryIcon = computed(() => {
+    const routeExists = route.matched.some(
+        (route) => route.name === `${route.meta.moduleName}Summary`
+    );
+    return !isSummary.value && route.meta.moduleName && routeExists;
+});
 </script>
 
 <template>
@@ -64,7 +71,7 @@ async function fetch() {
                 <div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
                     <slot name="header-left">
                         <router-link
-                            v-if="!isSummary && route.meta.moduleName"
+                            v-if="showRedirectToSummaryIcon"
                             class="header link"
                             :to="{
                                 name: `${route.meta.moduleName}Summary`,
@@ -135,6 +142,9 @@ async function fetch() {
             box-shadow: none;
 
             .vn-label-value {
+                &.negative > .value span {
+                    color: $alert;
+                }
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;
diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue
index 24255ea1a..3ecea89c2 100644
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@@ -108,7 +108,7 @@ const containerClasses = computed(() => {
         font-size: 13px;
 
         &:hover {
-            background-color: var(--vn-accent-color);
+            background-color: var(--vn-label-color);
             cursor: pointer;
         }
     }
diff --git a/src/components/ui/SkeletonForm.vue b/src/components/ui/SkeletonForm.vue
index d27934adf..4ae4fb5bb 100644
--- a/src/components/ui/SkeletonForm.vue
+++ b/src/components/ui/SkeletonForm.vue
@@ -1,28 +1,16 @@
 <template>
     <div class="q-pa-md">
         <div class="row q-gutter-md q-mb-md">
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
         </div>
         <div class="row q-gutter-md q-mb-md">
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
         </div>
         <div class="row q-gutter-md q-mb-md">
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
         </div>
         <div class="row q-gutter-md">
             <QSkeleton type="QBtn" />
diff --git a/src/components/ui/SkeletonSummary.vue b/src/components/ui/SkeletonSummary.vue
index 087dc32f9..e8407ee7b 100644
--- a/src/components/ui/SkeletonSummary.vue
+++ b/src/components/ui/SkeletonSummary.vue
@@ -3,46 +3,36 @@
         <QSkeleton type="rect" square />
     </div>
     <div class="row q-pa-md q-col-gutter-md q-mb-md">
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
     </div>
 </template>
 
diff --git a/src/components/ui/SkeletonTable.vue b/src/components/ui/SkeletonTable.vue
index d58253f90..e35e2c9b0 100644
--- a/src/components/ui/SkeletonTable.vue
+++ b/src/components/ui/SkeletonTable.vue
@@ -1,45 +1,20 @@
 <template>
     <div class="q-pa-md w">
         <div class="row q-gutter-md q-mb-md">
-            <div class="col-1">
-                <QSkeleton type="rect" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="rect" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="rect" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="rect" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="rect" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="rect" square />
-            </div>
-        </div>
-
-        <div class="row q-gutter-md q-mb-md" v-for="n in 5" :key="n">
-            <div class="col-1">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
-            <div class="col">
-                <QSkeleton type="QInput" square />
-            </div>
+            <QSkeleton type="rect" square />
+            <QSkeleton type="rect" square />
+            <QSkeleton type="rect" square />
+            <QSkeleton type="rect" square />
+            <QSkeleton type="rect" square />
+            <QSkeleton type="rect" square />
+       </div>
+       <div class="row q-gutter-md q-mb-md" v-for="n in 5" :key="n">
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
+            <QSkeleton type="QInput" square />
         </div>
     </div>
 </template>
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index eb0bbbe66..386594750 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
-
+import useRedirect from 'src/composables/useRedirect';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
@@ -56,6 +56,7 @@ const arrayData = useArrayData(props.dataKey, {
 const route = useRoute();
 const store = arrayData.store;
 const userParams = ref({});
+const { navigate } = useRedirect();
 
 onMounted(() => {
     if (props.params) userParams.value = JSON.parse(JSON.stringify(props.params));
@@ -92,6 +93,7 @@ async function search() {
 
     isLoading.value = false;
     emit('search');
+    navigate(store.data, {});
 }
 
 async function reload() {
@@ -102,6 +104,7 @@ async function reload() {
     if (!props.showAll && !params.length) store.data = [];
     isLoading.value = false;
     emit('refresh');
+    navigate(store.data, {});
 }
 
 async function clearFilters() {
@@ -147,7 +150,7 @@ const customTags = computed(() =>
 
 async function remove(key) {
     userParams.value[key] = null;
-    await search();
+    await arrayData.applyFilter({ params: userParams.value });
     emit('remove', key);
 }
 
diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index b04ab3e5b..3ce0b7aa6 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -1,21 +1,16 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-const props = defineProps({
-    phoneNumber: { type: [String, Number], default: null },
-});
-const { t } = useI18n();
+defineProps({ phoneNumber: { type: [String, Number], default: null } });
 </script>
 <template>
     <QBtn
-        v-if="props.phoneNumber"
+        v-if="phoneNumber"
         flat
         round
         icon="phone"
         size="sm"
         color="primary"
         padding="none"
-        :href="`sip:${props.phoneNumber}`"
+        :href="`sip:${phoneNumber}`"
         @click.stop
     />
 </template>
-<style scoped></style>
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c00849512..190393d2f 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -42,6 +42,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    keepOpts: {
+        type: Array,
+        default: () => [],
+    },
     offset: {
         type: Number,
         default: 0,
@@ -76,6 +80,7 @@ const arrayData = useArrayData(props.dataKey, {
     order: props.order,
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
+    keepOpts: props.keepOpts,
 });
 const store = arrayData.store;
 
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 344267ef7..38dcf97d1 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,11 +1,13 @@
 <script setup>
 import { onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
+import useRedirect from 'src/composables/useRedirect';
+import { useI18n } from 'vue-i18n';
 
 const quasar = useQuasar();
+const { t } = useI18n();
 
 const props = defineProps({
     dataKey: {
@@ -65,10 +67,10 @@ const props = defineProps({
     },
 });
 
-const router = useRouter();
 const arrayData = useArrayData(props.dataKey, { ...props });
 const { store } = arrayData;
 const searchText = ref('');
+const { navigate } = useRedirect();
 
 onMounted(() => {
     const params = store.userParams;
@@ -81,37 +83,20 @@ async function search() {
     const staticParams = Object.entries(store.userParams).filter(
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
-    // const filter =props?.where? { where: JSON.parse(props.where) }: {}
+    store.skip = 0;
     await arrayData.applyFilter({
         params: {
-            // filter ,
             ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
     });
+
     if (!props.redirect) return;
 
-    if (props.customRouteRedirectName)
-        return router.push({
-            name: props.customRouteRedirectName,
-            params: { id: searchText.value },
-        });
-
-    const { matched: matches } = router.currentRoute.value;
-    const { path } = matches.at(-1);
-    const [, moduleName] = path.split('/');
-
-    if (!store.data.length || store.data.length > 1)
-        return router.push({ path: `/${moduleName}/list` });
-
-    const targetId = store.data[0].id;
-    let targetUrl;
-
-    if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
-    if (path.endsWith('-list')) targetUrl = path.replace('-list', `/${targetId}/summary`);
-    else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
-
-    await router.push({ path: targetUrl });
+    navigate(store.data, {
+        customRouteRedirectName: props.customRouteRedirectName,
+        searchText: searchText.value,
+    });
 }
 </script>
 
@@ -120,7 +105,7 @@ async function search() {
         <VnInput
             id="searchbar"
             v-model="searchText"
-            :placeholder="props.label"
+            :placeholder="t(props.label)"
             dense
             standout
             autofocus
@@ -139,7 +124,7 @@ async function search() {
                     name="info"
                     class="cursor-info"
                 >
-                    <QTooltip>{{ props.info }}</QTooltip>
+                    <QTooltip>{{ t(props.info) }}</QTooltip>
                 </QIcon>
             </template>
         </VnInput>
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 13aa05635..928d045e9 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -90,7 +90,7 @@ const onNodeCreated = async () => {
     await fetchNodeLeaves(creationNodeSelectedId.value);
 };
 
-onMounted(async (n) => {
+onMounted(async () => {
     const tree = [...state.get('Tree'), 1];
     const lastStateTree = state.get('TreeState');
     if (tree) {
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 525cf6e6b..e2465f5ba 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -47,7 +47,10 @@ export function useArrayData(key, userOptions) {
                 if (isEmpty || !allowedOptions.includes(option)) continue;
 
                 if (Object.prototype.hasOwnProperty.call(store, option)) {
-                    store[option] = userOptions[option];
+                    const defaultOpts = userOptions[option];
+                    store[option] = userOptions.keepOpts?.includes(option)
+                        ? Object.assign(defaultOpts, store[option])
+                        : defaultOpts;
                 }
             }
         }
@@ -127,7 +130,8 @@ export function useArrayData(key, userOptions) {
         store.filter = {};
         if (params) store.userParams = Object.assign({}, params);
 
-        await fetch({ append: false });
+        const response = await fetch({ append: false });
+        return response;
     }
 
     async function addFilter({ filter, params }) {
diff --git a/src/composables/useRedirect.js b/src/composables/useRedirect.js
new file mode 100644
index 000000000..c1470718b
--- /dev/null
+++ b/src/composables/useRedirect.js
@@ -0,0 +1,25 @@
+import { useRouter } from 'vue-router';
+
+export default function useRedirect() {
+    const router = useRouter();
+
+    const navigate = (data, { customRouteRedirectName, searchText }) => {
+        if (customRouteRedirectName)
+            return router.push({
+                name: customRouteRedirectName,
+                params: { id: searchText },
+            });
+
+        const { matched: matches } = router.currentRoute.value;
+        const { path } = matches.at(-1);
+
+        const to =
+            data.length === 1
+                ? path.replace(/\/(list|:id)|-list/, `/${data[0].id}`)
+                : path.replace(/:id.*/, '');
+
+        router.push({ path: to });
+    };
+
+    return { navigate };
+}
diff --git a/src/composables/useState.js b/src/composables/useState.js
index e671d41bd..9b9c9d642 100644
--- a/src/composables/useState.js
+++ b/src/composables/useState.js
@@ -20,28 +20,12 @@ const headerMounted = ref(false);
 export function useState() {
     function getUser() {
         return computed(() => {
-            return {
-                id: user.value.id,
-                name: user.value.name,
-                nickname: user.value.nickname,
-                lang: user.value.lang,
-                darkMode: user.value.darkMode,
-                companyFk: user.value.companyFk,
-                warehouseFk: user.value.warehouseFk,
-            };
+            return user.value;
         });
     }
 
     function setUser(data) {
-        user.value = {
-            id: data.id,
-            name: data.name,
-            nickname: data.nickname,
-            lang: data.lang,
-            darkMode: data.darkMode,
-            companyFk: data.companyFk,
-            warehouseFk: data.warehouseFk,
-        };
+        user.value = data;
     }
 
     function getRoles() {
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d8fb231f0..0e6edeab2 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -32,6 +32,7 @@ globals:
     confirm: Confirm
     assign: Assign
     back: Back
+    downloadPdf: Download PDF
     yes: 'Yes'
     no: 'No'
     noChanges: No changes to save
@@ -271,6 +272,7 @@ customer:
         tableVisibleColumns:
             id: Identifier
             name: Name
+            socialName: Social name
             fi: Tax number
             salesPersonFk: Salesperson
             credit: Credit
@@ -430,6 +432,7 @@ ticket:
         boxing: Boxing
         sms: Sms
         notes: Notes
+        sale: Sale
     list:
         nickname: Nickname
         state: State
@@ -826,6 +829,8 @@ worker:
         log: Log
         calendar: Calendar
         timeControl: Time control
+        locker: Locker
+
     list:
         name: Name
         email: Email
@@ -857,6 +862,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
+        fiDueDate: Fecha de caducidad del DNI
+        sex: Sexo
+        seniority: Antigüedad
+        fi: DNI/NIE/NIF
+        birth: Cumpleaños
+        isFreelance: Autónomo
+        isSsDiscounted: Bonificación SS
+        hasMachineryAuthorized: Autorizado para llevar maquinaria
+        isDisable: Trabajador desactivado
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -1234,12 +1248,10 @@ item/itemType:
         itemType: Item type
         basicData: Basic data
         summary: Summary
-zone:
+monitor:
     pageTitles:
-        zones: Zone
-        zonesList: Zones
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
+        monitors: Monitors
+        list: List
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 67e075935..d78e1762c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -59,6 +59,7 @@ globals:
     amount: Importe
     packages: Bultos
     download: Descargar
+    downloadPdf: Descargar PDF
     selectRows: 'Seleccionar las { numberRows } filas(s)'
     allRows: 'Todo { numberRows } filas(s)'
     markAll: Marcar todo
@@ -269,6 +270,7 @@ customer:
         tableVisibleColumns:
             id: Identificador
             name: Nombre
+            socialName: Razón social
             fi: NIF / CIF
             salesPersonFk: Comercial
             credit: Crédito
@@ -428,6 +430,7 @@ ticket:
         boxing: Encajado
         sms: Sms
         notes: Notas
+        sale: Lineas del pedido
     list:
         nickname: Alias
         state: Estado
@@ -824,6 +827,7 @@ worker:
         log: Historial
         calendar: Calendario
         timeControl: Control de horario
+        locker: Taquilla
     list:
         name: Nombre
         email: Email
@@ -1239,6 +1243,10 @@ zone:
         zonesList: Zonas
         deliveryList: Días de entrega
         upcomingList: Próximos repartos
+monitor:
+    pageTitles:
+        monitors: Monitores
+        list: Listado
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index e78d1cc55..6b2296df3 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -1,34 +1,14 @@
 <script setup>
-import { onMounted, watch } from 'vue';
-import { useRoute } from 'vue-router';
-import { useArrayData } from 'src/composables/useArrayData';
-
 import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
-
-const route = useRoute();
-const arrayData = useArrayData('Agency', {
-    url: `Agencies/${route.params.id}`,
-});
-const { store } = arrayData;
-onMounted(async () => await arrayData.fetch({ append: false }));
-watch(
-    () => route.params.id,
-    async (newId) => {
-        if (newId) {
-            store.url = `Agencies/${newId}`;
-            await arrayData.fetch({ append: false });
-        }
-    }
-);
 </script>
 <template>
     <VnCard
         data-key="Agency"
         base-url="Agencies"
         :descriptor="AgencyDescriptor"
-        searchbar-data-key="AgencyList"
-        searchbar-url="Agencies"
+        search-data-key="AgencyList"
+        search-url="Agencies"
         searchbar-label="agency.searchBar.label"
         searchbar-info="agency.searchBar.info"
     />
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index 0fa89d07d..b9772037c 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -15,8 +15,8 @@ const props = defineProps({
 });
 
 const { t } = useI18n();
-const { params } = useRoute();
-const entityId = computed(() => props.id || params.id);
+const route = useRoute();
+const entityId = computed(() => props.id || route.params.id);
 const { store } = useArrayData('Parking');
 const card = computed(() => store.data);
 </script>
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
index a4a6a2a18..839d88200 100644
--- a/src/pages/Agency/Card/AgencySummary.vue
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -3,26 +3,13 @@ import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'src/components/FetchData.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-const { params } = useRoute();
+const $props = defineProps({ id: { type: Number, default: 0 } });
 const { t } = useI18n();
-const entityId = computed(() => $props.id || params.id);
-
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
+const entityId = computed(() => $props.id || useRoute().params.id);
 </script>
 
 <template>
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index b0650b610..a24a2a15e 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -201,30 +201,7 @@ async function post(query, params) {
         auto-load
         @on-fetch="(data) => (destinationTypes = data)"
     />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="300"
-        show-if-above
-        v-if="claim"
-    >
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted() && claim">
         <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
             {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
         </QCard>
@@ -274,7 +251,7 @@ async function post(query, params) {
                 v-model="multiplicatorValue"
             />
         </QCard>
-    </QDrawer>
+    </Teleport>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
     <CrudModel
         v-if="claim"
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 7f29acda0..4a2dc243f 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -95,89 +95,76 @@ const statesFilter = {
     >
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.client.name"
-                        :label="t('claim.basicData.customer')"
-                        disable
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate
-                        v-model="data.created"
-                        :label="t('claim.basicData.created')"
-                    />
-                </div>
+                <VnInput
+                    v-model="data.client.name"
+                    :label="t('claim.basicData.customer')"
+                    disable
+                />
+                <VnInputDate
+                    v-model="data.created"
+                    :label="t('claim.basicData.created')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('claim.basicData.assignedTo')"
-                        v-model="data.workerFk"
-                        :options="workersOptions"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        auto-load
-                        :rules="validate('claim.claimStateFk')"
-                    >
-                        <template #before>
-                            <QAvatar color="orange">
-                                <QImg
-                                    v-if="data.workerFk"
-                                    :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
-                                    spinner-color="white"
-                                />
-                            </QAvatar>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <QSelect
-                        v-model="data.claimStateFk"
-                        :options="claimStates"
-                        option-value="id"
-                        option-label="description"
-                        emit-value
-                        :label="t('claim.basicData.state')"
-                        map-options
-                        use-input
-                        @filter="(value, update) => filter(value, update, statesFilter)"
-                        :rules="validate('claim.claimStateFk')"
-                        :input-debounce="0"
-                    >
-                    </QSelect>
-                </div>
+                <VnSelect
+                    :label="t('claim.basicData.assignedTo')"
+                    v-model="data.workerFk"
+                    :options="workersOptions"
+                    option-value="id"
+                    option-label="name"
+                    emit-value
+                    auto-load
+                    :rules="validate('claim.claimStateFk')"
+                >
+                    <template #before>
+                        <QAvatar color="orange">
+                            <QImg
+                                v-if="data.workerFk"
+                                :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
+                                spinner-color="white"
+                            />
+                        </QAvatar>
+                    </template>
+                </VnSelect>
+                <QSelect
+                    v-model="data.claimStateFk"
+                    :options="claimStates"
+                    option-value="id"
+                    option-label="description"
+                    emit-value
+                    :label="t('claim.basicData.state')"
+                    map-options
+                    use-input
+                    @filter="(value, update) => filter(value, update, statesFilter)"
+                    :rules="validate('claim.claimStateFk')"
+                    :input-debounce="0"
+                >
+                </QSelect>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        v-model.number="data.packages"
-                        :label="t('globals.packages')"
-                        :rules="validate('claim.packages')"
-                        type="textarea"
-                    />
-                    <QInput
-                        v-model.number="data.packages"
-                        :label="t('globals.packages')"
-                        :rules="validate('claim.packages')"
-                        type="text"
-                    />
-                </div>
-                <div class="col">
-                    <QSelect
-                        v-model="data.pickup"
-                        :options="optionsList"
-                        option-value="id"
-                        option-label="description"
-                        emit-value
-                        :label="t('claim.basicData.pickup')"
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    >
-                    </QSelect>
-                </div>
+                <QInput
+                    v-model.number="data.packages"
+                    :label="t('globals.packages')"
+                    :rules="validate('claim.packages')"
+                    type="textarea"
+                />
+                <QInput
+                    v-model.number="data.packages"
+                    :label="t('globals.packages')"
+                    :rules="validate('claim.packages')"
+                    type="text"
+                />
+                <QSelect
+                    v-model="data.pickup"
+                    :options="optionsList"
+                    option-value="id"
+                    option-label="description"
+                    emit-value
+                    :label="t('claim.basicData.pickup')"
+                    map-options
+                    use-input
+                    :input-debounce="0"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index b2f9c4d2e..f38ab5484 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
+import ClaimFilter from '../ClaimFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Claim"
         base-url="Claims"
         :descriptor="ClaimDescriptor"
-        searchbar-data-key="ClaimList"
-        searchbar-url="Claims/filter"
+        :filter-panel="ClaimFilter"
+        search-data-key="ClaimList"
+        search-url="Claims/filter"
         searchbar-label="Search claim"
         searchbar-info="You can search by claim id or customer name"
     />
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 6e0a08f2c..c3c5f5b7b 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -12,7 +12,6 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { getUrl } from 'src/composables/getUrl';
 
 const stateStore = useStateStore();
 const router = useRouter();
diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index cd5ef1483..6c8279d84 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -202,9 +202,9 @@ const toCustomerAddressEdit = (addressId) => {
 
                     <div v-if="item.observations.length">
                         <div
-                            :key="index"
+                            :key="obIndex"
                             class="flex q-mb-sm"
-                            v-for="(observation, index) in item.observations"
+                            v-for="(observation, obIndex) in item.observations"
                         >
                             <div class="text-weight-bold q-mr-sm">
                                 {{ observation.observationType.description }}:
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 2c1d6eccc..0886383de 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -11,6 +11,7 @@ import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { useValidator } from 'src/composables/useValidator';
 import { usePrintService } from 'src/composables/usePrintService';
+import { useSession } from 'src/composables/useSession';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -19,6 +20,9 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+const session = useSession();
+
+const tokenMultimedia = session.getTokenMultimedia();
 
 const { sendEmail } = usePrintService();
 const { t } = useI18n();
@@ -188,6 +192,11 @@ const saveFieldValue = async (row) => {
 const sendEmailAction = () => {
     sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`);
 };
+
+const showBalancePdf = (balance) => {
+    const url = `api/InvoiceOuts/${balance.id}/download?access_token=${tokenMultimedia}`;
+    window.open(url, '_blank');
+};
 </script>
 
 <template>
@@ -257,17 +266,28 @@ const sendEmailAction = () => {
                     <QTd align="center">
                         <QIcon
                             @click.stop="showDialog = true"
-                            class="q-ml-md"
+                            class="q-ml-md fill-icon"
                             color="primary"
                             name="outgoing_mail"
                             size="sm"
-                            style="font-variation-settings: 'FILL' 1"
                             v-if="row.isCompensation"
                         >
                             <QTooltip>
                                 {{ t('Send compensation') }}
                             </QTooltip>
                         </QIcon>
+                        <QIcon
+                            @click="showBalancePdf(row)"
+                            class="q-ml-md fill-icon"
+                            color="primary"
+                            name="cloud_download"
+                            size="sm"
+                            v-if="row.hasPdf"
+                        >
+                            <QTooltip>
+                                {{ t('globals.downloadPdf') }}
+                            </QTooltip>
+                        </QIcon>
 
                         <QDialog v-model="showDialog">
                             <QCard class="q-pa-sm">
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index d646b810e..b0c2d60e3 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -70,138 +70,121 @@ const filterOptions = {
     <FormModel :url="`Clients/${route.params.id}`" auto-load model="customer">
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Comercial name')"
-                        :rules="validate('client.socialName')"
-                        autofocus
-                        clearable
-                        v-model="data.name"
-                    />
-                </div>
-                <div class="col">
-                    <QSelect
-                        :input-debounce="0"
-                        :label="t('customer.basicData.businessType')"
-                        :options="businessTypes"
-                        :rules="validate('client.businessTypeFk')"
-                        emit-value
-                        map-options
-                        option-label="description"
-                        option-value="code"
-                        v-model="data.businessTypeFk"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Comercial name')"
+                    :rules="validate('client.socialName')"
+                    autofocus
+                    clearable
+                    v-model="data.name"
+                />
+
+                <QSelect
+                    :input-debounce="0"
+                    :label="t('customer.basicData.businessType')"
+                    :options="businessTypes"
+                    :rules="validate('client.businessTypeFk')"
+                    emit-value
+                    map-options
+                    option-label="description"
+                    option-value="code"
+                    v-model="data.businessTypeFk"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('customer.basicData.contact')"
-                        :rules="validate('client.contact')"
-                        clearable
-                        v-model="data.contact"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('customer.basicData.email')"
-                        :rules="validate('client.email')"
-                        clearable
-                        type="email"
-                        v-model="data.email"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{
-                                    t('customer.basicData.youCanSaveMultipleEmails')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                </div>
+                <VnInput
+                    :label="t('customer.basicData.contact')"
+                    :rules="validate('client.contact')"
+                    clearable
+                    v-model="data.contact"
+                />
+                <VnInput
+                    :label="t('customer.basicData.email')"
+                    :rules="validate('client.email')"
+                    clearable
+                    type="email"
+                    v-model="data.email"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-info">
+                            <QTooltip>{{
+                                t('customer.basicData.youCanSaveMultipleEmails')
+                            }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </VnInput>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('customer.basicData.phone')"
-                        :rules="validate('client.phone')"
-                        clearable
-                        v-model="data.phone"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('customer.basicData.mobile')"
-                        :rules="validate('client.mobile')"
-                        clearable
-                        v-model="data.mobile"
-                    />
-                </div>
+                <VnInput
+                    :label="t('customer.basicData.phone')"
+                    :rules="validate('client.phone')"
+                    clearable
+                    v-model="data.phone"
+                />
+                <VnInput
+                    :label="t('customer.basicData.mobile')"
+                    :rules="validate('client.mobile')"
+                    clearable
+                    v-model="data.mobile"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QSelect
-                        :input-debounce="0"
-                        :label="t('customer.basicData.salesPerson')"
-                        :options="workers"
-                        :rules="validate('client.salesPersonFk')"
-                        @filter="(value, update) => filter(value, update, filterOptions)"
-                        emit-value
-                        map-options
-                        option-label="name"
-                        option-value="id"
-                        use-input
-                        v-model="data.salesPersonFk"
-                    >
-                        <template #prepend>
-                            <QAvatar color="orange">
-                                <QImg
-                                    :src="`/api/Images/user/160x160/${data.salesPersonFk}/download?access_token=${token}`"
-                                    spinner-color="white"
-                                    v-if="data.salesPersonFk"
-                                />
-                            </QAvatar>
-                        </template>
-                    </QSelect>
-                </div>
-                <div class="col">
-                    <QSelect
-                        :input-debounce="0"
-                        :label="t('customer.basicData.contactChannel')"
-                        :options="contactChannels"
-                        :rules="validate('client.contactChannelFk')"
-                        emit-value
-                        map-options
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.contactChannelFk"
-                    />
-                </div>
+                <QSelect
+                    :input-debounce="0"
+                    :label="t('customer.basicData.salesPerson')"
+                    :options="workers"
+                    :rules="validate('client.salesPersonFk')"
+                    @filter="(value, update) => filter(value, update, filterOptions)"
+                    emit-value
+                    map-options
+                    option-label="name"
+                    option-value="id"
+                    use-input
+                    v-model="data.salesPersonFk"
+                >
+                    <template #prepend>
+                        <QAvatar color="orange">
+                            <QImg
+                                :src="`/api/Images/user/160x160/${data.salesPersonFk}/download?access_token=${token}`"
+                                spinner-color="white"
+                                v-if="data.salesPersonFk"
+                            />
+                        </QAvatar>
+                    </template>
+                </QSelect>
+                <QSelect
+                    v-model="data.contactChannelFk"
+                    :options="contactChannels"
+                    option-value="id"
+                    option-label="name"
+                    emit-value
+                    :label="t('customer.basicData.contactChannel')"
+                    map-options
+                    :rules="validate('client.contactChannelFk')"
+                    :input-debounce="0"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QSelect
-                        :input-debounce="0"
-                        :label="t('customer.basicData.previousClient')"
-                        :options="clients"
-                        :rules="validate('client.transferorFk')"
-                        emit-value
-                        map-options
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.transferorFk"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip>{{
-                                    t(
-                                        'In case of a company succession, specify the grantor company'
-                                    )
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QSelect>
-                </div>
+                <QSelect
+                    :input-debounce="0"
+                    :label="t('customer.basicData.previousClient')"
+                    :options="clients"
+                    :rules="validate('client.transferorFk')"
+                    emit-value
+                    map-options
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.transferorFk"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{
+                                t(
+                                    'In case of a company succession, specify the grantor company'
+                                )
+                            }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </QSelect>
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 5cc0c898c..63bbd872c 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -48,74 +48,56 @@ const getBankEntities = (data, formData) => {
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Billing data')"
-                        :options="payMethods"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.payMethod"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
-                </div>
+                <VnSelect
+                    :label="t('Billing data')"
+                    :options="payMethods"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.payMethod"
+                />
+                <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput :label="t('IBAN')" clearable v-model="data.iban">
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                </div>
-                <div class="col">
-                    <VnSelectDialog
-                        :label="t('Swift / BIC')"
-                        :options="bankEntitiesOptions"
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
-                        :rules="validate('Worker.bankEntity')"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.bankEntityFk"
-                    >
-                        <template #form>
-                            <CreateBankEntityForm
-                                @on-data-saved="getBankEntities($event, data)"
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection v-if="scope.opt">
-                                    <QItemLabel
-                                        >{{ scope.opt.bic }}
-                                        {{ scope.opt.name }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
-                </div>
+                <VnInput :label="t('IBAN')" clearable v-model="data.iban">
+                    <template #append>
+                        <QIcon name="info" class="cursor-info">
+                            <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </VnInput>
+                <VnSelectDialog
+                    :label="t('Swift / BIC')"
+                    :options="bankEntitiesOptions"
+                    :roles-allowed-to-create="['salesAssistant', 'hr']"
+                    :rules="validate('Worker.bankEntity')"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.bankEntityFk"
+                >
+                    <template #form>
+                        <CreateBankEntityForm
+                            @on-data-saved="getBankEntities($event, data)"
+                        />
+                    </template>
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection v-if="scope.opt">
+                                <QItemLabel
+                                    >{{ scope.opt.bic }} {{ scope.opt.name }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelectDialog>
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('VNL core received')"
-                        v-model="data.hasCoreVnl"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />
-                </div>
+                <QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
+                <QCheckbox :label="t('VNL core received')" v-model="data.hasCoreVnl" />
+                <QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 872bd7da7..98842a0c7 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
+import CustomerFilter from '../CustomerFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
-        searchbar-data-key="CustomerList"
-        searchbar-url="Clients/filter"
+        :filter-panel="CustomerFilter"
+        search-data-key="CustomerList"
+        search-url="Clients/filter"
         searchbar-label="Search customer"
         searchbar-info="You can search by customer id or name"
     />
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 1729ac076..568adcf0b 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -105,7 +105,7 @@ const updateData = () => {
                                             color="primary"
                                             name="lock"
                                             size="md"
-                                            style="font-variation-settings: 'FILL' 1"
+                                            class="fill-icon"
                                         >
                                             <QTooltip>{{ t('Close contract') }}</QTooltip>
                                         </QIcon>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 467ea1845..deaaefc50 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -41,93 +41,75 @@ function handleLocation(data, location) {
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Social name')"
-                        :required="true"
-                        :rules="validate('client.socialName')"
-                        clearable
-                        v-model="data.socialName"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('onlyLetters') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Tax number')" clearable v-model="data.fi" />
-                </div>
+                <VnInput
+                    :label="t('Social name')"
+                    :required="true"
+                    :rules="validate('client.socialName')"
+                    clearable
+                    v-model="data.socialName"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-info">
+                            <QTooltip>{{ t('onlyLetters') }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </VnInput>
+                <VnInput :label="t('Tax number')" clearable v-model="data.fi" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput :label="t('Street')" clearable v-model="data.street" />
-                </div>
+                <VnInput :label="t('Street')" clearable v-model="data.street" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Sage tax type')"
-                        :options="typesTaxes"
-                        hide-selected
-                        option-label="vat"
-                        option-value="id"
-                        v-model="data.sageTaxTypeFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Sage transaction type')"
-                        :options="typesTransactions"
-                        hide-selected
-                        option-label="transaction"
-                        option-value="id"
-                        v-model="data.sageTransactionTypeFk"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ `${scope.opt.id}: ${scope.opt.transaction}` }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
+                <VnSelect
+                    :label="t('Sage tax type')"
+                    :options="typesTaxes"
+                    hide-selected
+                    option-label="vat"
+                    option-value="id"
+                    v-model="data.sageTaxTypeFk"
+                />
+                <VnSelect
+                    :label="t('Sage transaction type')"
+                    :options="typesTransactions"
+                    hide-selected
+                    option-label="transaction"
+                    option-value="id"
+                    v-model="data.sageTransactionTypeFk"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ `${scope.opt.id}: ${scope.opt.transaction}` }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
-                        v-model="data.postcode"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                    >
-                    </VnLocation>
-                </div>
+                <VnLocation
+                    :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :options="postcodesOptions"
+                    v-model="data.postcode"
+                    @update:model-value="(location) => handleLocation(data, location)"
+                >
+                </VnLocation>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox :label="t('Active')" v-model="data.isActive" />
-                </div>
-                <div class="col">
-                    <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
-                </div>
+            <VnRow>
+                <QCheckbox :label="t('Active')" v-model="data.isActive" />
+                <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
-                </div>
-                <div class="col">
+            <VnRow>
+                <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
+                <div>
                     <QCheckbox :label="t('Vies')" v-model="data.isVies" />
                     <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                         <QTooltip>
@@ -137,23 +119,16 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Notify by email')"
-                        v-model="data.isToBeMailed"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Invoice by address')"
-                        v-model="data.hasToInvoiceByAddress"
-                    />
-                </div>
+            <VnRow>
+                <QCheckbox :label="t('Notify by email')" v-model="data.isToBeMailed" />
+                <QCheckbox
+                    :label="t('Invoice by address')"
+                    v-model="data.hasToInvoiceByAddress"
+                />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+            <VnRow>
+                <div>
                     <QCheckbox
                         :label="t('Is equalizated')"
                         v-model="data.isEqualizated"
@@ -164,27 +139,18 @@ function handleLocation(data, location) {
                         </QTooltip>
                     </QIcon>
                 </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Verified data')"
-                        v-model="data.isTaxDataChecked"
-                    />
-                </div>
+                <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Incoterms authorization')"
-                        v-model="data.hasIncoterms"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('Electronic invoice')"
-                        v-model="data.hasElectronicInvoice"
-                    />
-                </div>
+            <VnRow>
+                <QCheckbox
+                    :label="t('Incoterms authorization')"
+                    v-model="data.hasIncoterms"
+                />
+                <QCheckbox
+                    :label="t('Electronic invoice')"
+                    v-model="data.hasElectronicInvoice"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 0c6e04520..0dcb3a3a9 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -1,20 +1,17 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
-
+import { useRoute } from 'vue-router';
 import { QBtn } from 'quasar';
-
+import { useStateStore } from 'src/stores/useStateStore';
 import { toCurrency } from 'src/filters';
 import { toDateTimeFormat } from 'src/filters/date';
-
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
-
+const stateStore = computed(() => useStateStore());
 const rows = ref([]);
 const totalAmount = ref(0);
 
@@ -105,28 +102,40 @@ const columns = computed(() => [
 
 const setRows = (data) => {
     rows.value = data;
-    totalAmount.value = data.reduce((accumulator, currentValue) => {
-        return accumulator + currentValue.amount;
-    }, 0);
-};
-
-const toCustomerGreugeCreate = () => {
-    router.push({ name: 'CustomerGreugeCreate' });
+    totalAmount.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
 </script>
 
 <template>
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
-
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
+        <QCard class="full-width q-pa-sm">
+            <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount">
+                <span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
+                {{ toCurrency(totalAmount) }}
+            </h6>
+            <QSkeleton v-else type="QInput" square />
+        </QCard>
+    </QDrawer>
     <div class="full-width flex justify-center">
         <QPage class="card-width q-pa-lg">
-            <QCard class="full-width q-pa-sm" v-if="totalAmount">
-                <h6 class="flex justify-end q-my-lg q-pr-lg">
-                    <span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
-                    {{ toCurrency(totalAmount) }}
-                </h6>
-            </QCard>
-
             <QCard class="q-pa-sm q-mt-md">
                 <QTable
                     :columns="columns"
@@ -164,7 +173,7 @@ const toCustomerGreugeCreate = () => {
     </div>
 
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerGreugeCreate()" color="primary" fab icon="add" />
+        <QBtn color="primary" fab icon="add" :to="{ name: 'CustomerGreugeCreate' }" />
         <QTooltip>
             {{ t('New greuge') }}
         </QTooltip>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index f447c5256..9e534235c 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -11,7 +11,6 @@ import useNotify from 'src/composables/useNotify';
 import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 
diff --git a/src/pages/Customer/Card/CustomerWebPayment.vue b/src/pages/Customer/Card/CustomerWebPayment.vue
index b1c45aa6c..13ec6b128 100644
--- a/src/pages/Customer/Card/CustomerWebPayment.vue
+++ b/src/pages/Customer/Card/CustomerWebPayment.vue
@@ -7,7 +7,6 @@ import axios from 'axios';
 
 import { toCurrency, toDateHourMinSec } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
 import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
 import CustomerCheckIconTooltip from '../components/CustomerCheckIconTooltip.vue';
 
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index c6486780d..80bfd1efe 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -49,89 +49,69 @@ function handleLocation(data, location) {
         >
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput :label="t('Comercial name')" v-model="data.name" />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Salesperson')"
-                            :options="workersOptions"
-                            hide-selected
-                            option-label="name"
-                            option-value="id"
-                            v-model="data.salesPersonFk"
-                        />
-                    </div>
+                    <QInput :label="t('Comercial name')" v-model="data.name" />
+                    <VnSelect
+                        :label="t('Salesperson')"
+                        :options="workersOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.salesPersonFk"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Business type')"
-                            :options="businessTypesOptions"
-                            hide-selected
-                            option-label="description"
-                            option-value="code"
-                            v-model="data.businessTypeFk"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput v-model="data.fi" :label="t('Tax number')" />
-                    </div>
+                    <VnSelect
+                        :label="t('Business type')"
+                        :options="businessTypesOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="code"
+                        v-model="data.businessTypeFk"
+                    />
+                    <QInput v-model="data.fi" :label="t('Tax number')" />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput
-                            :label="t('Business name')"
-                            :rules="validate('client.socialName')"
-                            v-model="data.socialName"
-                        />
-                    </div>
+                    <QInput
+                        :label="t('Business name')"
+                        :rules="validate('client.socialName')"
+                        v-model="data.socialName"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput
-                            :label="t('Street')"
-                            :rules="validate('client.street')"
-                            v-model="data.street"
-                        />
-                    </div>
+                    <QInput
+                        :label="t('Street')"
+                        :rules="validate('client.street')"
+                        v-model="data.street"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnLocation
-                            :rules="validate('Worker.postcode')"
-                            :roles-allowed-to-create="['deliveryAssistant']"
-                            :options="postcodesOptions"
-                            v-model="data.location"
-                            @update:model-value="
-                                (location) => handleLocation(data, location)
-                            "
-                        >
-                        </VnLocation>
-                    </div>
+                    <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">
-                    <div class="col">
-                        <QInput v-model="data.userName" :label="t('Web user')" />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('Email')"
-                            :rules="validate('client.email')"
-                            clearable
-                            type="email"
-                            v-model="data.email"
-                        >
-                            <template #append>
-                                <QIcon name="info" class="cursor-info">
-                                    <QTooltip max-width="400px">{{
-                                        t('customer.basicData.youCanSaveMultipleEmails')
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </QInput>
-                    </div>
+                    <QInput v-model="data.userName" :label="t('Web user')" />
+                    <QInput
+                        :label="t('Email')"
+                        :rules="validate('client.email')"
+                        clearable
+                        type="email"
+                        v-model="data.email"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip max-width="400px">{{
+                                    t('customer.basicData.youCanSaveMultipleEmails')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
                 </VnRow>
                 <QCheckbox
                     :label="t('Is equalizated')"
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 5816eb1ec..c1e537c0a 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -3,10 +3,10 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import { QBtn, QCheckbox, useQuasar } from 'quasar';
+import { useStateStore } from 'stores/useStateStore';
 
-import { toCurrency, toDate } from 'filters/index';
-
-import FetchData from 'components/FetchData.vue';
+import { toCurrency, toDate, dateRange } from 'filters/index';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -14,13 +14,14 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
+const stateStore = useStateStore();
 
-const { t } = useI18n();
+const { t, locale } = useI18n();
 const quasar = useQuasar();
+const dataRef = ref(null);
 
 const balanceDueTotal = ref(0);
 const selected = ref([]);
-const rows = ref([]);
 
 const tableColumnComponents = {
     client: {
@@ -167,39 +168,61 @@ const columns = computed(() => [
     },
 ]);
 
-const setRows = (data) => {
-    rows.value = data;
-    balanceDueTotal.value = data.reduce((accumulator, currentValue) => {
-        return accumulator + (currentValue['amount'] || 0);
-    }, 0);
-};
-
 const viewAddObservation = (rowsSelected) => {
     quasar.dialog({
         component: CustomerDefaulterAddObservation,
         componentProps: {
             clients: rowsSelected,
-            promise: refreshData,
+            promise: async () => await dataRef.value.fetch(),
         },
     });
 };
 
-const refreshData = () => {
-    setRows();
+const onFetch = (data) => {
+    for (const element of data) element.isWorker = element.businessTypeFk === 'worker';
+
+    balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
 
-const onFetch = (data) => {
-    for (const element of data) {
-        element.isWorker = element.businessTypeFk === 'worker';
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'clientFk':
+            return { [`d.${param}`]: value?.id };
+        case 'creditInsurance':
+        case 'amount':
+        case 'workerFk':
+        case 'countryFk':
+        case 'payMethod':
+        case 'salesPersonFk':
+            return { [`d.${param}`]: value };
+        case 'date':
+            return { 'd.created': { between: dateRange(value) } };
+        case 'defaulterSinced':
+            return { 'd.defaulterSinced': { between: dateRange(value) } };
     }
-    rows.value = data;
-};
+}
 </script>
 
 <template>
-    <FetchData :filter="filter" @on-fetch="onFetch" auto-load url="Defaulters/filter" />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
 
-    <QDrawer side="right" :width="256" show-if-above>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerNotificationsFilter data-key="CustomerDefaulter" />
         </QScrollArea>
@@ -214,69 +237,107 @@ const onFetch = (data) => {
                     icon="vn:notes"
                     :disabled="!selected.length"
                     @click.stop="viewAddObservation(selected)"
-                />
+                >
+                    <QTooltip>{{ t('Add observation') }}</QTooltip>
+                </QBtn>
             </div>
         </template>
     </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="clientFk"
-            selection="multiple"
-            v-model:selected="selected"
+        <VnPaginate
+            ref="dataRef"
+            @on-fetch="onFetch"
+            data-key="CustomerDefaulter"
+            :filter="filter"
+            :expr-builder="exprBuilder"
+            auto-load
+            url="Defaulters/filter"
         >
-            <template #header="props">
-                <QTr :props="props" class="bg">
-                    <QTh>
-                        <QCheckbox v-model="props.selected" />
-                    </QTh>
-                    <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                        {{ t(col.label) }}
-                        <QTooltip v-if="col.tooltip">{{ col.tooltip }}</QTooltip>
-                    </QTh>
-                </QTr>
-            </template>
+            <template #body="{ rows }">
+                <div class="q-pa-md">
+                    <QTable
+                        :columns="columns"
+                        :rows="rows"
+                        class="full-width q-mt-md"
+                        row-key="clientFk"
+                        selection="multiple"
+                        v-model:selected="selected"
+                    >
+                        <template #header="props">
+                            <QTr :props="props" class="bg">
+                                <QTh>
+                                    <QCheckbox v-model="props.selected" />
+                                </QTh>
+                                <QTh
+                                    v-for="col in props.cols"
+                                    :key="col.name"
+                                    :props="props"
+                                >
+                                    {{ t(col.label) }}
+                                    <QTooltip v-if="col.tooltip">{{
+                                        col.tooltip
+                                    }}</QTooltip>
+                                </QTh>
+                            </QTr>
+                        </template>
 
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                        >
-                            <template v-if="props.col.name !== 'isWorker'">
-                                <div v-if="props.col.name === 'lastObservation'">
-                                    <VnInput
-                                        type="textarea"
-                                        v-model="props.value"
-                                        autogrow
-                                    />
-                                </div>
-                                <div v-else>{{ props.value }}</div>
-                            </template>
+                        <template #body-cell="props">
+                            <QTd :props="props">
+                                <QTr :props="props" class="cursor-pointer">
+                                    <component
+                                        :is="
+                                            tableColumnComponents[props.col.name]
+                                                .component
+                                        "
+                                        class="col-content"
+                                        v-bind="
+                                            tableColumnComponents[props.col.name].props(
+                                                props
+                                            )
+                                        "
+                                        @click="
+                                            tableColumnComponents[props.col.name].event(
+                                                props
+                                            )
+                                        "
+                                    >
+                                        <template v-if="props.col.name !== 'isWorker'">
+                                            <div
+                                                v-if="
+                                                    props.col.name === 'lastObservation'
+                                                "
+                                            >
+                                                <VnInput
+                                                    type="textarea"
+                                                    v-model="props.value"
+                                                    autogrow
+                                                    :disable="true"
+                                                />
+                                            </div>
+                                            <div v-else>{{ props.value }}</div>
+                                        </template>
 
-                            <WorkerDescriptorProxy
-                                :id="props.row.salesPersonFk"
-                                v-if="props.col.name === 'salesPerson'"
-                            />
-                            <WorkerDescriptorProxy
-                                :id="props.row.workerFk"
-                                v-if="props.col.name === 'author'"
-                            />
-                            <CustomerDescriptorProxy
-                                :id="props.row.clientFk"
-                                v-if="props.col.name === 'client'"
-                            />
-                        </component>
-                    </QTr>
-                </QTd>
+                                        <WorkerDescriptorProxy
+                                            :id="props.row.salesPersonFk"
+                                            v-if="props.col.name === 'salesPerson'"
+                                        />
+                                        <WorkerDescriptorProxy
+                                            :id="props.row.workerFk"
+                                            v-if="props.col.name === 'author'"
+                                        />
+                                        <CustomerDescriptorProxy
+                                            :id="props.row.clientFk"
+                                            v-if="props.col.name === 'client'"
+                                        />
+                                    </component>
+                                </QTr>
+                            </QTd>
+                        </template>
+                    </QTable>
+                </div>
             </template>
-        </QTable>
+        </VnPaginate>
     </QPage>
 </template>
 
@@ -289,6 +350,7 @@ const onFetch = (data) => {
 
 <i18n>
 es:
+    Add observation:  Añadir observación
     Client: Cliente
     Is worker: Es trabajador
     Salesperson: Comercial
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
index 2d5125f39..ef1e17e83 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -61,13 +61,11 @@ const onSubmit = async () => {
                         }}
                     </div>
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QInput
-                                :label="t('Message')"
-                                type="textarea"
-                                v-model="newObservation"
-                            />
-                        </div>
+                        <QInput
+                            :label="t('Message')"
+                            type="textarea"
+                            v-model="newObservation"
+                        />
                     </VnRow>
                     <div class="q-mt-lg row justify-end">
                         <QBtn
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 9d173087b..26a6743d5 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -57,7 +57,7 @@ const authors = ref();
                         hide-selected
                         map-options
                         option-label="name"
-                        option-value="clientTypeFk"
+                        option-value="id"
                         outlined
                         rounded
                         use-input
@@ -162,7 +162,7 @@ const authors = ref();
 
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput
+                    <VnInputDate
                         :label="t('L. O. Date')"
                         clearable
                         is-outlined
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index a24d3211a..b5b509d1b 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -10,7 +10,7 @@ import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
 import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
@@ -37,8 +37,6 @@ onMounted(() => {
     allColumnNames.value = filteredColumns.map((col) => col.name);
 });
 
-const rows = computed(() => arrayData.value.store.data);
-
 const selectedCustomerId = ref(0);
 const selectedSalesPersonId = ref(0);
 const allColumnNames = ref([]);
@@ -70,6 +68,11 @@ const tableColumnComponents = {
         props: () => {},
         event: () => {},
     },
+    socialName: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
     fi: {
         component: 'span',
         props: () => {},
@@ -283,6 +286,12 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.name'),
         name: 'name',
     },
+    {
+        align: 'left',
+        field: 'socialName',
+        label: t('customer.extendedList.tableVisibleColumns.socialName'),
+        name: 'socialName',
+    },
     {
         align: 'left',
         field: 'fi',
@@ -485,6 +494,23 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport></template
+    >
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerExtendedListFilter
@@ -495,7 +521,7 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
         </QScrollArea>
     </QDrawer>
     <VnSubToolbar>
-        <template #st-actions>
+        <template #st-data>
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="clientsDetail"
@@ -508,58 +534,97 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
     </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-            :visible-columns="visibleColumns"
-            @row-click="(evt, row, id) => navigateToTravelId(row.id)"
+        <VnPaginate
+            data-key="CustomerExtendedList"
+            url="Clients/extendedListFilter"
+            auto-load
         >
-            <template #body-cell="{ col, value }">
-                <QTd @click="stopEventPropagation($event, col)">
-                    {{ value }}
-                </QTd>
-            </template>
-            <template #body-cell-id="props">
-                <QTd @click="stopEventPropagation($event, props.col)">
-                    <component
-                        :is="tableColumnComponents[props.col.name].component"
-                        class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
+            <template #body="{ rows }">
+                <div class="q-pa-md">
+                    <QTable
+                        :columns="columns"
+                        :rows="rows"
+                        class="full-width q-mt-md"
+                        row-key="id"
+                        :visible-columns="visibleColumns"
+                        @row-click="(evt, row, id) => navigateToTravelId(row.id)"
                     >
-                        <CustomerDescriptorProxy :id="props.row.id" />
-                        {{ props.row.id }}
-                    </component>
-                </QTd>
+                        <template #body-cell="{ col, value }">
+                            <QTd @click="stopEventPropagation($event, col)">
+                                {{ value }}
+                            </QTd>
+                        </template>
+                        <template #body-cell-customerStatus="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    class="col-content"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                >
+                                </component>
+                            </QTd>
+                        </template>
+                        <template #body-cell-id="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    class="col-content"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                >
+                                    <CustomerDescriptorProxy :id="props.row.id" />
+                                    {{ props.row.id }}
+                                </component>
+                            </QTd>
+                        </template>
+                        <template #body-cell-salesPersonFk="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    v-if="props.row.salesPerson"
+                                    class="col-content"
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                >
+                                    <WorkerDescriptorProxy
+                                        :id="props.row.salesPersonFk"
+                                    />
+                                    {{ props.row.salesPerson }}
+                                </component>
+                                <span class="col-content" v-else>-</span>
+                            </QTd>
+                        </template>
+                        <template #body-cell-actions="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    class="col-content"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                />
+                            </QTd>
+                        </template>
+                    </QTable>
+                </div>
             </template>
-            <template #body-cell-salesPersonFk="props">
-                <QTd @click="stopEventPropagation($event, props.col)">
-                    <component
-                        v-if="props.row.salesPerson"
-                        class="col-content"
-                        :is="tableColumnComponents[props.col.name].component"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
-                    >
-                        <WorkerDescriptorProxy :id="props.row.salesPersonFk" />
-                        {{ props.row.salesPerson }}
-                    </component>
-                    <span class="col-content" v-else>-</span>
-                </QTd>
-            </template>
-            <template #body-cell-actions="props">
-                <QTd @click="stopEventPropagation($event, props.col)">
-                    <component
-                        :is="tableColumnComponents[props.col.name].component"
-                        class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
-                    />
-                </QTd>
-            </template>
-        </QTable>
+        </VnPaginate>
     </QPage>
 </template>
 
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index 52ea4cc27..9ff6b2301 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -1,17 +1,16 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import { QBtn } from 'quasar';
-
-import FetchData from 'components/FetchData.vue';
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
 
+const stateStore = useStateStore();
 const { t } = useI18n();
-
-const rows = ref([]);
 const selected = ref([]);
 const selectedCustomerId = ref(0);
 
@@ -82,46 +81,82 @@ const selectCustomerId = (id) => {
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
-        url="Clients"
-    />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
 
-    <QDrawer side="right" :width="256" show-if-above>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerNotificationsFilter data-key="CustomerNotifications" />
         </QScrollArea>
     </QDrawer>
-
-    <VnSubToolbar />
-
+    <VnSubToolbar class="justify-end">
+        <template #st-data>
+            <CustomerNotificationsCampaignConsumption
+                :selected-rows="selected.length > 0"
+                :clients="selected"
+                :promise="refreshData"
+            />
+        </template>
+    </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-            selection="multiple"
-            v-model:selected="selected"
-        >
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                        >
-                            {{ props.value }}
-                            <CustomerDescriptorProxy :id="selectedCustomerId" />
-                        </component>
-                    </QTr>
-                </QTd>
+        <VnPaginate data-key="CustomerNotifications" url="Clients" auto-load>
+            <template #body="{ rows }">
+                <div class="q-pa-md">
+                    <QTable
+                        :columns="columns"
+                        :rows="rows"
+                        class="full-width q-mt-md"
+                        row-key="id"
+                        selection="multiple"
+                        v-model:selected="selected"
+                    >
+                        <template #body-cell="props">
+                            <QTd :props="props">
+                                <QTr :props="props" class="cursor-pointer">
+                                    <component
+                                        :is="
+                                            tableColumnComponents[props.col.name]
+                                                .component
+                                        "
+                                        class="col-content"
+                                        v-bind="
+                                            tableColumnComponents[props.col.name].props(
+                                                props
+                                            )
+                                        "
+                                        @click="
+                                            tableColumnComponents[props.col.name].event(
+                                                props
+                                            )
+                                        "
+                                    >
+                                        {{ props.value }}
+                                        <CustomerDescriptorProxy
+                                            :id="selectedCustomerId"
+                                        />
+                                    </component>
+                                </QTr>
+                            </QTd>
+                        </template>
+                    </QTable>
+                </div>
             </template>
-        </QTable>
+        </VnPaginate>
     </QPage>
 </template>
 
@@ -140,4 +175,5 @@ es:
     Phone: Teléfono
     City: Población
     Email: Email
+    Campaign consumption: Consumo campaña
 </i18n>
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
new file mode 100644
index 000000000..6d8e00966
--- /dev/null
+++ b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
@@ -0,0 +1,152 @@
+<script setup>
+import { ref, toRefs } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify';
+import { useValidator } from 'src/composables/useValidator';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import FetchData from 'src/components/FetchData.vue';
+import { watch } from 'vue';
+import { onMounted } from 'vue';
+const $props = defineProps({
+    clients: {
+        type: Array,
+        required: true,
+    },
+    promise: {
+        type: Function,
+        required: true,
+    },
+    selectedRows: {
+        type: Boolean,
+    },
+});
+
+const { selectedRows } = toRefs($props);
+const { notify } = useNotify();
+const { t } = useI18n();
+const validationsStore = useValidator();
+const campaignParams = ref(null);
+const campaignsOptions = ref(null);
+const moreFields = ref([]);
+const popupProxyRef = ref(null);
+const upcomingOptions = ref(null);
+const campaignChange = ({ name }) => {
+    const campaign = campaignsOptions.value.find((c) => c.code === name);
+    handleDates(campaign);
+};
+const handleDates = (campaign) => {
+    const from = new Date(campaign.dated);
+    from.setDate(from.getDate() - campaign.scopeDays);
+    campaignParams.value = {
+        code: campaign.code,
+        from: from,
+        to: campaign.dated,
+    };
+};
+watch(selectedRows, () => {
+    handleDates(upcomingOptions.value);
+});
+const onSubmit = async () => {
+    try {
+        const data = {
+            clients: $props.clients.map((item) => item.id),
+            from: campaignParams.value.from,
+            to: campaignParams.value.to,
+        };
+        const params = JSON.stringify(data);
+        await axios.post('ClientConsumptionQueues', { params });
+
+        notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
+    } catch (error) {
+        notify(error.message, 'negative');
+    }
+};
+
+onMounted(async () => {
+    const { models } = validationsStore;
+    const properties = models.Item?.properties || {};
+    const _moreFields = ['valentinesDay', 'mothersDay', 'allSaints'];
+
+    _moreFields.forEach((field) => {
+        let prop = properties[field];
+        const label = t(`params.${field}`);
+        moreFields.value.push({
+            name: field,
+            label,
+            type: prop ? prop.type : null,
+        });
+    });
+});
+</script>
+
+<template>
+    <FetchData
+        url="Campaigns/latest"
+        @on-fetch="(data) => (campaignsOptions = data)"
+        :filter="{ fields: ['id', 'code', 'dated'], order: 'code ASC', limit: 30 }"
+        auto-load
+    />
+    <FetchData
+        url="Campaigns/upcoming"
+        @on-fetch="(data) => (upcomingOptions = data)"
+        auto-load
+    />
+    <QBtn color="primary" icon="show_chart" :disable="!selectedRows">
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :options="moreFields"
+                        option-value="code"
+                        option-label="label"
+                        v-model="campaignParams.code"
+                        :label="t('Campaign')"
+                        @update:model-value="campaignChange"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInputDate v-model="campaignParams.from" :label="t('From')" />
+                    <VnInputDate v-model="campaignParams.to" :label="t('To')" />
+                </VnRow>
+                <div class="q-mt-lg row justify-end">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        color="primary"
+                        flat
+                        class="q-mr-md"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :label="t('globals.save')"
+                        type="submit"
+                        color="primary"
+                        @click="onSubmit()"
+                    />
+                </div>
+            </QCard>
+        </QPopupProxy>
+        <QTooltip>{{ t('Campaign consumption') }}</QTooltip>
+    </QBtn>
+</template>
+
+<i18n>
+    en:
+        params:
+            valentinesDay: Valentine's Day
+            mothersDay: Mother's Day
+            allSaints: All Saints' Day
+    es:
+        params:
+            valentinesDay: Día de San Valentín
+            mothersDay: Día de la Madre
+            allSaints: Día de Todos los Santos
+        Campaign consumption: Consumo campaña
+        Campaign: Campaña
+        From: Desde
+        To: Hasta
+</i18n>
diff --git a/src/pages/Customer/Payments/CustomerPayments.vue b/src/pages/Customer/Payments/CustomerPayments.vue
index 623d610ef..e53da84a3 100644
--- a/src/pages/Customer/Payments/CustomerPayments.vue
+++ b/src/pages/Customer/Payments/CustomerPayments.vue
@@ -110,13 +110,7 @@ function stateColor(row) {
             </div>
         </Teleport>
     </template>
-    <QDrawer
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        show-if-above
-        :breakpoint="1600"
-    >
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerPaymentsFilter data-key="CustomerTransactions" />
         </QScrollArea>
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index d92377f54..57997fb01 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -11,7 +11,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 734924993..2d14b571e 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -11,7 +11,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Customer/components/CustomerGreugeCreate.vue b/src/pages/Customer/components/CustomerGreugeCreate.vue
index aefc4b891..fc315d808 100644
--- a/src/pages/Customer/components/CustomerGreugeCreate.vue
+++ b/src/pages/Customer/components/CustomerGreugeCreate.vue
@@ -56,33 +56,25 @@ const toCustomerGreuges = () => {
 
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Amount')"
-                        clearable
-                        type="number"
-                        v-model="data.amount"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate :label="t('Date')" v-model="data.shipped" />
-                </div>
+                <VnInput
+                    :label="t('Amount')"
+                    clearable
+                    type="number"
+                    v-model="data.amount"
+                />
+                <VnInputDate :label="t('Date')" v-model="data.shipped" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput :label="t('Comment')" clearable v-model="data.description" />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Type')"
-                        :options="greugeTypes"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="data.greugeTypeFk"
-                    />
-                </div>
+                <VnInput :label="t('Comment')" clearable v-model="data.description" />
+                <VnSelect
+                    :label="t('Type')"
+                    :options="greugeTypes"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.greugeTypeFk"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
index 062fd0254..3c95dcae6 100644
--- a/src/pages/Customer/components/CustomerNewCustomsAgent.vue
+++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnRow from 'components/ui/VnRow.vue';
@@ -24,30 +23,22 @@ const onDataSaved = (dataSaved) => {
     >
         <template #form-inputs="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('NIF')"
-                        :required="true"
-                        clearable
-                        v-model="data.nif"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('Fiscal name')"
-                        :required="true"
-                        clearable
-                        v-model="data.fiscalName"
-                    />
-                </div>
+                <VnInput
+                    :label="t('NIF')"
+                    :required="true"
+                    clearable
+                    v-model="data.nif"
+                />
+                <VnInput
+                    :label="t('Fiscal name')"
+                    :required="true"
+                    clearable
+                    v-model="data.fiscalName"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput :label="t('Street')" clearable v-model="data.street" />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Phone')" clearable v-model="data.phone" />
-                </div>
+                <VnInput :label="t('Street')" clearable v-model="data.street" />
+                <VnInput :label="t('Phone')" clearable v-model="data.phone" />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 07cb692b4..cc92d7907 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -135,60 +135,52 @@ const onDataSaved = async () => {
                 <h5 class="q-mt-none">{{ t('New payment') }}</h5>
 
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInputDate
-                            :label="t('Date')"
-                            :required="true"
-                            v-model="data.payed"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Company')"
-                            :options="companyOptions"
-                            :required="true"
-                            :rules="validate('entry.companyFk')"
-                            hide-selected
-                            option-label="code"
-                            option-value="id"
-                            v-model="data.companyFk"
-                        />
-                    </div>
+                    <VnInputDate
+                        :label="t('Date')"
+                        :required="true"
+                        v-model="data.payed"
+                    />
+                    <VnSelect
+                        :label="t('Company')"
+                        :options="companyOptions"
+                        :required="true"
+                        :rules="validate('entry.companyFk')"
+                        hide-selected
+                        option-label="code"
+                        option-value="id"
+                        v-model="data.companyFk"
+                    />
                 </VnRow>
 
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Bank')"
-                            :options="bankOptions"
-                            :required="true"
-                            @update:model-value="setPaymentType($event)"
-                            hide-selected
-                            option-label="bank"
-                            option-value="id"
-                            v-model="data.bankFk"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{ scope.opt.id }}:&ensp;{{ scope.opt.bank }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            :label="t('Amount')"
-                            :required="true"
-                            @update:model-value="calculateFromAmount($event)"
-                            clearable
-                            type="number"
-                            v-model.number="data.amountPaid"
-                        />
-                    </div>
+                    <VnSelect
+                        :label="t('Bank')"
+                        :options="bankOptions"
+                        :required="true"
+                        @update:model-value="setPaymentType($event)"
+                        hide-selected
+                        option-label="bank"
+                        option-value="id"
+                        v-model="data.bankFk"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt.id }}:&ensp;{{ scope.opt.bank }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnInput
+                        :label="t('Amount')"
+                        :required="true"
+                        @update:model-value="calculateFromAmount($event)"
+                        clearable
+                        type="number"
+                        v-model.number="data.amountPaid"
+                    />
                 </VnRow>
 
                 <div class="text-h6" v-if="data.bankFk === 3 || data.bankFk === 3117">
@@ -203,47 +195,37 @@ const onDataSaved = async () => {
                             v-model="data.compensationAccount"
                         />
                     </div>
-                    <div class="col">
-                        <VnInput
-                            :label="t('Reference')"
-                            :required="true"
-                            clearable
-                            v-model="data.description"
-                        />
-                    </div>
+                    <VnInput
+                        :label="t('Reference')"
+                        :required="true"
+                        clearable
+                        v-model="data.description"
+                    />
                 </VnRow>
 
                 <div class="q-mt-lg" v-if="data.bankFk === 2">
                     <div class="text-h6">{{ t('Cash') }}</div>
 
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <VnInput
-                                :label="t('Delivered amount')"
-                                @update:model-value="calculateFromDeliveredAmount($event)"
-                                clearable
-                                type="number"
-                                v-model="deliveredAmount"
-                            />
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('Amount to return')"
-                                clearable
-                                disable
-                                type="number"
-                                v-model="amountToReturn"
-                            />
-                        </div>
+                        <VnInput
+                            :label="t('Delivered amount')"
+                            @update:model-value="calculateFromDeliveredAmount($event)"
+                            clearable
+                            type="number"
+                            v-model="deliveredAmount"
+                        />
+                        <VnInput
+                            :label="t('Amount to return')"
+                            clearable
+                            disable
+                            type="number"
+                            v-model="amountToReturn"
+                        />
                     </VnRow>
 
                     <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QCheckbox v-model="viewRecipt" />
-                        </div>
-                        <div class="col">
-                            <QCheckbox v-model="sendEmail" />
-                        </div>
+                        <QCheckbox v-model="viewRecipt" />
+                        <QCheckbox v-model="sendEmail" />
                     </VnRow>
                 </div>
 
diff --git a/src/pages/Customer/components/CustomerNoteCreate.vue b/src/pages/Customer/components/CustomerNoteCreate.vue
index c6ea2d4eb..ef9982195 100644
--- a/src/pages/Customer/components/CustomerNoteCreate.vue
+++ b/src/pages/Customer/components/CustomerNoteCreate.vue
@@ -45,9 +45,7 @@ const toCustomerNotes = () => {
 
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput :label="t('Note')" type="textarea" v-model="data.text" />
-                </div>
+                <QInput :label="t('Note')" type="textarea" v-model="data.text" />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/components/CustomerRecoverieCreate.vue b/src/pages/Customer/components/CustomerRecoverieCreate.vue
index b4ef5a9a3..e70f85308 100644
--- a/src/pages/Customer/components/CustomerRecoverieCreate.vue
+++ b/src/pages/Customer/components/CustomerRecoverieCreate.vue
@@ -50,31 +50,23 @@ const toCustomerRecoveries = () => {
 
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInputDate :label="t('Since')" v-model="data.started" />
-                </div>
-                <div class="col">
-                    <VnInputDate :label="t('To')" v-model="data.finished" />
-                </div>
+                <VnInputDate :label="t('Since')" v-model="data.started" />
+                <VnInputDate :label="t('To')" v-model="data.finished" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('Amount')"
-                        clearable
-                        type="number"
-                        v-model="data.amount"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('Period')"
-                        clearable
-                        type="number"
-                        v-model="data.period"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Amount')"
+                    clearable
+                    type="number"
+                    v-model="data.amount"
+                />
+                <VnInput
+                    :label="t('Period')"
+                    clearable
+                    type="number"
+                    v-model="data.period"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 4210a62bc..165a959d0 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -30,105 +30,83 @@ const clientsOptions = ref([]);
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('department.name')"
-                        v-model="data.name"
-                        :rules="validate('department.name')"
-                        clearable
-                        autofocus
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.code"
-                        :label="t('department.code')"
-                        :rules="validate('department.code')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    :label="t('department.name')"
+                    v-model="data.name"
+                    :rules="validate('department.name')"
+                    clearable
+                    autofocus
+                />
+                <VnInput
+                    v-model="data.code"
+                    :label="t('department.code')"
+                    :rules="validate('department.code')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('department.chat')"
-                        v-model="data.chatName"
-                        :rules="validate('department.chat')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.notificationEmail"
-                        :label="t('department.email')"
-                        :rules="validate('department.email')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    :label="t('department.chat')"
+                    v-model="data.chatName"
+                    :rules="validate('department.chat')"
+                    clearable
+                />
+                <VnInput
+                    v-model="data.notificationEmail"
+                    :label="t('department.email')"
+                    :rules="validate('department.email')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('department.bossDepartment')"
-                        v-model="data.workerFk"
-                        :options="workersOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        map-options
-                        :rules="validate('department.workerFk')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('department.selfConsumptionCustomer')"
-                        v-model="data.clientFk"
-                        :options="clientsOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        map-options
-                        :rules="validate('department.clientFk')"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('department.bossDepartment')"
+                    v-model="data.workerFk"
+                    :options="workersOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                    map-options
+                    :rules="validate('department.workerFk')"
+                />
+                <VnSelect
+                    :label="t('department.selfConsumptionCustomer')"
+                    v-model="data.clientFk"
+                    :options="clientsOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                    map-options
+                    :rules="validate('department.clientFk')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('department.telework')"
-                        v-model="data.isTeleworking"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('department.notifyOnErrors')"
-                        v-model="data.hasToMistake"
-                        :false-value="0"
-                        :true-value="1"
-                    />
-                </div>
+                <QCheckbox
+                    :label="t('department.telework')"
+                    v-model="data.isTeleworking"
+                />
+                <QCheckbox
+                    :label="t('department.notifyOnErrors')"
+                    v-model="data.hasToMistake"
+                    :false-value="0"
+                    :true-value="1"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('department.worksInProduction')"
-                        v-model="data.isProduction"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('department.hasToRefill')"
-                        v-model="data.hasToRefill"
-                    />
-                </div>
+                <QCheckbox
+                    :label="t('department.worksInProduction')"
+                    v-model="data.isProduction"
+                />
+                <QCheckbox
+                    :label="t('department.hasToRefill')"
+                    v-model="data.hasToRefill"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('department.hasToSendMail')"
-                        v-model="data.hasToSendMail"
-                    />
-                </div>
+                <QCheckbox
+                    :label="t('department.hasToSendMail')"
+                    v-model="data.hasToSendMail"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
index e60a8c91b..70c578fc2 100644
--- a/src/pages/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-
+import { useVnConfirm } from 'composables/useVnConfirm';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import useCardDescription from 'src/composables/useCardDescription';
@@ -43,30 +43,17 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.name, entity.id);
 };
 
-const removeDepartment = () => {
-    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');
-            }
-        });
+const removeDepartment = 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');
+    }
 };
+
+const { openConfirmationModal } = useVnConfirm();
 </script>
 <template>
     <CardDescriptor
@@ -84,7 +71,17 @@ const removeDepartment = () => {
         "
     >
         <template #menu="{}">
-            <QItem v-ripple clickable @click="removeDepartment()">
+            <QItem
+                v-ripple
+                clickable
+                @click="
+                    openConfirmationModal(
+                        t('Are you sure you want to delete it?'),
+                        t('Delete department'),
+                        removeDepartment
+                    )
+                "
+            >
                 <QItemSection>{{ t('Delete') }}</QItemSection>
             </QItem>
         </template>
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 3a6c72a4b..2640d72e4 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -68,152 +68,126 @@ const onFilterTravelSelected = (formData, id) => {
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.supplier')"
-                        v-model="data.supplierFk"
-                        :options="suppliersOptions"
-                        option-value="id"
-                        option-label="nickname"
-                        hide-selected
-                        :required="true"
-                        map-options
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <VnSelectDialog
-                        :label="t('entry.basicData.travel')"
-                        v-model="data.travelFk"
-                        :options="travelsOptions"
-                        option-value="id"
-                        option-label="warehouseInName"
-                        map-options
-                        hide-selected
-                        :required="true"
-                        action-icon="filter_alt"
-                    >
-                        <template #form>
-                            <FilterTravelForm
-                                @travel-selected="onFilterTravelSelected(data, $event)"
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel
-                                        >{{ scope.opt?.agencyModeName }} -
-                                        {{ scope.opt?.warehouseInName }} ({{
-                                            toDate(scope.opt?.shipped)
-                                        }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
-                                            toDate(scope.opt?.landed)
-                                        }})</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
-                </div>
+                <VnSelect
+                    :label="t('entry.basicData.supplier')"
+                    v-model="data.supplierFk"
+                    :options="suppliersOptions"
+                    option-value="id"
+                    option-label="nickname"
+                    hide-selected
+                    :required="true"
+                    map-options
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelectDialog
+                    :label="t('entry.basicData.travel')"
+                    v-model="data.travelFk"
+                    :options="travelsOptions"
+                    option-value="id"
+                    option-label="warehouseInName"
+                    map-options
+                    hide-selected
+                    :required="true"
+                    action-icon="filter_alt"
+                >
+                    <template #form>
+                        <FilterTravelForm
+                            @travel-selected="onFilterTravelSelected(data, $event)"
+                        />
+                    </template>
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel
+                                    >{{ scope.opt?.agencyModeName }} -
+                                    {{ scope.opt?.warehouseInName }} ({{
+                                        toDate(scope.opt?.shipped)
+                                    }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
+                                        toDate(scope.opt?.landed)
+                                    }})</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelectDialog>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.reference"
-                        :label="t('entry.basicData.reference')"
-                    />
-                </div>
+                <VnInput
+                    v-model="data.reference"
+                    :label="t('entry.basicData.reference')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.invoiceNumber"
-                        :label="t('entry.basicData.invoiceNumber')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.company')"
-                        v-model="data.companyFk"
-                        :options="companiesOptions"
-                        option-value="id"
-                        option-label="code"
-                        map-options
-                        hide-selected
-                        :required="true"
-                    />
-                </div>
+                <VnInput
+                    v-model="data.invoiceNumber"
+                    :label="t('entry.basicData.invoiceNumber')"
+                />
+                <VnSelect
+                    :label="t('entry.basicData.company')"
+                    v-model="data.companyFk"
+                    :options="companiesOptions"
+                    option-value="id"
+                    option-label="code"
+                    map-options
+                    hide-selected
+                    :required="true"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('entry.basicData.currency')"
-                        v-model="data.currencyFk"
-                        :options="currenciesOptions"
-                        option-value="id"
-                        option-label="code"
-                    />
-                </div>
-                <div class="col">
-                    <QInput
-                        :label="t('entry.basicData.commission')"
-                        v-model="data.commission"
-                        type="number"
-                        autofocus
-                        min="0"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('entry.basicData.currency')"
+                    v-model="data.currencyFk"
+                    :options="currenciesOptions"
+                    option-value="id"
+                    option-label="code"
+                />
+                <QInput
+                    :label="t('entry.basicData.commission')"
+                    v-model="data.commission"
+                    type="number"
+                    autofocus
+                    min="0"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('entry.basicData.observation')"
-                        type="textarea"
-                        v-model="data.observation"
-                        :maxlength="45"
-                        counter
-                        fill-input
-                    />
-                </div>
+                <QInput
+                    :label="t('entry.basicData.observation')"
+                    type="textarea"
+                    v-model="data.observation"
+                    :maxlength="45"
+                    counter
+                    fill-input
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isOrdered"
-                        :label="t('entry.basicData.ordered')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isConfirmed"
-                        :label="t('entry.basicData.confirmed')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isExcludedFromAvailable"
-                        :label="t('entry.basicData.excludedFromAvailable')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox v-model="data.isRaid" :label="t('entry.basicData.raid')" />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-if="isAdministrative()"
-                        v-model="data.isBooked"
-                        :label="t('entry.basicData.booked')"
-                    />
-                </div>
+                <QCheckbox
+                    v-model="data.isOrdered"
+                    :label="t('entry.basicData.ordered')"
+                />
+                <QCheckbox
+                    v-model="data.isConfirmed"
+                    :label="t('entry.basicData.confirmed')"
+                />
+                <QCheckbox
+                    v-model="data.isExcludedFromAvailable"
+                    :label="t('entry.basicData.excludedFromAvailable')"
+                />
+                <QCheckbox v-model="data.isRaid" :label="t('entry.basicData.raid')" />
+                <QCheckbox
+                    v-if="isAdministrative()"
+                    v-model="data.isBooked"
+                    :label="t('entry.basicData.booked')"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 8891057ac..0dffa5d25 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -198,44 +198,38 @@ const redirectToBuysView = () => {
         </Teleport>
         <QCard class="q-pa-lg">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QFile
-                        ref="inputFileRef"
-                        :label="t('entry.buys.file')"
-                        v-model="importData.file"
-                        :multiple="false"
-                        accept=".json"
-                        @update:model-value="onFileChange($event)"
-                        class="required"
-                    >
-                        <template #append>
-                            <QIcon
-                                name="vn:attach"
-                                class="cursor-pointer"
-                                @click="inputFileRef.pickFiles()"
-                            >
-                                <QTooltip>{{ t('globals.selectFile') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QFile>
-                </div>
+                <QFile
+                    ref="inputFileRef"
+                    :label="t('entry.buys.file')"
+                    v-model="importData.file"
+                    :multiple="false"
+                    accept=".json"
+                    @update:model-value="onFileChange($event)"
+                    class="required"
+                >
+                    <template #append>
+                        <QIcon
+                            name="vn:attach"
+                            class="cursor-pointer"
+                            @click="inputFileRef.pickFiles()"
+                        >
+                            <QTooltip>{{ t('globals.selectFile') }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </QFile>
             </VnRow>
             <div v-if="importData.file">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            :label="t('entry.buys.reference')"
-                            v-model="importData.ref"
-                        />
-                    </div>
+                    <VnInput
+                        :label="t('entry.buys.reference')"
+                       v-model="importData.ref"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            :label="t('entry.buys.observations')"
-                            v-model="importData.observation"
-                        />
-                    </div>
+                    <VnInput
+                        :label="t('entry.buys.observations')"
+                        v-model="importData.observation"
+                    />
                 </VnRow>
                 <VnRow>
                     <QTable :columns="columns" :rows="importData.buys">
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 3eb4bd776..9fadd2d06 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
+import EntryFilter from '../EntryFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Entry"
         base-url="Entries"
         :descriptor="EntryDescriptor"
-        searchbar-data-key="EntryList"
-        searchbar-url="Entries/filter"
+        :filter-panel="EntryFilter"
+        search-data-key="EntryList"
+        search-url="Entries/filter"
         searchbar-label="Search entries"
         searchbar-info="You can search by entry reference"
     />
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 1f9aaea28..766587bde 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index b04b8e8b7..3493dc903 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -79,78 +79,71 @@ const redirectToEntryBasicData = (_, { id }) => {
         >
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Supplier')"
-                            class="full-width"
-                            v-model="data.supplierFk"
-                            :options="suppliersOptions"
-                            option-value="id"
-                            option-label="nickname"
-                            hide-selected
-                            :required="true"
-                            :rules="validate('entry.supplierFk')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            #{{ scope.opt?.id }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
+                    <VnSelect
+                        :label="t('Supplier')"
+                        class="full-width"
+                        v-model="data.supplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :required="true"
+                        :rules="validate('entry.supplierFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Travel')"
-                            class="full-width"
-                            v-model="data.travelFk"
-                            :options="travelsOptions"
-                            option-value="id"
-                            option-label="warehouseInName"
-                            map-options
-                            hide-selected
-                            :required="true"
-                            :rules="validate('entry.travelFk')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel
-                                            >{{ scope.opt?.agencyModeName }} -
-                                            {{ scope.opt?.warehouseInName }} ({{
-                                                toDate(scope.opt?.shipped)
-                                            }}) &#x2192;
-                                            {{ scope.opt?.warehouseOutName }} ({{
-                                                toDate(scope.opt?.landed)
-                                            }})</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
+                    <VnSelect
+                        :label="t('Travel')"
+                        class="full-width"
+                        v-model="data.travelFk"
+                        :options="travelsOptions"
+                        option-value="id"
+                        option-label="warehouseInName"
+                        map-options
+                        hide-selected
+                        :required="true"
+                        :rules="validate('entry.travelFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel
+                                        >{{ scope.opt?.agencyModeName }} -
+                                        {{ scope.opt?.warehouseInName }} ({{
+                                            toDate(scope.opt?.shipped)
+                                        }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
+                                            toDate(scope.opt?.landed)
+                                        }})</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Company')"
-                            class="full-width"
-                            v-model="data.companyFk"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                            map-options
-                            hide-selected
-                            :required="true"
-                            :rules="validate('entry.companyFk')"
-                        />
-                    </div>
+                    <VnSelect
+                        :label="t('Company')"
+                        class="full-width"
+                        v-model="data.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        map-options
+                        hide-selected
+                        :required="true"
+                        :rules="validate('entry.companyFk')"
+                    />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index c3e83c96f..da4190a04 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -12,6 +12,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate, toCurrency } from 'src/filters';
@@ -636,18 +637,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (intrastatOptions = data)"
     />
-    <QToolbar class="justify-end">
-        <div id="st-data">
+    <VnSubToolbar>
+        <template #st-data>
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="latestBuys"
                 labels-traductions-path="entry.latestBuys"
                 @on-config-saved="visibleColumns = ['picture', ...$event]"
             />
-        </div>
+        </template>
         <QSpace />
         <div id="st-actions"></div>
-    </QToolbar>
+    </VnSubToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <EntryLatestBuysFilter data-key="EntryLatestBuys" />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index f378e85ce..d2765ec86 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -3,14 +3,13 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
+import axios from 'axios';
 import { useArrayData } from 'src/composables/useArrayData';
 import { downloadFile } from 'src/composables/downloadFile';
-
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
-
-import axios from 'axios';
+import VnRow from 'src/components/ui/VnRow.vue';
 
 const quasar = useQuasar();
 const route = useRoute();
@@ -181,266 +180,234 @@ async function upsert() {
         :auto-load="true"
     >
         <template #form="{ data }">
-            <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplierFk')"
-                        v-model="data.supplierFk"
-                        option-value="id"
-                        option-label="nickname"
-                        url="Suppliers"
-                        :fields="['id', 'nickname']"
-                        sort-by="nickname"
-                        :is-clearable="false"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        `${scope.opt.id} - ${scope.opt.nickname}`
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <QInput
-                        clearable
-                        clear-icon="close"
-                        :label="t('Supplier ref')"
-                        v-model="data.supplierRef"
-                    />
-                </div>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('Expedition date')"
-                        v-model="data.issued"
-                        :mask="dateMask"
-                    >
-                        <template #append>
-                            <QIcon
-                                name="event"
-                                class="cursor-pointer"
-                                :fill-mask="fillMask"
+            <VnRow>
+                <VnSelect
+                    :label="t('supplierFk')"
+                    v-model="data.supplierFk"
+                    option-value="id"
+                    option-label="nickname"
+                    url="Suppliers"
+                    :fields="['id', 'nickname']"
+                    sort-by="nickname"
+                    :is-clearable="false"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{
+                                    `${scope.opt.id} - ${scope.opt.nickname}`
+                                }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <QInput
+                    clearable
+                    clear-icon="close"
+                    :label="t('Supplier ref')"
+                    v-model="data.supplierRef"
+                />
+            </VnRow>
+            <VnRow>
+                <QInput
+                    :label="t('Expedition date')"
+                    v-model="data.issued"
+                    :mask="dateMask"
+                >
+                    <template #append>
+                        <QIcon name="event" class="cursor-pointer" :fill-mask="fillMask">
+                            <QPopupProxy
+                                cover
+                                transition-show="scale"
+                                transition-hide="scale"
                             >
-                                <QPopupProxy
-                                    cover
-                                    transition-show="scale"
-                                    transition-hide="scale"
-                                >
-                                    <QDate v-model="data.issued">
-                                        <div class="row items-center justify-end">
-                                            <QBtn
-                                                v-close-popup
-                                                label="Close"
-                                                color="primary"
-                                                flat
-                                            />
-                                        </div>
-                                    </QDate>
-                                </QPopupProxy>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </div>
-                <div class="col">
-                    <QInput
-                        :label="t('Operation date')"
-                        v-model="data.operated"
-                        :mask="dateMask"
-                        :fill-mask="fillMask"
-                        autofocus
-                    >
-                        <template #append>
-                            <QIcon name="event" class="cursor-pointer">
-                                <QPopupProxy
-                                    cover
-                                    transition-show="scale"
-                                    transition-hide="scale"
-                                >
-                                    <QDate v-model="data.operated" landscape>
-                                        <div class="row items-center justify-end">
-                                            <QBtn
-                                                :label="t('globals.cancel')"
-                                                color="primary"
-                                                flat
-                                                v-close-popup
-                                            />
-                                            <QBtn
-                                                :label="t('globals.confirm')"
-                                                color="primary"
-                                                flat
-                                                v-close-popup
-                                            />
-                                        </div>
-                                    </QDate>
-                                </QPopupProxy>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </div>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('Undeductible VAT')"
-                        v-model="data.deductibleExpenseFk"
-                        clearable
-                        clear-icon="close"
-                    />
-                </div>
-                <div class="col">
-                    <QInput
-                        :label="t('Document')"
-                        v-model="data.dmsFk"
-                        clearable
-                        clear-icon="close"
-                        @update:model-value="checkFileExists(data.dmsFk)"
-                    >
-                        <template #prepend>
-                            <QBtn
-                                v-if="data.dmsFk"
-                                :class="{
-                                    'no-pointer-events': editDownloadDisabled,
-                                }"
-                                :disable="editDownloadDisabled"
-                                icon="cloud_download"
-                                :title="t('Download file')"
-                                padding="xs"
-                                round
-                                @click="downloadFile(data.dmsFk)"
-                            />
-                        </template>
-                        <template #append>
-                            <QBtn
-                                :class="{
-                                    'no-pointer-events': editDownloadDisabled,
-                                }"
-                                :disable="editDownloadDisabled"
-                                v-if="data.dmsFk"
-                                icon="edit"
-                                round
-                                padding="xs"
-                                @click="setEditDms(data.dmsFk)"
+                                <QDate v-model="data.issued">
+                                    <div class="row items-center justify-end">
+                                        <QBtn
+                                            v-close-popup
+                                            label="Close"
+                                            color="primary"
+                                            flat
+                                        />
+                                    </div>
+                                </QDate>
+                            </QPopupProxy>
+                        </QIcon>
+                    </template>
+                </QInput>
+                <QInput
+                    :label="t('Operation date')"
+                    v-model="data.operated"
+                    :mask="dateMask"
+                    :fill-mask="fillMask"
+                    autofocus
+                >
+                    <template #append>
+                        <QIcon name="event" class="cursor-pointer">
+                            <QPopupProxy
+                                cover
+                                transition-show="scale"
+                                transition-hide="scale"
                             >
-                                <QTooltip>{{ t('Edit document') }}</QTooltip>
-                            </QBtn>
-                            <QBtn
-                                v-else
-                                icon="add_circle"
-                                round
-                                padding="xs"
-                                @click="setCreateDms()"
+                                <QDate v-model="data.operated" landscape>
+                                    <div class="row items-center justify-end">
+                                        <QBtn
+                                            :label="t('globals.cancel')"
+                                            color="primary"
+                                            flat
+                                            v-close-popup
+                                        />
+                                        <QBtn
+                                            :label="t('globals.confirm')"
+                                            color="primary"
+                                            flat
+                                            v-close-popup
+                                        />
+                                    </div>
+                                </QDate>
+                            </QPopupProxy>
+                        </QIcon>
+                    </template>
+                </QInput>
+            </VnRow>
+            <VnRow>
+                <QInput
+                    :label="t('Undeductible VAT')"
+                    v-model="data.deductibleExpenseFk"
+                    clearable
+                    clear-icon="close"
+                />
+                <QInput
+                    :label="t('Document')"
+                    v-model="data.dmsFk"
+                    clearable
+                    clear-icon="close"
+                    @update:model-value="checkFileExists(data.dmsFk)"
+                >
+                    <template #prepend>
+                        <QBtn
+                            v-if="data.dmsFk"
+                            :class="{
+                                'no-pointer-events': editDownloadDisabled,
+                            }"
+                            :disable="editDownloadDisabled"
+                            icon="cloud_download"
+                            :title="t('Download file')"
+                            padding="xs"
+                            round
+                            @click="downloadFile(data.dmsFk)"
+                        />
+                    </template>
+                    <template #append>
+                        <QBtn
+                            :class="{
+                                'no-pointer-events': editDownloadDisabled,
+                            }"
+                            :disable="editDownloadDisabled"
+                            v-if="data.dmsFk"
+                            icon="edit"
+                            round
+                            padding="xs"
+                            @click="setEditDms(data.dmsFk)"
+                        >
+                            <QTooltip>{{ t('Edit document') }}</QTooltip>
+                        </QBtn>
+                        <QBtn
+                            v-else
+                            icon="add_circle"
+                            round
+                            padding="xs"
+                            @click="setCreateDms()"
+                        >
+                            <QTooltip>{{ t('Create document') }}</QTooltip>
+                        </QBtn>
+                    </template>
+                </QInput>
+            </VnRow>
+            <VnRow>
+                <QInput
+                    :label="t('Entry date')"
+                    v-model="data.bookEntried"
+                    clearable
+                    clear-icon="close"
+                    :mask="dateMask"
+                    :fill-mask="fillMask"
+                >
+                    <template #append>
+                        <QIcon name="event" class="cursor-pointer">
+                            <QPopupProxy
+                                cover
+                                transition-show="scale"
+                                transition-hide="scale"
                             >
-                                <QTooltip>{{ t('Create document') }}</QTooltip>
-                            </QBtn>
-                        </template>
-                    </QInput>
-                </div>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('Entry date')"
-                        v-model="data.bookEntried"
-                        clearable
-                        clear-icon="close"
-                        :mask="dateMask"
-                        :fill-mask="fillMask"
-                    >
-                        <template #append>
-                            <QIcon name="event" class="cursor-pointer">
-                                <QPopupProxy
-                                    cover
-                                    transition-show="scale"
-                                    transition-hide="scale"
-                                >
-                                    <QDate v-model="data.bookEntried" landscape>
-                                        <div class="row items-center justify-end">
-                                            <QBtn
-                                                :label="t('globals.cancel')"
-                                                color="primary"
-                                                flat
-                                                v-close-popup
-                                            />
-                                            <QBtn
-                                                :label="t('globals.confirm')"
-                                                color="primary"
-                                                flat
-                                                v-close-popup
-                                            />
-                                        </div>
-                                    </QDate>
-                                </QPopupProxy>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </div>
-                <div class="col">
-                    <QInput
-                        :label="t('Accounted date')"
-                        v-model="data.booked"
-                        clearable
-                        clear-icon="close"
-                        :mask="dateMask"
-                        :fill-mask="fillMask"
-                    >
-                        <template #append>
-                            <QIcon name="event" class="cursor-pointer">
-                                <QPopupProxy
-                                    cover
-                                    transition-show="scale"
-                                    transition-hide="scale"
-                                >
-                                    <QDate v-model="data.booked" :mask="maskDate">
-                                        <div class="row items-center justify-end">
-                                            <QBtn
-                                                v-close-popup
-                                                label="Close"
-                                                color="primary"
-                                                flat
-                                            />
-                                        </div>
-                                    </QDate>
-                                </QPopupProxy>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </div>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Currency')"
-                        v-model="data.currencyFk"
-                        :options="currencies"
-                        option-value="id"
-                        option-label="code"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        v-if="companiesRef"
-                        :label="t('Company')"
-                        v-model="data.companyFk"
-                        :options="companies"
-                        option-value="id"
-                        option-label="code"
-                    />
-                </div>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('invoiceIn.summary.booked')"
-                        v-model="data.isBooked"
-                    />
-                </div>
-                <div class="col"></div>
-            </div>
+                                <QDate v-model="data.bookEntried" landscape>
+                                    <div class="row items-center justify-end">
+                                        <QBtn
+                                            :label="t('globals.cancel')"
+                                            color="primary"
+                                            flat
+                                            v-close-popup
+                                        />
+                                        <QBtn
+                                            :label="t('globals.confirm')"
+                                            color="primary"
+                                            flat
+                                            v-close-popup
+                                        />
+                                    </div>
+                                </QDate>
+                            </QPopupProxy>
+                        </QIcon>
+                    </template>
+                </QInput>
+                <QInput
+                    :label="t('Accounted date')"
+                    v-model="data.booked"
+                    clearable
+                    clear-icon="close"
+                    :mask="dateMask"
+                    :fill-mask="fillMask"
+                >
+                    <template #append>
+                        <QIcon name="event" class="cursor-pointer">
+                            <QPopupProxy
+                                cover
+                                transition-show="scale"
+                                transition-hide="scale"
+                            >
+                                <QDate v-model="data.booked" :mask="maskDate">
+                                    <div class="row items-center justify-end">
+                                        <QBtn
+                                            v-close-popup
+                                            label="Close"
+                                            color="primary"
+                                            flat
+                                        />
+                                    </div>
+                                </QDate>
+                            </QPopupProxy>
+                        </QIcon>
+                    </template>
+                </QInput>
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    :label="t('Currency')"
+                    v-model="data.currencyFk"
+                    :options="currencies"
+                    option-value="id"
+                    option-label="code"
+                />
+                <VnSelect
+                    v-if="companiesRef"
+                    :label="t('Company')"
+                    v-model="data.companyFk"
+                    :options="companies"
+                    option-value="id"
+                    option-label="code"
+                />
+            </VnRow>
+            <QCheckbox :label="t('invoiceIn.summary.booked')" v-model="data.isBooked" />
         </template>
     </FormModel>
     <QDialog ref="editDmsRef" @keyup.enter="upsert">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index ceec5042d..912713f23 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -1,6 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
+import InvoiceInFilter from '../InvoiceInFilter.vue';
 
 const filter = {
     include: [
@@ -25,8 +26,9 @@ const filter = {
         base-url="InvoiceIns"
         :filter="filter"
         :descriptor="InvoiceInDescriptor"
-        searchbar-data-key="InvoiceInList"
-        searchbar-url="InvoiceIns/filter"
+        :filter-panel="InvoiceInFilter"
+        search-data-key="InvoiceInList"
+        search-url="InvoiceIns/filter"
         searchbar-label="Search invoice"
         searchbar-info="You can search by invoice reference"
     />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 924356195..6bdc1c0b5 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -90,7 +90,7 @@ function getTotal(type) {
         url="Countries"
         auto-load
         @on-fetch="(data) => (countries = data)"
-        sort-by="country"
+        sort-by="name"
     />
     <FetchData
         url="Intrastats"
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index 218e01d83..e187a2df2 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -1,14 +1,16 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
+import InvoiceOutFilter from '../InvoiceOutFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="InvoiceOut"
         base-url="InvoiceOuts"
         :descriptor="InvoiceOutDescriptor"
-        searchbar-data-key="InvoiceOutList"
-        searchbar-url="InvoiceOuts/filter"
+        :filter-panel="InvoiceOutFilter"
+        search-data-key="InvoiceOutList"
+        search-url="InvoiceOuts/filter"
         searchbar-label="Search invoice"
         searchbar-info="You can search by invoice reference"
     />
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index c77502af5..a969c2c4b 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -139,7 +139,7 @@ const openCreateInvoiceModal = () => {
                             icon="cloud_download"
                             :disable="selectedCards.size === 0"
                         >
-                            <QTooltip>{{ t('downloadPdf') }}</QTooltip>
+                            <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
                         </QBtn>
                         <QCheckbox
                             left-label
@@ -234,13 +234,11 @@ en:
     fileDenied: Browser denied file download...
     fileAllowed: Successful download of CSV file
     youCanSearchByInvoiceReference: You can search by invoice reference
-    downloadPdf: Download PDF
     createInvoice: Make invoice
 es:
     searchInvoice: Buscar factura emitida
     fileDenied: El navegador denegó la descarga de archivos...
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    downloadPdf: Descargar PDF
     createInvoice: Crear factura
 </i18n>
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 4eca6137c..66d46f576 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -1,7 +1,17 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
+import ItemListFilter from '../ItemListFilter.vue';
 </script>
 <template>
-    <VnCard data-key="Item" base-url="Items" :descriptor="ItemDescriptor" />
+    <VnCard
+        data-key="Item"
+        base-url="Items"
+        :descriptor="ItemDescriptor"
+        :filter-panel="ItemListFilter"
+        search-data-key="ItemList"
+        search-url="Items/filter"
+        searchbar-label="searchbar.label"
+        searchbar-info="searchbar.info"
+    />
 </template>
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 2a753a3a5..e74f7f828 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -309,9 +309,9 @@ const addRow = () => {
     const lastItemCopy = JSON.parse(
         JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
     );
-    const { id, ...restOfItem } = lastItemCopy;
-    fixedPricesOriginalData.value.push(restOfItem);
-    fixedPrices.value.push(restOfItem);
+    delete lastItemCopy.id;
+    fixedPricesOriginalData.value.push(lastItemCopy);
+    fixedPrices.value.push(lastItemCopy);
 };
 
 const openEditTableCellDialog = () => {
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 39e190147..27acf3fdd 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -457,6 +457,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             :limit="12"
             :expr-builder="exprBuilder"
             :user-params="params"
+            :keep-opts="['userParams']"
             :offset="50"
             auto-load
         >
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 9d826655f..dd023f94b 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -7,8 +7,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
 import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
+import ItemTypeSearchbar from '../ItemType/ItemTypeSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
@@ -63,13 +62,7 @@ const exprBuilder = (param, value) => {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="ItemTypeList"
-                url="ItemTypes"
-                :label="t('Search item type')"
-                :info="t('Search itemType by id, name or code')"
-                :expr-builder="exprBuilder"
-            />
+            <ItemTypeSearchbar />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
@@ -132,11 +125,3 @@ const exprBuilder = (param, value) => {
         </QTooltip>
     </QPageSticky>
 </template>
-
-<i18n>
-es:
-    New item type: Nueva familia
-    Name: Nombre
-    Search item type: Buscar familia
-    Search itemType by id, name or code: Buscar familia por id, nombre o código
-</i18n>
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index c08c71f48..99dbeb9fd 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -78,3 +78,6 @@ itemTags:
     tag: Tag
     value: Value
     relevancy: Relevancy
+searchbar:
+    label: Search item
+    info: Search by item id
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 9b6a51b8a..60e589932 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -78,3 +78,6 @@ itemTags:
     tag: Etiqueta
     value: Valor
     relevancy: Relevancia
+searchbar:
+    label: Buscar artículo
+    info: Buscar por id de artículo
diff --git a/src/pages/ItemType/Card/ItemTypeCard.vue b/src/pages/ItemType/Card/ItemTypeCard.vue
index cb8adf7f6..9daec7921 100644
--- a/src/pages/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/ItemType/Card/ItemTypeCard.vue
@@ -1,12 +1,20 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
-
 import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
+import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
+import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 </script>
 <template>
     <VnCard
         data-key="ItemTypeSummary"
         base-url="ItemTypes"
         :descriptor="ItemTypeDescriptor"
-    />
+        :filter-panel="ItemTypeFilter"
+        search-data-key="ItemTypeList"
+        search-url="ItemTypes"
+    >
+        <template #searchbar>
+            <ItemTypeSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/ItemType/ItemTypeSearchbar.vue b/src/pages/ItemType/ItemTypeSearchbar.vue
new file mode 100644
index 000000000..749033d43
--- /dev/null
+++ b/src/pages/ItemType/ItemTypeSearchbar.vue
@@ -0,0 +1,19 @@
+<script setup>
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import { useI18n } from 'vue-i18n';
+const { t } = useI18n();
+</script>
+
+<template>
+    <VnSearchbar
+        data-key="ItemTypeList"
+        url="ItemTypes"
+        :label="t('Search item type')"
+        :info="t('Search itemType by id, name or code')"
+    />
+</template>
+<i18n>
+es:
+    Search item type: Buscar familia
+    Search itemType by id, name or code: Buscar familia por id, nombre o código
+</i18n>
diff --git a/src/pages/Monitor/MonitorList.vue b/src/pages/Monitor/MonitorList.vue
new file mode 100644
index 000000000..1b1ccb5b3
--- /dev/null
+++ b/src/pages/Monitor/MonitorList.vue
@@ -0,0 +1,88 @@
+<script setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { useStateStore } from 'stores/useStateStore';
+import SalesClientTable from './SalesClientsTable.vue';
+import SalesOrdersTable from './SalesOrdersTable.vue';
+import SalesTicketsTable from './SalesTicketsTable.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+
+const expanded = ref(true);
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="SalesMonitorTickets"
+                url="SalesMonitors/salesFilter"
+                :redirect="false"
+                :label="t('searchBar.label')"
+                :info="t('searchBar.info')"
+            />
+        </Teleport>
+    </template>
+    <QPage class="column items-center q-pa-md">
+        <QCard class="full-width q-mb-lg">
+            <QExpansionItem v-model="expanded" dense :duration="150">
+                <template v-if="!expanded" #header>
+                    <div class="row full-width">
+                        <span class="flex col text-body1">
+                            {{ t('salesMonitor.clientsOnWebsite') }}
+                        </span>
+                        <span class="flex col q-ml-xl text-body1">
+                            {{ t('salesMonitor.recentOrderActions') }}
+                        </span>
+                    </div>
+                </template>
+                <template #default>
+                    <div class="expansion-tables-container">
+                        <QCardSection class="col">
+                            <span class="flex col q-mb-sm text-body1">
+                                {{ t('salesMonitor.clientsOnWebsite') }}
+                            </span>
+                            <SalesClientTable />
+                        </QCardSection>
+                        <QCardSection class="col">
+                            <span class="flex col q-mb-sm text-body1">
+                                {{ t('salesMonitor.recentOrderActions') }}
+                            </span>
+                            <SalesOrdersTable />
+                        </QCardSection>
+                    </div>
+                </template>
+            </QExpansionItem>
+        </QCard>
+        <QCard class="full-width q-mb-lg">
+            <QItem class="justify-between">
+                <QItemLabel class="slider-container">
+                    <span class="text-body1"
+                        >{{ t('salesMonitor.ticketsMonitor') }}
+                    </span>
+                    <QCardSection class="col"><SalesTicketsTable /> </QCardSection>
+                </QItemLabel>
+            </QItem>
+        </QCard>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.expansion-tables-container {
+    display: flex;
+    border-top: 1px solid $color-spacer;
+
+    @media (max-width: $breakpoint-md-max) {
+        flex-direction: column;
+    }
+}
+</style>
diff --git a/src/pages/Monitor/MonitorMain.vue b/src/pages/Monitor/MonitorMain.vue
new file mode 100644
index 000000000..c1f2a31db
--- /dev/null
+++ b/src/pages/Monitor/MonitorMain.vue
@@ -0,0 +1,18 @@
+<script setup>
+import LeftMenu from 'src/components/LeftMenu.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Monitor/SalesClientsTable.vue b/src/pages/Monitor/SalesClientsTable.vue
new file mode 100644
index 000000000..3f2389471
--- /dev/null
+++ b/src/pages/Monitor/SalesClientsTable.vue
@@ -0,0 +1,219 @@
+<script setup>
+import { ref, computed, reactive, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { toDateFormat } from 'src/filters/date.js';
+import { dashIfEmpty } from 'src/filters';
+
+const { t } = useI18n();
+
+const paginateRef = ref(null);
+const workersActiveOptions = ref([]);
+const clientsOptions = ref([]);
+
+const from = ref(Date.vnNew());
+const to = ref(Date.vnNew());
+
+const dateRange = computed(() => {
+    const minHour = new Date(from.value);
+    minHour.setHours(0, 0, 0, 0);
+    const maxHour = new Date(to.value);
+    maxHour.setHours(23, 59, 59, 59);
+    return [minHour, maxHour];
+});
+
+const filter = reactive({
+    where: {
+        'v.stamp': {
+            between: dateRange.value,
+        },
+    },
+});
+
+watch(dateRange, (val) => {
+    filter.where['v.stamp'].between = val;
+    paginateRef.value.fetch();
+});
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'clientFk':
+            return { [`c.id`]: value };
+        case 'salesPersonFk':
+            return { [`c.${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 columns = computed(() => [
+    {
+        label: t('salesClientsTable.date'),
+        name: 'date',
+        field: 'dated',
+        align: 'left',
+        columnFilter: null,
+        sortable: true,
+        format: (val) => toDateFormat(val),
+    },
+    {
+        label: t('salesClientsTable.hour'),
+        name: 'hour',
+        field: 'hour',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('salesClientsTable.salesPerson'),
+        name: 'salesPerson',
+        field: 'salesPerson',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'salesPersonFk',
+            type: 'select',
+            filterValue: null,
+            attrs: {
+                options: workersActiveOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('salesClientsTable.client'),
+        field: 'clientName',
+        name: 'client',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'clientFk',
+            type: 'select',
+            filterValue: null,
+            attrs: {
+                options: clientsOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+]);
+</script>
+
+<template>
+    <FetchData
+        url="Workers/activeWithInheritedRole"
+        :filter="{
+            fields: ['id', 'nickname'],
+            order: 'nickname ASC',
+            where: { role: 'salesPerson' },
+        }"
+        auto-load
+        @on-fetch="(data) => (workersActiveOptions = data)"
+    />
+    <FetchData
+        url="Clients"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'name ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (clientsOptions = data)"
+    />
+    <QCard style="max-height: 380px; overflow-y: scroll">
+        <VnPaginate
+            ref="paginateRef"
+            data-key="SalesMonitorClients"
+            url="SalesMonitors/clientsFilter"
+            :order="['dated DESC', 'hour DESC']"
+            :limit="6"
+            :expr-builder="exprBuilder"
+            :user-params="params"
+            :filter="filter"
+            :offset="50"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QTable
+                    :rows="rows"
+                    :columns="columns"
+                    row-key="id"
+                    :pagination="{ rowsPerPage: 0 }"
+                    class="full-width"
+                    :no-data-label="t('globals.noResults')"
+                >
+                    <template #top>
+                        <VnInputDate
+                            :label="t('salesClientsTable.from')"
+                            dense
+                            emit-date-format
+                            v-model="from"
+                            class="q-mr-lg"
+                            style="width: 150px"
+                        />
+                        <VnInputDate
+                            :label="t('salesClientsTable.to')"
+                            dense
+                            emit-date-format
+                            v-model="to"
+                            style="width: 150px"
+                        />
+                    </template>
+                    <template #top-row="{ cols }">
+                        <QTr>
+                            <QTd
+                                v-for="(col, index) in cols"
+                                :key="index"
+                                style="max-width: 100px"
+                            >
+                                <VnSelect
+                                    :is="col.columnFilter.component"
+                                    v-if="col.columnFilter"
+                                    v-model="col.columnFilter.filterValue"
+                                    v-bind="col.columnFilter.attrs"
+                                    @update:model-value="applyColumnFilter(col)"
+                                    dense
+                                />
+                            </QTd>
+                        </QTr>
+                    </template>
+                    <template #body-cell-salesPerson="{ row }">
+                        <QTd>
+                            <span class="link">{{ row.salesPerson }}</span>
+                            <WorkerDescriptorProxy :id="row.salesPersonFk" dense />
+                        </QTd>
+                    </template>
+                    <template #body-cell-client="{ row }">
+                        <QTd>
+                            <span class="link">{{ row.clientName }}</span>
+                            <CustomerDescriptorProxy :id="row.clientFk" />
+                        </QTd>
+                    </template>
+                </QTable>
+            </template>
+        </VnPaginate>
+    </QCard>
+</template>
diff --git a/src/pages/Monitor/SalesOrdersTable.vue b/src/pages/Monitor/SalesOrdersTable.vue
new file mode 100644
index 000000000..0ba900393
--- /dev/null
+++ b/src/pages/Monitor/SalesOrdersTable.vue
@@ -0,0 +1,201 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
+import { toCurrency } from 'src/filters';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+const workersActiveOptions = ref([]);
+const clientsOptions = ref([]);
+const selectedRows = ref([]);
+
+const dateRange = (value) => {
+    const minHour = new Date(value);
+    minHour.setHours(0, 0, 0, 0);
+    const maxHour = new Date(value);
+    maxHour.setHours(23, 59, 59, 59);
+
+    return [minHour, maxHour];
+};
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'date_send':
+            return {
+                [`o.date_send`]: {
+                    between: dateRange(value),
+                },
+            };
+        case 'clientFk':
+            return { [`c.id`]: value };
+        case 'salesPersonFk':
+            return { [`c.${param}`]: value };
+    }
+}
+
+const columns = computed(() => [
+    {
+        label: t('salesOrdersTable.date'),
+        name: 'date',
+        field: 'dated',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('salesOrdersTable.client'),
+        name: 'client',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('salesOrdersTable.salesPerson'),
+        name: 'salesPerson',
+        align: 'left',
+        sortable: true,
+    },
+]);
+
+const getBadgeColor = (date) => {
+    const today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+
+    const orderLanded = new Date(date);
+    orderLanded.setHours(0, 0, 0, 0);
+
+    const difference = today - orderLanded;
+
+    if (difference == 0) return 'warning';
+    if (difference < 0) return 'success';
+    if (difference > 0) return 'alert';
+};
+
+const removeOrders = async () => {
+    try {
+        const selectedIds = selectedRows.value.map((row) => row.id);
+        const params = { deletes: selectedIds };
+        await axios.post('SalesMonitors/deleteOrders', params);
+        selectedRows.value = [];
+        await paginateRef.value.fetch();
+    } catch (err) {
+        console.error('Error deleting orders', err);
+    }
+};
+
+const redirectToOrderSummary = (orderId) => {
+    const url = `#/order/${orderId}/summary`;
+    window.open(url, '_blank');
+};
+</script>
+
+<template>
+    <FetchData
+        url="Workers/activeWithInheritedRole"
+        :filter="{
+            fields: ['id', 'nickname'],
+            order: 'nickname ASC',
+            where: { role: 'salesPerson' },
+        }"
+        auto-load
+        @on-fetch="(data) => (workersActiveOptions = data)"
+    />
+    <FetchData
+        url="Clients"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'name ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (clientsOptions = data)"
+    />
+
+    <QCard style="max-height: 380px; overflow-y: scroll">
+        <VnPaginate
+            ref="paginateRef"
+            data-key="SalesMonitorOrders"
+            url="SalesMonitors/ordersFilter"
+            order="date_make DESC"
+            :limit="6"
+            :expr-builder="exprBuilder"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QTable
+                    :rows="rows"
+                    :columns="columns"
+                    row-key="id"
+                    selection="multiple"
+                    v-model:selected="selectedRows"
+                    :pagination="{ rowsPerPage: 0 }"
+                    :no-data-label="t('globals.noResults')"
+                    @row-click="(_, row) => redirectToOrderSummary(row.id)"
+                >
+                    <template #top>
+                        <QBtn
+                            v-if="selectedRows.length > 0"
+                            icon="delete"
+                            size="md"
+                            color="primary"
+                            @click="
+                                openConfirmationModal(
+                                    t('salesOrdersTable.deleteConfirmTitle'),
+                                    t('salesOrdersTable.deleteConfirmMessage'),
+                                    removeOrders
+                                )
+                            "
+                        >
+                            <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
+                        </QBtn>
+                    </template>
+                    <template #body-cell-date="{ row }">
+                        <QTd>
+                            <QBadge
+                                :color="getBadgeColor(row.date_send)"
+                                text-color="black"
+                                class="q-ma-none q-mb-md"
+                                dense
+                                style="font-size: 14px"
+                            >
+                                {{ toDateFormat(row.date_send) }}
+                            </QBadge>
+                            <div>{{ toDateTimeFormat(row.date_make) }}</div>
+                        </QTd>
+                    </template>
+                    <template #body-cell-client="{ row }">
+                        <QTd>
+                            <div class="q-mb-md">
+                                <span class="link">{{ row.clientName }}</span>
+                                <CustomerDescriptorProxy :id="row.clientFk" />
+                            </div>
+                            <span> {{ row.agencyName }}</span>
+                        </QTd>
+                    </template>
+                    <template #body-cell-salesPerson="{ row }">
+                        <QTd>
+                            <div class="q-mb-md">
+                                <span class="link">{{ row.salesPerson }}</span>
+                                <WorkerDescriptorProxy :id="row.salesPersonFk" dense />
+                            </div>
+                            <span>{{ toCurrency(row.import) }}</span>
+                        </QTd>
+                    </template>
+                </QTable>
+            </template>
+        </VnPaginate>
+    </QCard>
+</template>
+<style lang="scss" scoped>
+.q-td {
+    color: gray;
+}
+</style>
diff --git a/src/pages/Monitor/SalesTicketsTable.vue b/src/pages/Monitor/SalesTicketsTable.vue
new file mode 100644
index 000000000..222ccb9d0
--- /dev/null
+++ b/src/pages/Monitor/SalesTicketsTable.vue
@@ -0,0 +1,623 @@
+<script setup>
+import { ref, computed, onMounted, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
+import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { toDateFormat, toTimeFormat } from 'src/filters/date.js';
+import { toCurrency, dateRange } from 'src/filters';
+const DEFAULT_AUTO_REFRESH = 1000;
+const { t } = useI18n();
+const autoRefresh = ref(false);
+const router = useRouter();
+const paginateRef = ref(null);
+const workersActiveOptions = ref([]);
+const provincesOptions = ref([]);
+const statesOptions = ref([]);
+const zonesOptions = ref([]);
+const visibleColumns = ref([]);
+const allColumnNames = ref([]);
+const { viewSummary } = useSummaryDialog();
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'stateFk':
+            return { 'ts.stateFk': value };
+        case 'salesPersonFk':
+            return { 'c.salesPersonFk': value };
+        case 'provinceFk':
+            return { 'a.provinceFk': value };
+        case 'theoreticalHour':
+            return { 'z.hour': value };
+        case 'practicalHour':
+            return { 'zed.etc': value };
+        case 'shippedDate':
+            return { 't.shipped': { between: dateRange(value) } };
+        case 'nickname':
+            return { [`t.nickname`]: { like: `%${value}%` } };
+        case 'zoneFk':
+        case 'totalWithVat':
+            return { [`t.${param}`]: value };
+    }
+}
+
+const filter = { order: ['totalProblems DESC'] };
+let 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' || col.columnFilter.type === 'date'
+        ? { 'update:modelValue': () => applyColumnFilter(col) }
+        : {
+              'keyup.enter': () => applyColumnFilter(col),
+          };
+};
+
+const fetchParams = ($params = {}) => {
+    const excludedParams = ['search', 'clientFk', 'orderFk', 'refFk', 'scopeDays'];
+
+    const hasExcludedParams = excludedParams.some((param) => {
+        return $params && $params[param] != undefined;
+    });
+    const hasParams = Object.entries($params).length;
+    if (!hasParams || !hasExcludedParams) $params.scopeDays = 1;
+
+    if (typeof $params.scopeDays === 'number') {
+        const from = Date.vnNew();
+        from.setHours(0, 0, 0, 0);
+
+        const to = new Date(from.getTime());
+        to.setDate(to.getDate() + $params.scopeDays);
+        to.setHours(23, 59, 59, 999);
+
+        Object.assign($params, { from, to });
+    }
+    return { tableOrder: 'totalProblems DESC', ...$params };
+};
+
+const columns = computed(() => [
+    {
+        label: t('salesTicketsTable.problems'),
+        name: 'problems',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('salesTicketsTable.identifier'),
+        name: 'identifier',
+        field: 'id',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('salesTicketsTable.client'),
+        name: 'client',
+        align: 'left',
+        field: 'nickname',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('salesTicketsTable.salesPerson'),
+        name: 'salesPerson',
+        field: 'userName',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'salesPersonFk',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: workersActiveOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('salesTicketsTable.date'),
+        name: 'date',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInputDate,
+            filterParamKey: 'shippedDate',
+            type: 'date',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('salesTicketsTable.theoretical'),
+        name: 'theoretical',
+        field: 'zoneLanding',
+        align: 'left',
+        sortable: true,
+        format: (val) => toTimeFormat(val),
+    },
+    {
+        label: t('salesTicketsTable.practical'),
+        name: 'practical',
+        field: 'practicalHour',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('salesTicketsTable.preparation'),
+        name: 'preparation',
+        field: 'shipped',
+        align: 'left',
+        sortable: true,
+        format: (val) => toTimeFormat(val),
+    },
+
+    {
+        label: t('salesTicketsTable.province'),
+        name: 'province',
+        field: 'province',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'provinceFk',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: provincesOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('salesTicketsTable.state'),
+        name: 'state',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'stateFk',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: statesOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('salesTicketsTable.isFragile'),
+        name: 'isFragile',
+        field: 'isFragile',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('salesTicketsTable.zone'),
+        name: 'zone',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'zoneFk',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: zonesOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('salesTicketsTable.total'),
+        name: 'total',
+        field: 'totalWithVat',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        name: 'rowActions',
+        align: 'left',
+        sortable: true,
+    },
+]);
+
+const getBadgeAttrs = (date) => {
+    let today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+    let timeTicket = new Date(date);
+    timeTicket.setHours(0, 0, 0, 0);
+
+    let comparation = today - timeTicket;
+
+    if (comparation == 0) return { color: 'warning', 'text-color': 'black' };
+    if (comparation < 0) return { color: 'success', 'text-color': 'black' };
+    return { color: 'transparent', 'text-color': 'white' };
+};
+let refreshTimer = null;
+const autoRefreshHandler = (value) => {
+    if (value)
+        refreshTimer = setInterval(() => paginateRef.value.fetch(), DEFAULT_AUTO_REFRESH);
+    else {
+        clearInterval(refreshTimer);
+        refreshTimer = null;
+    }
+};
+const redirectToTicketSummary = (id) => {
+    router.push({ name: 'TicketSummary', params: { id } });
+};
+
+const stateColors = {
+    notice: 'info',
+    success: 'positive',
+    warning: 'warning',
+    alert: 'negative',
+};
+
+const totalPriceColor = (ticket) => {
+    const total = parseInt(ticket.totalWithVat);
+    if (total > 0 && total < 50) return 'warning';
+};
+
+const formatShippedDate = (date) => {
+    if (!date) return '-';
+    const split1 = date.split('T');
+    const [year, month, day] = split1[0].split('-');
+    const _date = new Date(year, month - 1, day);
+    return toDateFormat(_date);
+};
+
+onMounted(async () => {
+    const filteredColumns = columns.value.filter((col) => col.name !== 'rowActions');
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+    params = fetchParams();
+    await paginateRef.value.addFilter(null, params);
+});
+</script>
+
+<template>
+    <FetchData
+        url="Workers/activeWithInheritedRole"
+        :filter="{
+            fields: ['id', 'nickname'],
+            order: 'nickname ASC',
+            where: { role: 'salesPerson' },
+        }"
+        auto-load
+        @on-fetch="(data) => (workersActiveOptions = data)"
+    />
+    <FetchData
+        url="Provinces"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'name ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (provincesOptions = data)"
+    />
+    <FetchData
+        url="States"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'name ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (statesOptions = data)"
+    />
+    <FetchData
+        url="Zones"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'name ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (zonesOptions = data)"
+    />
+    <VnPaginate
+        ref="paginateRef"
+        data-key="SalesMonitorTickets"
+        url="SalesMonitors/salesFilter"
+        :filter="filter"
+        :limit="20"
+        :expr-builder="exprBuilder"
+        :user-params="params"
+        :offset="50"
+    >
+        <template #body="{ rows }">
+            <QTable
+                :rows="rows"
+                :columns="columns"
+                row-key="id"
+                :pagination="{ rowsPerPage: 0 }"
+                :visible-columns="visibleColumns"
+                :no-data-label="t('globals.noResults')"
+                @row-click="(_, row) => redirectToTicketSummary(row.id)"
+            >
+                <template #top>
+                    <TableVisibleColumns
+                        :all-columns="allColumnNames"
+                        table-code="ticketsMonitor"
+                        labels-traductions-path="salesTicketsTable"
+                        @on-config-saved="visibleColumns = [...$event, 'rowActions']"
+                    />
+                    <QCheckbox
+                        v-model="autoRefresh"
+                        :label="t('salesTicketsTable.autoRefresh')"
+                        @update:model-value="autoRefreshHandler"
+                    />
+                </template>
+                <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
+                                style="padding-bottom: 0"
+                            />
+                        </QTd>
+                    </QTr>
+                </template>
+                <template #body-cell-problems="{ row }">
+                    <QTd class="q-gutter-x-sm">
+                        <QIcon
+                            v-if="row.isTaxDataChecked === 0"
+                            name="vn:no036"
+                            color="primary"
+                            size="xs"
+                        >
+                            <QTooltip>{{
+                                t('salesTicketsTable.noVerifiedData')
+                            }}</QTooltip>
+                        </QIcon>
+                        <QIcon
+                            v-if="row.hasTicketRequest"
+                            name="vn:buyrequest"
+                            color="primary"
+                            size="xs"
+                        >
+                            <QTooltip>{{
+                                t('salesTicketsTable.purchaseRequest')
+                            }}</QTooltip>
+                        </QIcon>
+                        <QIcon
+                            v-if="row.itemShortage"
+                            name="vn:unavailable"
+                            color="primary"
+                            size="xs"
+                        >
+                            <QTooltip>{{ t('salesTicketsTable.notVisible') }}</QTooltip>
+                        </QIcon>
+                        <QIcon
+                            v-if="row.isFreezed"
+                            name="vn:frozen"
+                            color="primary"
+                            size="xs"
+                        >
+                            <QTooltip>{{ t('salesTicketsTable.clientFrozen') }}</QTooltip>
+                        </QIcon>
+                        <QIcon
+                            v-if="row.risk"
+                            name="vn:risk"
+                            :color="row.hasHighRisk ? 'negative' : 'primary'"
+                            size="xs"
+                        >
+                            <QTooltip
+                                >{{ t('salesTicketsTable.risk') }}:
+                                {{ row.risk }}</QTooltip
+                            >
+                        </QIcon>
+                        <QIcon
+                            v-if="row.hasComponentLack"
+                            name="vn:components"
+                            color="primary"
+                            size="xs"
+                        >
+                            <QTooltip>{{
+                                t('salesTicketsTable.componentLack')
+                            }}</QTooltip>
+                        </QIcon>
+                        <QIcon
+                            v-if="row.isTooLittle"
+                            name="vn:isTooLittle"
+                            color="primary"
+                            size="xs"
+                        >
+                            <QTooltip>{{ t('salesTicketsTable.tooLittle') }}</QTooltip>
+                        </QIcon>
+                    </QTd>
+                </template>
+                <template #body-cell-identifier="{ row }">
+                    <QTd>
+                        <span class="link" @click.stop.prevent>{{ row.id }}</span>
+                        <TicketDescriptorProxy :id="row.id" />
+                    </QTd>
+                </template>
+                <template #body-cell-client="{ row }">
+                    <QTd @click.stop.prevent>
+                        <span class="link">{{ row.nickname }}</span>
+                        <CustomerDescriptorProxy :id="row.clientFk" />
+                    </QTd>
+                </template>
+                <template #body-cell-salesPerson="{ row }">
+                    <QTd @click.stop.prevent>
+                        <span class="link">{{ row.userName }}</span>
+                        <WorkerDescriptorProxy :id="row.salesPersonFk" />
+                    </QTd>
+                </template>
+                <template #body-cell-date="{ row }">
+                    <QTd>
+                        <QBadge
+                            v-bind="getBadgeAttrs(row.shippedDate)"
+                            class="q-ma-none"
+                            dense
+                            style="font-size: 14px"
+                        >
+                            {{ formatShippedDate(row.shippedDate) }}
+                        </QBadge>
+                    </QTd>
+                </template>
+                <template #body-cell-state="{ row }">
+                    <QTd @click.stop.prevent>
+                        <div v-if="row.refFk">
+                            <span class="link">{{ row.refFk }}</span>
+                            <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
+                        </div>
+                        <QBadge
+                            v-else
+                            :color="stateColors[row.classColor] || 'transparent'"
+                            :text-color="stateColors[row.classColor] ? 'black' : 'white'"
+                            dense
+                            style="font-size: 14px"
+                        >
+                            {{ row.state }}
+                        </QBadge>
+                    </QTd>
+                </template>
+                <template #body-cell-isFragile="{ row }">
+                    <QTd>
+                        <QIcon
+                            v-if="row.isFragile"
+                            name="local_bar"
+                            color="primary"
+                            size="sm"
+                        >
+                            <QTooltip>{{ t('salesTicketsTable.isFragile') }}</QTooltip>
+                        </QIcon>
+                    </QTd>
+                </template>
+                <template #body-cell-zone="{ row }">
+                    <QTd @click.stop.prevent>
+                        <span class="link">{{ row.zoneName }}</span>
+                        <ZoneDescriptorProxy :id="row.zoneFk" />
+                    </QTd>
+                </template>
+                <template #body-cell-total="{ row }">
+                    <QTd>
+                        <QBadge
+                            :color="totalPriceColor(row) || 'transparent'"
+                            :text-color="totalPriceColor(row) ? 'black' : 'white'"
+                            dense
+                            style="font-size: 14px"
+                        >
+                            {{ toCurrency(row.totalWithVat) }}
+                        </QBadge>
+                    </QTd>
+                </template>
+                <template #body-cell-rowActions="{ row }">
+                    <QTd @click.stop.prevent>
+                        <QBtn
+                            icon="vn:lines"
+                            color="primary"
+                            size="md"
+                            class="q-mr-sm"
+                            flat
+                            dense
+                            :to="{ name: 'TicketSale', params: { id: row.id } }"
+                        >
+                            <QTooltip>{{ t('salesTicketsTable.goToLines') }}</QTooltip>
+                        </QBtn>
+                        <QBtn
+                            icon="preview"
+                            color="primary"
+                            size="md"
+                            dense
+                            flat
+                            @click="viewSummary(row.id, TicketSummary)"
+                        >
+                            <QTooltip>{{ t('salesTicketsTable.preview') }}</QTooltip>
+                        </QBtn>
+                    </QTd>
+                </template>
+            </QTable>
+        </template>
+    </VnPaginate>
+</template>
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
new file mode 100644
index 000000000..f58db7854
--- /dev/null
+++ b/src/pages/Monitor/locale/en.yml
@@ -0,0 +1,45 @@
+salesMonitor:
+    clientsOnWebsite: Clients on website
+    recentOrderActions: Recent order actions
+    ticketsMonitor: Tickets monitor
+salesClientsTable:
+    from: From
+    to: To
+    date: Date
+    hour: Hour
+    salesPerson: Salesperson
+    client: Client
+salesOrdersTable:
+    delete: Delete
+    date: Date
+    client: Client
+    salesPerson: Salesperson
+    deleteConfirmTitle: Delete selected elements
+    deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
+salesTicketsTable:
+    autoRefresh: Auto-refresh
+    problems: Problems
+    noVerifiedData: No verified data
+    notVisible: Not visible
+    purchaseRequest: Purchase request
+    clientFrozen: Client frozen
+    risk: Risk
+    componentLack: Component lack
+    tooLittle: Ticket too little
+    identifier: Identifier
+    client: Client
+    salesPerson: Salesperson
+    date: Date
+    theoretical: Theoretical
+    practical: Practical
+    province: Province
+    state: State
+    isFragile: Is fragile
+    zone: Zone
+    goToLines: Go to lines
+    preview: Preview
+    total: Total
+    preparation: Preparation
+searchBar:
+    label: Search tickets
+    info: Search tickets by id or alias
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
new file mode 100644
index 000000000..918b51813
--- /dev/null
+++ b/src/pages/Monitor/locale/es.yml
@@ -0,0 +1,45 @@
+salesMonitor:
+    clientsOnWebsite: Clientes activos en la web
+    recentOrderActions: Acciones recientes en pedidos
+    ticketsMonitor: Monitor de tickets
+salesClientsTable:
+    from: Desde
+    to: Hasta
+    date: Fecha
+    hour: Hora
+    salesPerson: Comercial
+    client: Cliente
+salesOrdersTable:
+    delete: Eliminar
+    date: Fecha
+    client: Cliente
+    salesPerson: Comercial
+    deleteConfirmTitle: Eliminar los elementos seleccionados
+    deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
+salesTicketsTable:
+    autoRefresh: Auto-refresco
+    problems: Problemas
+    noVerifiedData: Sin datos comprobados
+    notVisible: No visible
+    purchaseRequest: Petición de compra
+    clientFrozen: Cliente congelado
+    risk: Riesgo
+    componentLack: Faltan componentes
+    tooLittle: Ticket demasiado pequeño
+    identifier: Identificador
+    client: Cliente
+    salesPerson: Comercial
+    date: Fecha
+    theoretical: Teórica
+    practical: Práctica
+    province: Provincia
+    state: Estado
+    isFragile: Es frágil
+    zone: Zona
+    goToLines: Ir a líneas
+    preview: Vista previa
+    total: Total
+    preparation: Preparación
+searchBar:
+    label: Buscar tickets
+    info: Buscar tickets por identificador o alias
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index ef7b30d86..5b6896656 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -1,7 +1,19 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
+import OrderFilter from './OrderFilter.vue';
+import OrderSearchbar from './OrderSearchbar.vue';
 </script>
 <template>
-    <VnCard data-key="Order" base-url="Orders" :descriptor="OrderDescriptor" />
+    <VnCard
+        data-key="Order"
+        base-url="Orders"
+        :descriptor="OrderDescriptor"
+        :filter-panel="OrderFilter"
+        search-data-key="OrderList"
+    >
+        <template #searchbar>
+            <OrderSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index ddb7182a0..378073897 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { reactive, ref, onMounted } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useState } from 'composables/useState';
@@ -144,81 +144,73 @@ const orderFilter = {
         >
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('order.form.clientFk')"
-                            v-model="data.clientFk"
-                            :options="clientList"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            @update:model-value="
-                                (client) => fetchAddressList(client.defaultAddressFk)
-                            "
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{ `${scope.opt.id}: ${scope.opt.name}` }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('order.form.addressFk')"
-                            v-model="data.addressFk"
-                            :options="addressList"
-                            option-value="id"
-                            option-label="nickname"
-                            hide-selected
-                            :disable="!addressList?.length"
-                            @update:model-value="
-                                () => fetchAgencyList(data.landed, data.addressFk)
-                            "
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{
-                                                `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
-                                            }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
+                    <VnSelect
+                        :label="t('order.form.clientFk')"
+                        v-model="data.clientFk"
+                        :options="clientList"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        @update:model-value="
+                            (client) => fetchAddressList(client.defaultAddressFk)
+                        "
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :label="t('order.form.addressFk')"
+                        v-model="data.addressFk"
+                        :options="addressList"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :disable="!addressList?.length"
+                        @update:model-value="
+                            () => fetchAgencyList(data.landed, data.addressFk)
+                        "
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{
+                                            `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
+                                        }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInputDate
-                            placeholder="dd-mm-aaa"
-                            :label="t('order.form.landed')"
-                            v-model="data.landed"
-                            @update:model-value="
-                                () => fetchAgencyList(data.landed, data.addressFk)
-                            "
-                        />
-                    </div>
+                    <VnInputDate
+                        placeholder="dd-mm-aaa"
+                        :label="t('order.form.landed')"
+                        v-model="data.landed"
+                        @update:model-value="
+                            () => fetchAgencyList(data.landed, data.addressFk)
+                        "
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('order.form.agencyModeFk')"
-                            v-model="data.agencyModeFk"
-                            :options="agencyList"
-                            option-value="agencyModeFk"
-                            option-label="agencyMode"
-                            hide-selected
-                            :disable="!agencyList?.length"
-                        >
-                        </VnSelect>
-                    </div>
+                    <VnSelect
+                        :label="t('order.form.agencyModeFk')"
+                        v-model="data.agencyModeFk"
+                        :options="agencyList"
+                        option-value="agencyModeFk"
+                        option-label="agencyMode"
+                        hide-selected
+                        :disable="!agencyList?.length"
+                    >
+                    </VnSelect>
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 6e06be9bf..426cdc712 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -2,17 +2,14 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const stateStore = useStateStore();
 
 const $props = defineProps({
     id: {
@@ -53,10 +50,6 @@ const detailsColumns = ref([
 </script>
 
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <OrderSearchbar />
-    </Teleport>
-
     <div class="q-pa-md">
         <CardSummary ref="summary" :url="`Orders/${entityId}/summary`">
             <template #header="{ entity }">
@@ -158,11 +151,7 @@ const detailsColumns = ref([
                     <p class="header">
                         {{ t('order.summary.details') }}
                     </p>
-                    <QTable
-                        :columns="detailsColumns"
-                        :rows="entity?.rows"
-                        flat
-                    >
+                    <QTable :columns="detailsColumns" :rows="entity?.rows" flat>
                         <template #header="props">
                             <QTr :props="props">
                                 <QTh auto-width>{{ t('order.summary.item') }}</QTh>
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 203eaccd1..6d36d8b31 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -61,6 +61,7 @@ function navigate(id) {
                 :limit="20"
                 :order="['landed DESC', 'clientFk', 'id DESC']"
                 :user-params="{ showEmpty: false }"
+                :keep-opts="['userParams']"
                 auto-load
             >
                 <template #body="{ rows }">
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index c1a9dcee8..8e3433a5b 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnRow from 'components/ui/VnRow.vue';
@@ -10,7 +10,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const parkingId = route.params?.id || null;
+const parkingId = computed(() => route.params?.id || null);
 const sectors = ref([]);
 const sectorFilter = { fields: ['id', 'description'] };
 
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 5a0b552d6..620f4bb2d 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -1,6 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
+import ParkingFilter from 'pages/Parking/ParkingFilter.vue';
 
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
@@ -13,8 +14,9 @@ const filter = {
         base-url="Parkings"
         :filter="filter"
         :descriptor="ParkingDescriptor"
-        searchbar-data-key="ParkingList"
-        searchbar-url="Parkings"
+        :filter-panel="ParkingFilter"
+        search-data-key="ParkingList"
+        search-url="Parkings"
         searchbar-label="parking.searchBar.label"
         searchbar-info="parking.searchBar.info"
     />
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
index 3ff0a5d17..b5c8820ed 100644
--- a/src/pages/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -15,10 +15,10 @@ const props = defineProps({
 });
 
 const { t } = useI18n();
-const { params } = useRoute();
-const entityId = computed(() => props.id || params.id);
+const route = useRoute();
+const entityId = computed(() => props.id || route.params.id);
 const { store } = useArrayData('Parking');
-const card = computed(() => store.data);
+const parking = computed(() => store.data);
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
@@ -29,11 +29,12 @@ const filter = {
         module="Parking"
         data-key="Parking"
         :url="`Parkings/${entityId}`"
-        :title="card?.code"
-        :subtitle="card?.id"
+        :title="parking?.code"
+        :subtitle="parking?.id"
         :filter="filter"
+        @on-fetch="(data) => (parking = data)"
     >
-        <template #body="{ entity: parking }">
+        <template #body>
             <VnLv :label="t('globals.code')" :value="parking.code" />
             <VnLv :label="t('parking.pickingOrder')" :value="parking.pickingOrder" />
             <VnLv :label="t('parking.sector')" :value="parking.sector?.description" />
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index 9a79f428b..ebc3a996b 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -1,9 +1,10 @@
 <script setup>
-import { computed } from 'vue';
+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 'components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const $props = defineProps({
     id: {
@@ -14,7 +15,9 @@ const $props = defineProps({
 const router = useRoute();
 const { t } = useI18n();
 const entityId = computed(() => $props.id || router.params.id);
+const { store } = useArrayData('Parking');
 
+const parking = ref(store.data);
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
@@ -23,9 +26,13 @@ const filter = {
 
 <template>
     <div class="q-pa-md">
-        <CardSummary :url="`Parkings/${entityId}`" :filter="filter">
-            <template #header="{ entity: parking }">{{ parking.code }}</template>
-            <template #body="{ entity: parking }">
+        <CardSummary
+            :url="`Parkings/${entityId}`"
+            :filter="filter"
+            @on-fetch="(data) => (parking = data)"
+        >
+            <template #header>{{ parking.code }}</template>
+            <template #body>
                 <QCard class="vn-one">
                     <QCardSection class="q-pa-none">
                         <a
diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index fd0a8a507..461f2d95e 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -1,7 +1,19 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
+import RouteFilter from './RouteFilter.vue';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 </script>
 <template>
-    <VnCard data-key="Route" base-url="Routes" :descriptor="RouteDescriptor" />
+    <VnCard
+        data-key="Route"
+        base-url="Routes"
+        :descriptor="RouteDescriptor"
+        :filter-panel="RouteFilter"
+        search-data-key="RouteList"
+    >
+        <template #searchbar>
+            <RouteSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index b365bc9ba..892a0333c 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -123,90 +123,70 @@ const onSave = (data, response) => {
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Worker')"
-                        v-model="data.workerFk"
-                        :options="workerList"
-                        option-value="id"
-                        option-label="nickname"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ opt.nickname }}, {{ opt.code }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Vehicle')"
-                        v-model="data.vehicleFk"
-                        :options="vehicleList"
-                        option-value="id"
-                        option-label="numberPlate"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Worker')"
+                    v-model="data.workerFk"
+                    :options="workerList"
+                    option-value="id"
+                    option-label="nickname"
+                    emit-value
+                    map-options
+                    use-input
+                    :input-debounce="0"
+                >
+                    <template #option="{ itemProps, opt }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ opt.name }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ opt.nickname }}, {{ opt.code }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('Vehicle')"
+                    v-model="data.vehicleFk"
+                    :options="vehicleList"
+                    option-value="id"
+                    option-label="numberPlate"
+                    emit-value
+                    map-options
+                    use-input
+                    :input-debounce="0"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Agency')"
-                        v-model="data.agencyModeFk"
-                        :options="agencyList"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate v-model="data.created" :label="t('Created')" />
-                </div>
+                <VnSelect
+                    :label="t('Agency')"
+                    v-model="data.agencyModeFk"
+                    :options="agencyList"
+                    option-value="id"
+                    option-label="name"
+                    emit-value
+                    map-options
+                    use-input
+                    :input-debounce="0"
+                />
+                <VnInputDate v-model="data.created" :label="t('Created')" />
             </VnRow>
             <template v-if="!isNew">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.kmStart"
-                            :label="t('Km Start')"
-                            clearable
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput v-model="data.kmEnd" :label="t('Km End')" clearable />
-                    </div>
+                    <VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
+                    <VnInput v-model="data.kmEnd" :label="t('Km End')" clearable />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInputTime
-                            v-model="data.started"
-                            :label="t('Hour started')"
-                            clearable
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInputTime
-                            v-model="data.finished"
-                            :label="t('Hour finished')"
-                            clearable
-                        />
-                    </div>
+                    <VnInputTime
+                        v-model="data.started"
+                        :label="t('Hour started')"
+                        clearable
+                    />
+                    <VnInputTime
+                        v-model="data.finished"
+                        :label="t('Hour finished')"
+                        clearable
+                    />
                     <div class="col flex items-center">
                         <QCheckbox
                             size="sm"
@@ -218,15 +198,13 @@ const onSave = (data, response) => {
                 </VnRow>
             </template>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('Description')"
-                        type="textarea"
-                        :rows="3"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    v-model="data.description"
+                    :label="t('Description')"
+                    type="textarea"
+                    :rows="3"
+                    clearable
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Route/Card/RouteSearchbar.vue b/src/pages/Route/Card/RouteSearchbar.vue
index e3833d13c..924280580 100644
--- a/src/pages/Route/Card/RouteSearchbar.vue
+++ b/src/pages/Route/Card/RouteSearchbar.vue
@@ -1,6 +1,6 @@
 <script setup>
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import {useI18n} from "vue-i18n";
+import { useI18n } from 'vue-i18n';
 const { t } = useI18n();
 </script>
 
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 220f93f30..ac03a8231 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -10,7 +10,6 @@ import { dashIfEmpty, toCurrency, toDate, toHour } from 'src/filters';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import { openBuscaman } from 'src/utils/buscaman';
 
 const $props = defineProps({
@@ -118,11 +117,6 @@ const ticketColumns = ref([
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <RouteSearchbar />
-        </Teleport>
-    </template>
     <div class="q-pa-md full-width">
         <CardSummary
             ref="summary"
diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index b9df0bdd7..a6c2f7d4d 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -41,85 +41,61 @@ const onSave = (data, response) => {
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput v-model="data.name" :label="t('Roadmap')" clearable />
-                </div>
-                <div class="col">
-                    <VnInputDate v-model="data.etd" :label="t('ETD date')" />
-                </div>
-                <div class="col">
-                    <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
-                </div>
+                <VnInput v-model="data.name" :label="t('Roadmap')" clearable />
+                <VnInputDate v-model="data.etd" :label="t('ETD date')" />
+                <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.tractorPlate"
-                        :label="t('Tractor plate')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.trailerPlate"
-                        :label="t('Trailer plate')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    v-model="data.tractorPlate"
+                    :label="t('Tractor plate')"
+                    clearable
+                />
+                <VnInput
+                    v-model="data.trailerPlate"
+                    :label="t('Trailer plate')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Carrier')"
-                        v-model="data.supplierFk"
-                        :options="supplierList"
-                        option-value="id"
-                        option-label="nickname"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
-                                <QItemSection>
-                                    <QItemLabel
-                                        >{{ opt.id }} - {{ opt.nickname }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.price"
-                        :label="t('Price')"
-                        type="number"
-                        clearable
-                    />
-                </div>
+                <VnSelect
+                    :label="t('Carrier')"
+                    v-model="data.supplierFk"
+                    :options="supplierList"
+                    option-value="id"
+                    option-label="nickname"
+                    emit-value
+                    map-options
+                    use-input
+                    :input-debounce="0"
+                >
+                    <template #option="{ itemProps, opt }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel
+                                    >{{ opt.id }} - {{ opt.nickname }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInput
+                    v-model="data.price"
+                    :label="t('Price')"
+                    type="number"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.driverName"
-                        :label="t('Driver name')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnInput v-model="data.phone" :label="t('Phone')" clearable />
-                </div>
+                <VnInput v-model="data.driverName" :label="t('Driver name')" clearable />
+                <VnInput v-model="data.phone" :label="t('Phone')" clearable />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.observations"
-                        :label="t('Observations')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    v-model="data.observations"
+                    :label="t('Observations')"
+                    clearable
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Route/Roadmap/RoadmapCreate.vue b/src/pages/Route/Roadmap/RoadmapCreate.vue
index 214983dd3..fb3b29f33 100644
--- a/src/pages/Route/Roadmap/RoadmapCreate.vue
+++ b/src/pages/Route/Roadmap/RoadmapCreate.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { 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';
@@ -9,7 +9,6 @@ import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const router = useRouter();
 const defaultInitialData = {
     etd: Date.vnNew().toISOString(),
@@ -31,19 +30,9 @@ const onSave = (data, response) => {
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.name"
-                        :label="t('Roadmap')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate v-model="data.etd" :label="t('ETD date')" />
-                </div>
-                <div class="col">
-                    <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
-                </div>
+                <VnInput v-model="data.name" :label="t('Roadmap')" clearable />
+                <VnInputDate v-model="data.etd" :label="t('ETD date')" />
+                <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 1fed6aa78..9aa8f40d7 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -72,7 +72,12 @@ const openAddStopDialog = () => {
 
 <template>
     <div class="q-pa-md full-width">
-        <CardSummary ref="summary" :url="`Roadmaps/${entityId}`" :filter="filter">
+        <CardSummary
+            data-key="RoadmapSummary"
+            ref="summary"
+            :url="`Roadmaps/${entityId}`"
+            :filter="filter"
+        >
             <template #header-left>
                 <RouterLink :to="{ name: `RoadmapSummary`, params: { id: entityId } }">
                     <QIcon name="open_in_new" color="white" size="sm" />
diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 0ecf0a971..238dce070 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -280,7 +280,7 @@ function navigateToRouteSummary(event, row) {
                                     <div class="table-actions">
                                         <QIcon
                                             name="preview"
-                                            size="xs"
+                                            size="sm"
                                             color="primary"
                                             @click.stop="
                                                 viewSummary(
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index c0888a225..73801e13a 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -422,7 +422,7 @@ const openTicketsDialog = (id) => {
                                     <div class="flex items-center no-wrap table-actions">
                                         <QIcon
                                             name="vn:ticketAdd"
-                                            size="xs"
+                                            size="sm"
                                             color="primary"
                                             class="cursor-pointer"
                                             @click="openTicketsDialog(props?.row?.id)"
@@ -431,7 +431,7 @@ const openTicketsDialog = (id) => {
                                         </QIcon>
                                         <QIcon
                                             name="preview"
-                                            size="xs"
+                                            size="sm"
                                             color="primary"
                                             @click="
                                                 viewSummary(props?.row?.id, RouteSummary)
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 7a7dbd948..2ed8b6a9a 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -242,7 +242,7 @@ function navigateToRoadmapSummary(event, row) {
                                     <div class="flex items-center table-actions">
                                         <QIcon
                                             name="preview"
-                                            size="xs"
+                                            size="sm"
                                             color="primary"
                                             @click.stop="
                                                 viewSummary(
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 44818323e..eb2035011 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -274,7 +274,7 @@ const openSmsDialog = async () => {
                 <QBtn
                     icon="filter_alt"
                     color="primary"
-                    class="q-mr-sm filled-icon"
+                    class="q-mr-sm fill-icon"
                     :disable="!selectedRows?.length"
                     @click="deletePriorities"
                 >
@@ -295,7 +295,7 @@ const openSmsDialog = async () => {
                 <QBtn
                     icon="sms"
                     color="primary"
-                    class="q-mr-sm filled-icon"
+                    class="q-mr-sm fill-icon"
                     :disable="!selectedRows?.length"
                     @click="openSmsDialog"
                 >
@@ -425,10 +425,6 @@ const openSmsDialog = async () => {
 .table-actions {
     gap: 12px;
 }
-
-.filled-icon {
-    font-variation-settings: 'FILL' 1;
-}
 </style>
 <i18n>
 es:
diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index f4a2fcf60..a501a7a99 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -1,7 +1,19 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
+import ShelvingFilter from './ShelvingFilter.vue';
+import ShelvingSearchbar from './ShelvingSearchbar.vue';
 </script>
 <template>
-    <VnCard data-key="Shelving" base-url="Shelvings" :descriptor="ShelvingDescriptor" />
+    <VnCard
+        data-key="Shelving"
+        base-url="Shelvings"
+        :descriptor="ShelvingDescriptor"
+        :filter-panel="ShelvingFilter"
+        search-data-key="ShelvingList"
+    >
+        <template #searchbar>
+            <ShelvingSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index 238879bd4..d9b6ede0d 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -86,47 +86,39 @@ const onSave = (shelving, newShelving) => {
     >
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.code"
-                        :label="t('shelving.basicData.code')"
-                        :rules="validate('Shelving.code')"
-                    />
-                </div>
-                <div class="col">
-                    <QSelect
-                        v-model="data.parkingFk"
-                        :options="parkingList"
-                        option-value="id"
-                        option-label="code"
-                        emit-value
-                        :label="t('shelving.basicData.parking')"
-                        map-options
-                        use-input
-                        @filter="
-                            (value, update) => filter(value, update, parkingSelectFilter)
-                        "
-                        :rules="validate('Shelving.parkingFk')"
-                        :input-debounce="0"
-                    />
-                </div>
+                <VnInput
+                    v-model="data.code"
+                    :label="t('shelving.basicData.code')"
+                    :rules="validate('Shelving.code')"
+                />
+                <QSelect
+                    v-model="data.parkingFk"
+                    :options="parkingList"
+                    option-value="id"
+                    option-label="code"
+                    emit-value
+                    :label="t('shelving.basicData.parking')"
+                    map-options
+                    use-input
+                    @filter="
+                        (value, update) => filter(value, update, parkingSelectFilter)
+                    "
+                    :rules="validate('Shelving.parkingFk')"
+                    :input-debounce="0"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.priority"
-                        type="number"
-                        :label="t('shelving.basicData.priority')"
-                        :rules="validate('Shelving.priority')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isRecyclable"
-                        :label="t('shelving.basicData.recyclable')"
-                        :rules="validate('Shelving.isRecyclable')"
-                    />
-                </div>
+                <VnInput
+                    v-model="data.priority"
+                    type="number"
+                    :label="t('shelving.basicData.priority')"
+                    :rules="validate('Shelving.priority')"
+                />
+                <QCheckbox
+                    v-model="data.isRecyclable"
+                    :label="t('shelving.basicData.recyclable')"
+                    :rules="validate('Shelving.isRecyclable')"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 649799b00..168552832 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -1,11 +1,9 @@
 <script setup>
-import { computed, onMounted, onUnmounted } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
 
 const $props = defineProps({
@@ -15,19 +13,10 @@ const $props = defineProps({
     },
 });
 const route = useRoute();
-const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
-const isDialog = false;
-// const hideRightDrawer = () => {
-//     if (!isDialog) {
-//         stateStore.rightDrawer = false;
-//     }
-// };
-// onMounted(hideRightDrawer);
-// onUnmounted(hideRightDrawer);
+
 const filter = {
     include: [
         {
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index d95b6c30c..b0e8b06e8 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -99,63 +99,57 @@ const setWireTransfer = async () => {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <div class="col">
-                        <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
-                            <template #append>
-                                <QIcon name="info" class="cursor-info">
-                                    <QTooltip>{{
-                                        t('components.iban_tooltip')
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </VnInput>
-                    </div>
-                    <div class="col">
-                        <VnSelectDialog
-                            :label="t('worker.create.bankEntity')"
-                            v-model="row.bankEntityFk"
-                            :options="bankEntitiesOptions"
-                            option-label="bic"
-                            option-value="id"
-                            hide-selected
-                        >
-                            <template #form>
-                                <CreateBankEntityForm
-                                    @on-data-saved="
-                                        (_, requestResponse) =>
-                                            onBankEntityCreated(requestResponse, row)
-                                    "
-                                    :show-entity-field="false"
-                                />
-                            </template>
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection v-if="scope.opt">
-                                        <QItemLabel
-                                            >{{ scope.opt.bic }}
-                                            {{ scope.opt.name }}</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectDialog>
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            :label="t('supplier.accounts.beneficiary')"
-                            v-model="row.beneficiary"
-                        >
-                            <template #append>
-                                <QIcon name="info" class="cursor-pointer">
-                                    <QTooltip>{{
-                                        t(
-                                            'Name of the bank account holder if different from the provider'
-                                        )
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </VnInput>
-                    </div>
+                    <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip>{{
+                                    t('components.iban_tooltip')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </VnInput>
+                    <VnSelectDialog
+                        :label="t('worker.create.bankEntity')"
+                        v-model="row.bankEntityFk"
+                        :options="bankEntitiesOptions"
+                        option-label="bic"
+                        option-value="id"
+                        hide-selected
+                    >
+                        <template #form>
+                            <CreateBankEntityForm
+                                @on-data-saved="
+                                    (_, requestResponse) =>
+                                        onBankEntityCreated(requestResponse, row)
+                                "
+                                :show-entity-field="false"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection v-if="scope.opt">
+                                    <QItemLabel
+                                        >{{ scope.opt.bic }}
+                                        {{ scope.opt.name }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectDialog>
+                    <VnInput
+                        :label="t('supplier.accounts.beneficiary')"
+                        v-model="row.beneficiary"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip>{{
+                                    t(
+                                        'Name of the bank account holder if different from the provider'
+                                    )
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </VnInput>
                     <div class="col-1 row justify-center items-center">
                         <QIcon
                             name="delete"
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 54f8580bd..eccf06204 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -2,23 +2,16 @@
 import { useI18n } from 'vue-i18n';
 import { reactive, ref, onMounted, onBeforeMount } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
-
-import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
-const provincesOptions = ref([]);
 const postcodesOptions = ref([]);
-const townsLocationOptions = ref([]);
 const viewAction = ref();
 const updateAddressId = ref(null);
 const newAddressForm = reactive({
@@ -79,45 +72,34 @@ function handleLocation(data, location) {
         >
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.nickname"
-                            :label="t('supplier.addresses.name')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.street"
-                            :label="t('supplier.addresses.street')"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.nickname"
+                        :label="t('supplier.addresses.name')"
+                    />
+                    <VnInput
+                        v-model="data.street"
+                        :label="t('supplier.addresses.street')"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnLocation
-                            :rules="validate('Worker.postcode')"
-                            :roles-allowed-to-create="['deliveryAssistant']"
-                            :options="postcodesOptions"
-                            v-model="data.location"
-                            @update:model-value="
-                                (location) => handleLocation(data, location)
-                            "
-                        ></VnLocation>
-                    </div>
+                    <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">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.phone"
-                            :label="t('supplier.addresses.phone')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.mobile"
-                            :label="t('supplier.addresses.mobile')"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.phone"
+                        :label="t('supplier.addresses.phone')"
+                    />
+                    <VnInput
+                        v-model="data.mobile"
+                        :label="t('supplier.addresses.mobile')"
+                    />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index 50a4f7adc..26a410e8c 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -54,57 +54,43 @@ const redirectToCreateView = () => {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <div class="col">
-                        <QField :label="t('supplier.agencyTerms.agencyFk')" stack-label>
-                            <template #control>
-                                <div tabindex="0">
-                                    {{ row.agency?.name }}
-                                </div>
-                            </template>
-                        </QField>
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.minimumM3')"
-                            v-model.number="row.minimumM3"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.packagePrice')"
-                            v-model.number="row.packagePrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.kmPrice')"
-                            v-model.number="row.kmPrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.m3Price')"
-                            v-model.number="row.m3Price"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.routePrice')"
-                            v-model.number="row.routePrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.minimumKm')"
-                            v-model.number="row.minimumKm"
-                            type="number"
-                        />
-                    </div>
+                    <QField :label="t('supplier.agencyTerms.agencyFk')" stack-label>
+                        <template #control>
+                            <div tabindex="0">
+                                {{ row.agency?.name }}
+                            </div>
+                        </template>
+                    </QField>
+                    <QInput
+                        :label="t('supplier.agencyTerms.minimumM3')"
+                        v-model.number="row.minimumM3"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.packagePrice')"
+                        v-model.number="row.packagePrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.kmPrice')"
+                        v-model.number="row.kmPrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.m3Price')"
+                        v-model.number="row.m3Price"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.routePrice')"
+                        v-model.number="row.routePrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.minimumKm')"
+                        v-model.number="row.minimumKm"
+                        type="number"
+                    />
                     <div class="col-1 row justify-center items-center">
                         <QIcon
                             name="delete"
diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index ccd1cafd3..5eb64233f 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -46,63 +46,49 @@ const onDataSaved = () => {
         >
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('supplier.agencyTerms.agencyFk')"
-                            v-model="data.agencyFk"
-                            :options="agenciesOptions"
-                            option-label="name"
-                            option-value="id"
-                            hide-selected
-                            rounded
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.minimumM3')"
-                            v-model.number="data.minimumM3"
-                            type="number"
-                        />
-                    </div>
+                    <VnSelect
+                        :label="t('supplier.agencyTerms.agencyFk')"
+                        v-model="data.agencyFk"
+                        :options="agenciesOptions"
+                        option-label="name"
+                        option-value="id"
+                        hide-selected
+                        rounded
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.minimumM3')"
+                        v-model.number="data.minimumM3"
+                        type="number"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.packagePrice')"
-                            v-model.number="data.packagePrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.kmPrice')"
-                            v-model.number="data.kmPrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.m3Price')"
-                            v-model.number="data.m3Price"
-                            type="number"
-                        />
-                    </div>
+                    <QInput
+                        :label="t('supplier.agencyTerms.packagePrice')"
+                        v-model.number="data.packagePrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.kmPrice')"
+                        v-model.number="data.kmPrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.m3Price')"
+                        v-model.number="data.m3Price"
+                        type="number"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.routePrice')"
-                            v-model.number="data.routePrice"
-                            type="number"
-                        />
-                    </div>
-                    <div class="col">
-                        <QInput
-                            :label="t('supplier.agencyTerms.minimumKm')"
-                            v-model.number="data.minimumKm"
-                            type="number"
-                        />
-                    </div>
+                    <QInput
+                        :label="t('supplier.agencyTerms.routePrice')"
+                        v-model.number="data.routePrice"
+                        type="number"
+                    />
+                    <QInput
+                        :label="t('supplier.agencyTerms.minimumKm')"
+                        v-model.number="data.minimumKm"
+                        type="number"
+                    />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 6a1d747d5..10d6f8f68 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -30,74 +30,62 @@ const workersOptions = ref([]);
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.nickname"
-                        :label="t('supplier.basicData.alias')"
-                        :rules="validate('supplier.nickname')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.basicData.workerFk')"
-                        v-model="data.workerFk"
-                        :options="workersOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        map-options
-                        :rules="validate('supplier.workerFk')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip>{{
-                                    t('Responsible for approving invoices')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
+                <VnInput
+                    v-model="data.nickname"
+                    :label="t('supplier.basicData.alias')"
+                    :rules="validate('supplier.nickname')"
+                    clearable
+                />
+                <VnSelect
+                    :label="t('supplier.basicData.workerFk')"
+                    v-model="data.workerFk"
+                    :options="workersOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                    map-options
+                    :rules="validate('supplier.workerFk')"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{
+                                t('Responsible for approving invoices')
+                            }}</QTooltip>
+                        </QIcon>
+                    </template>
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isSerious"
-                        :label="t('supplier.basicData.isSerious')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isActive"
-                        :label="t('supplier.basicData.isActive')"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        v-model="data.isPayMethodChecked"
-                        :label="t('supplier.basicData.isPayMethodChecked')"
-                    />
-                </div>
+                <QCheckbox
+                    v-model="data.isSerious"
+                    :label="t('supplier.basicData.isSerious')"
+                />
+                <QCheckbox
+                    v-model="data.isActive"
+                    :label="t('supplier.basicData.isActive')"
+                />
+                <QCheckbox
+                    v-model="data.isPayMethodChecked"
+                    :label="t('supplier.basicData.isPayMethodChecked')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('supplier.basicData.note')"
-                        type="textarea"
-                        v-model="data.note"
-                        fill-input
-                    />
-                </div>
+                <QInput
+                    :label="t('supplier.basicData.note')"
+                    type="textarea"
+                    v-model="data.note"
+                    fill-input
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index e6e61d339..62ca91a54 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -37,37 +37,31 @@ const formatPayDems = (data) => {
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.billingData.payMethodFk')"
-                        v-model="data.payMethodFk"
-                        :options="paymethodsOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        :rules="validate('supplier.payMethodFk')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.billingData.payDemFk')"
-                        v-model="data.payDemFk"
-                        :options="payDemsOptions"
-                        option-value="id"
-                        option-label="payDem"
-                        hide-selected
-                        :rules="validate('supplier.payDemFk')"
-                    />
-                </div>
+                <VnSelect
+                    :label="t('supplier.billingData.payMethodFk')"
+                    v-model="data.payMethodFk"
+                    :options="paymethodsOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                    :rules="validate('supplier.payMethodFk')"
+                />
+                <VnSelect
+                    :label="t('supplier.billingData.payDemFk')"
+                    v-model="data.payDemFk"
+                    :options="payDemsOptions"
+                    option-value="id"
+                    option-label="payDem"
+                    hide-selected
+                    :rules="validate('supplier.payDemFk')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QInput
-                        :label="t('supplier.billingData.payDay')"
-                        type="number"
-                        v-model="data.payDay"
-                    />
-                </div>
+                <QInput
+                    :label="t('supplier.billingData.payDay')"
+                    type="number"
+                    v-model="data.payDay"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index c8c503056..adf0315da 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import SupplierDescriptor from './SupplierDescriptor.vue';
+import SupplierListFilter from '../SupplierListFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Supplier"
         base-url="Suppliers"
         :descriptor="SupplierDescriptor"
-        searchbar-data-key="SupplierList"
-        searchbar-url="Suppliers/filter"
+        :filter-panel="SupplierListFilter"
+        search-data-key="SupplierList"
+        search-url="Suppliers/filter"
         searchbar-label="Search suppliers"
     />
 </template>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 8dbb87529..4eac24469 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { computed, onMounted, watch, onUnmounted, ref } from 'vue';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import FetchedTags from 'components/ui/FetchedTags.vue';
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 92ba1c1fc..35e8b98fc 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -42,42 +42,32 @@ const insertRow = () => {
                     class="border q-pa-md q-mb-md"
                 >
                     <VnRow class="row q-gutter-md">
-                        <div class="col">
-                            <VnInput
-                                input-name-focusable
-                                :label="t('supplier.contacts.name')"
-                                v-model="row.name"
-                            />
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('supplier.contacts.phone')"
-                                v-model="row.phone"
-                            />
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('supplier.contacts.mobile')"
-                                v-model="row.mobile"
-                            />
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('supplier.contacts.email')"
-                                v-model="row.email"
-                            />
-                        </div>
+                        <VnInput
+                            input-name-focusable
+                            :label="t('supplier.contacts.name')"
+                            v-model="row.name"
+                        />
+                        <VnInput
+                            :label="t('supplier.contacts.phone')"
+                            v-model="row.phone"
+                        />
+                        <VnInput
+                            :label="t('supplier.contacts.mobile')"
+                            v-model="row.mobile"
+                        />
+                        <VnInput
+                            :label="t('supplier.contacts.email')"
+                            v-model="row.email"
+                        />
                     </VnRow>
                     <VnRow class="row q-gutter-md">
-                        <div class="col">
-                            <QInput
-                                :label="t('supplier.contacts.observation')"
-                                type="textarea"
-                                v-model="row.observation"
-                                fill-input
-                                autogrow
-                            />
-                        </div>
+                        <QInput
+                            :label="t('supplier.contacts.observation')"
+                            type="textarea"
+                            v-model="row.observation"
+                            fill-input
+                            autogrow
+                        />
                         <div class="col-1 row justify-center items-center">
                             <QIcon
                                 name="delete"
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 8aeebaebd..179c6f5e6 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -57,105 +57,85 @@ function handleLocation(data, location) {
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.name"
-                        :label="t('supplier.fiscalData.name')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.nif"
-                        :label="t('supplier.fiscalData.nif')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    v-model="data.name"
+                    :label="t('supplier.fiscalData.name')"
+                    clearable
+                />
+                <VnInput
+                    v-model="data.nif"
+                    :label="t('supplier.fiscalData.nif')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.account"
-                        :label="t('supplier.fiscalData.account')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.fiscalData.sageTaxTypeFk')"
-                        v-model="data.sageTaxTypeFk"
-                        :options="sageTaxTypesOptions"
-                        option-value="id"
-                        option-label="vat"
-                        hide-selected
-                        map-options
-                    />
-                </div>
+                <VnInput
+                    v-model="data.account"
+                    :label="t('supplier.fiscalData.account')"
+                    clearable
+                />
+                <VnSelect
+                    :label="t('supplier.fiscalData.sageTaxTypeFk')"
+                    v-model="data.sageTaxTypeFk"
+                    :options="sageTaxTypesOptions"
+                    option-value="id"
+                    option-label="vat"
+                    hide-selected
+                    map-options
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.fiscalData.sageWithholdingFk')"
-                        v-model="data.sageWithholdingFk"
-                        :options="sageWithholdingsOptions"
-                        option-value="id"
-                        option-label="withholding"
-                        hide-selected
-                        map-options
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.fiscalData.sageTransactionTypeFk')"
-                        v-model="data.sageTransactionTypeFk"
-                        :options="sageTransactionTypesOptions"
-                        option-value="id"
-                        option-label="transaction"
-                        hide-selected
-                        map-options
-                    />
-                </div>
+                <VnSelect
+                    :label="t('supplier.fiscalData.sageWithholdingFk')"
+                    v-model="data.sageWithholdingFk"
+                    :options="sageWithholdingsOptions"
+                    option-value="id"
+                    option-label="withholding"
+                    hide-selected
+                    map-options
+                />
+                <VnSelect
+                    :label="t('supplier.fiscalData.sageTransactionTypeFk')"
+                    v-model="data.sageTransactionTypeFk"
+                    :options="sageTransactionTypesOptions"
+                    option-value="id"
+                    option-label="transaction"
+                    hide-selected
+                    map-options
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('supplier.fiscalData.supplierActivityFk')"
-                        v-model="data.supplierActivityFk"
-                        :options="supplierActivitiesOptions"
-                        option-value="code"
-                        option-label="name"
-                        hide-selected
-                        map-options
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.healthRegister"
-                        :label="t('supplier.fiscalData.healthRegister')"
-                        clearable
-                    />
-                </div>
+                <VnSelect
+                    :label="t('supplier.fiscalData.supplierActivityFk')"
+                    v-model="data.supplierActivityFk"
+                    :options="supplierActivitiesOptions"
+                    option-value="code"
+                    option-label="name"
+                    hide-selected
+                    map-options
+                />
+                <VnInput
+                    v-model="data.healthRegister"
+                    :label="t('supplier.fiscalData.healthRegister')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.street"
-                        :label="t('supplier.fiscalData.street')"
-                        clearable
-                    />
-                </div>
+                <VnInput
+                    v-model="data.street"
+                    :label="t('supplier.fiscalData.street')"
+                    clearable
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
-                        v-model="data.postCode"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                    >
-                    </VnLocation>
-                </div>
+                <VnLocation
+                    :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :options="postcodesOptions"
+                    v-model="data.postCode"
+                    @update:model-value="(location) => handleLocation(data, location)"
+                >
+                </VnLocation>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col flex justify-around">
diff --git a/src/pages/Supplier/SupplierCreate.vue b/src/pages/Supplier/SupplierCreate.vue
index d80bd2df8..7d45bac97 100644
--- a/src/pages/Supplier/SupplierCreate.vue
+++ b/src/pages/Supplier/SupplierCreate.vue
@@ -45,15 +45,13 @@ const redirectToSupplierFiscalData = (_, responseData) => {
         >
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.name"
-                            :label="t('supplier.create.supplierName')"
-                            @keyup="
-                                newSupplierForm.name = newSupplierForm.name.toUpperCase()
-                            "
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('supplier.create.supplierName')"
+                        @keyup="
+                            newSupplierForm.name = newSupplierForm.name.toUpperCase()
+                        "
+                    />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Supplier/SupplierListFilter.vue b/src/pages/Supplier/SupplierListFilter.vue
index 471ca7e53..7f838d3f5 100644
--- a/src/pages/Supplier/SupplierListFilter.vue
+++ b/src/pages/Supplier/SupplierListFilter.vue
@@ -29,7 +29,7 @@ const countriesOptions = ref([]);
     />
     <FetchData
         url="countries"
-        :filter="{ fields: ['id', 'country'], order: 'country ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
         @on-fetch="(data) => (countriesOptions = data)"
         auto-load
     />
@@ -92,7 +92,7 @@ const countriesOptions = ref([]);
                         @update:model-value="searchFn()"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="country"
+                        option-label="name"
                         hide-selected
                         dense
                         outlined
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 471bfe490..04363b506 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
+import TicketFilter from '../TicketFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Ticket"
         base-url="Tickets"
         :descriptor="TicketDescriptor"
-        searchbar-data-key="TicketList"
-        searchbar-url="Tickets/filter"
+        :filter-panel="TicketFilter"
+        search-data-key="TicketList"
+        search-url="Tickets/filter"
         searchbar-label="Search ticket"
         searchbar-info="You can search by ticket id or alias"
     />
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
new file mode 100644
index 000000000..02cccaff2
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -0,0 +1 @@
+<template>Ticket sale</template>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index af501240b..f55669619 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -13,6 +13,7 @@ import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -262,9 +263,12 @@ async function changeState(value) {
                     :url="ticketUrl + 'sale'"
                     :text="t('ticket.summary.saleLines')"
                 />
-                <QTable :rows="ticket.sales">
+                <QTable :rows="ticket.sales" style="text-align: center">
+                    <template #body-cell="{ value }">
+                        <QTd>{{ value }}</QTd>
+                    </template>
                     <template #header="props">
-                        <QTr :props="props">
+                        <QTr class="tr-header" :props="props">
                             <QTh auto-width></QTh>
                             <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.visible') }}</QTh>
@@ -360,23 +364,29 @@ async function changeState(value) {
                                     </QTooltip>
                                 </QIcon>
                             </QTd>
-                            <QTd class="link">{{ props.row.itemFk }}</QTd>
+                            <QTd>
+                                <QBtn class="link" flat>
+                                    {{ props.row.itemFk }}
+                                    <ItemDescriptorProxy :id="props.row.itemFk" />
+                                </QBtn>
+                            </QTd>
                             <QTd>{{ props.row.visible }}</QTd>
                             <QTd>{{ props.row.available }}</QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
-                            <QTd>
-                                <div class="fetched-tags">
-                                    <span>{{ props.row.item.name }}</span>
-                                    <span v-if="props.row.item.subName" class="subName">{{
-                                        props.row.item.subName
-                                    }}</span>
+                            <QTd class="description-cell">
+                                <div class="row full-width justify-between">
+                                    {{ props.row.item.name }}
+                                    <div v-if="props.row.item.subName" class="subName">
+                                        {{ props.row.item.subName.toUpperCase() }}
+                                    </div>
                                 </div>
-                                <fetched-tags
+                                <FetchedTags
+                                    class="fetched-tags"
                                     :item="props.row.item"
                                     :max-length="5"
-                                ></fetched-tags>
+                                ></FetchedTags>
                             </QTd>
-                            <QTd>{{ props.row.price }}</QTd>
+                            <QTd>{{ props.row.price }} €</QTd>
                             <QTd>{{ props.row.discount }} %</QTd>
                             <QTd
                                 >{{
@@ -453,4 +463,28 @@ async function changeState(value) {
         padding: 1%;
     }
 }
+.q-table {
+    tr,
+    th,
+    .q-td {
+        border-bottom: 1px solid black;
+    }
+}
+
+.subName {
+    margin-left: 10%;
+}
+
+.tr-header,
+.subName {
+    color: var(--vn-label-color);
+}
+
+.description-cell {
+    width: 25%;
+}
+
+.fetched-tags {
+    max-width: 70%;
+}
 </style>
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index f8c03a609..f4e97c239 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -29,75 +29,56 @@ const agenciesOptions = ref([]);
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.ref"
-                        :label="t('travel.basicData.reference')"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('travel.basicData.agency')"
-                        v-model="data.agencyModeFk"
-                        :options="agenciesOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                    />
-                </div>
+                <VnInput v-model="data.ref" :label="t('travel.basicData.reference')" />
+                <VnSelect
+                    :label="t('travel.basicData.agency')"
+                    v-model="data.agencyModeFk"
+                    :options="agenciesOptions"
+                    option-value="id"
+                    option-label="name"
+                    map-options
+                    hide-selected
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInputDate
-                        v-model="data.shipped"
-                        :label="t('travel.basicData.shipped')"
-                    />
-                </div>
-                <div class="col">
-                    <VnInputDate
-                        v-model="data.landed"
-                        :label="t('travel.basicData.landed')"
-                    />
-                </div>
+                <VnInputDate
+                    v-model="data.shipped"
+                    :label="t('travel.basicData.shipped')"
+                />
+                <VnInputDate
+                    v-model="data.landed"
+                    :label="t('travel.basicData.landed')"
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('travel.basicData.warehouseOut')"
-                        v-model="data.warehouseOutFk"
-                        :options="agenciesOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                    />
-                </div>
-                <div class="col">
-                    <VnSelect
-                        :label="t('travel.basicData.warehouseIn')"
-                        v-model="data.warehouseInFk"
-                        :options="agenciesOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                    />
-                </div>
+                <VnSelect
+                    :label="t('travel.basicData.warehouseOut')"
+                    v-model="data.warehouseOutFk"
+                    :options="agenciesOptions"
+                    option-value="id"
+                    option-label="name"
+                    map-options
+                    hide-selected
+                />
+                <VnSelect
+                    :label="t('travel.basicData.warehouseIn')"
+                    v-model="data.warehouseInFk"
+                    :options="agenciesOptions"
+                    option-value="id"
+                    option-label="name"
+                    map-options
+                    hide-selected
+                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        :label="t('travel.basicData.delivered')"
-                        v-model="data.isDelivered"
-                    />
-                </div>
-                <div class="col">
-                    <QCheckbox
-                        :label="t('travel.basicData.received')"
-                        v-model="data.isReceived"
-                    />
-                </div>
+                <QCheckbox
+                    :label="t('travel.basicData.delivered')"
+                    v-model="data.isDelivered"
+                />
+                <QCheckbox
+                    :label="t('travel.basicData.received')"
+                    v-model="data.isReceived"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 3464a29b3..33b56e745 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -236,104 +236,88 @@ const onThermographCreated = async (data) => {
             </Teleport>
             <QCard class="q-pa-lg">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelectDialog
-                            :label="t('travel.thermographs.thermograph')"
-                            v-model="thermographForm.thermographId"
-                            :options="thermographsOptions"
-                            option-value="thermographFk"
-                            option-label="thermographFk"
-                            :disable="viewAction === 'edit'"
-                            :tooltip="t('New thermograph')"
-                        >
-                            <template #form>
-                                <CreateThermographForm
-                                    @on-data-saved="onThermographCreated($event, data)"
-                                />
-                            </template>
-                        </VnSelectDialog>
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="thermographForm.state"
-                            :label="t('travel.thermographs.state')"
-                        />
-                    </div>
+                    <VnSelectDialog
+                        :label="t('travel.thermographs.thermograph')"
+                        v-model="thermographForm.thermographId"
+                        :options="thermographsOptions"
+                        option-value="thermographFk"
+                        option-label="thermographFk"
+                        :disable="viewAction === 'edit'"
+                        :tooltip="t('New thermograph')"
+                    >
+                        <template #form>
+                            <CreateThermographForm
+                                @on-data-saved="onThermographCreated($event, data)"
+                            />
+                        </template>
+                    </VnSelectDialog>
+                    <VnInput
+                        v-model="thermographForm.state"
+                        :label="t('travel.thermographs.state')"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="thermographForm.reference"
-                            :label="t('travel.thermographs.reference')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('travel.thermographs.type')"
-                            v-model="thermographForm.dmsTypeId"
-                            :options="dmsTypesOptions"
-                            option-value="id"
-                            option-label="name"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="thermographForm.reference"
+                        :label="t('travel.thermographs.reference')"
+                    />
+                    <VnSelect
+                        :label="t('travel.thermographs.type')"
+                        v-model="thermographForm.dmsTypeId"
+                        :options="dmsTypesOptions"
+                        option-value="id"
+                        option-label="name"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('travel.thermographs.company')"
-                            v-model="thermographForm.companyId"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('travel.thermographs.warehouse')"
-                            v-model="thermographForm.warehouseId"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                        />
-                    </div>
+                    <VnSelect
+                        :label="t('travel.thermographs.company')"
+                        v-model="thermographForm.companyId"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                    />
+                    <VnSelect
+                        :label="t('travel.thermographs.warehouse')"
+                        v-model="thermographForm.warehouseId"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                    />
                 </VnRow>
                 <VnRow v-if="viewAction === 'edit'" class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QInput
-                            :label="t('globals.description')"
-                            type="textarea"
-                            v-model="thermographForm.description"
-                            fill-input
-                        />
-                    </div>
+                    <QInput
+                        :label="t('globals.description')"
+                        type="textarea"
+                        v-model="thermographForm.description"
+                        fill-input
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QFile
-                            ref="inputFileRef"
-                            :label="t('travel.thermographs.file')"
-                            multiple
-                            :accept="allowedContentTypes"
-                            v-model="thermographForm.files"
-                        >
-                            <template #append>
-                                <QIcon
-                                    name="vn:attach"
-                                    class="cursor-pointer q-mr-sm"
-                                    @click="inputFileRef.pickFiles()"
-                                >
-                                    <QTooltip>{{ t('Select files') }}</QTooltip>
-                                </QIcon>
-                                <QIcon name="info" class="cursor-pointer">
-                                    <QTooltip>{{
-                                        t('globals.allowedFilesText', {
-                                            allowedContentTypes: allowedContentTypes,
-                                        })
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </QFile>
-                    </div>
+                    <QFile
+                        ref="inputFileRef"
+                        :label="t('travel.thermographs.file')"
+                        multiple
+                        :accept="allowedContentTypes"
+                        v-model="thermographForm.files"
+                    >
+                        <template #append>
+                            <QIcon
+                                name="vn:attach"
+                                class="cursor-pointer q-mr-sm"
+                                @click="inputFileRef.pickFiles()"
+                            >
+                                <QTooltip>{{ t('Select files') }}</QTooltip>
+                            </QIcon>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip>{{
+                                    t('globals.allowedFilesText', {
+                                        allowedContentTypes: allowedContentTypes,
+                                    })
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QFile>
                 </VnRow>
             </QCard>
         </QForm>
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index c8c26684c..53c8d402d 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -68,52 +68,37 @@ const redirectToTravelBasicData = (_, { id }) => {
         >
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput v-model="data.ref" :label="t('globals.reference')" />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('globals.agency')"
-                            v-model="data.agencyModeFk"
-                            :options="agenciesOptions"
-                            option-value="agencyFk"
-                            option-label="name"
-                            hide-selected
-                        />
-                    </div>
+                    <VnInput v-model="data.ref" :label="t('globals.reference')" />
+                    <VnSelect
+                        :label="t('globals.agency')"
+                        v-model="data.agencyModeFk"
+                        :options="agenciesOptions"
+                        option-value="agencyFk"
+                        option-label="name"
+                        hide-selected
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInputDate
-                            v-model="data.shipped"
-                            :label="t('globals.shipped')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInputDate :label="t('globals.landed')" v-model="data.landed" />
-                    </div>
+                    <VnInputDate v-model="data.shipped" :label="t('globals.shipped')" />
+                    <VnInputDate :label="t('globals.landed')" v-model="data.landed" />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('globals.wareHouseOut')"
-                            v-model="data.warehouseOutFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('globals.wareHouseIn')"
-                            v-model="data.warehouseInFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                        />
-                    </div>
+                    <VnSelect
+                        :label="t('globals.wareHouseOut')"
+                        v-model="data.warehouseOutFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                    />
+                    <VnSelect
+                        :label="t('globals.wareHouseIn')"
+                        v-model="data.warehouseInFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                    />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 43e0db3eb..77f7ec112 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 23f56e4c3..3ecca1ea3 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -6,7 +6,6 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonTypeList');
diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
index cf6bc3ff2..411c36632 100644
--- a/src/pages/Wagon/WagonCreate.vue
+++ b/src/pages/Wagon/WagonCreate.vue
@@ -92,71 +92,63 @@ function filterType(val, update) {
         <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
             <QCard class="q-pa-md">
                 <div class="row q-col-gutter-md">
-                    <div class="col">
-                        <QInput
-                            filled
-                            v-model="wagon.label"
-                            :label="t('wagon.create.label')"
-                            type="number"
-                            min="0"
-                            :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            filled
-                            v-model="wagon.plate"
-                            :label="t('wagon.create.plate')"
-                            :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
-                        />
-                    </div>
+                    <QInput
+                        filled
+                        v-model="wagon.label"
+                        :label="t('wagon.create.label')"
+                        type="number"
+                        min="0"
+                        :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
+                    />
+                    <VnInput
+                        filled
+                        v-model="wagon.plate"
+                        :label="t('wagon.create.plate')"
+                        :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
+                    />
                 </div>
                 <div class="row q-col-gutter-md">
-                    <div class="col">
-                        <QInput
-                            filled
-                            v-model="wagon.volume"
-                            :label="t('wagon.create.volume')"
-                            type="number"
-                            min="0"
-                            :rules="[
-                                (val) => !!val || t('wagon.warnings.volumeNotEmpty'),
-                            ]"
-                        />
-                    </div>
-                    <div class="col">
-                        <QSelect
-                            filled
-                            v-model="wagon.typeFk"
-                            use-input
-                            fill-input
-                            hide-selected
-                            input-debounce="0"
-                            option-label="name"
-                            option-value="id"
-                            emit-value
-                            map-options
-                            :label="t('wagon.create.type')"
-                            :options="filteredWagonTypes"
-                            :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
-                            @filter="filterType"
-                        >
-                            <template v-if="wagon.typeFk" #append>
-                                <QIcon
-                                    name="cancel"
-                                    @click.stop.prevent="wagon.typeFk = null"
-                                    class="cursor-pointer"
-                                />
-                            </template>
-                            <template #no-option>
-                                <QItem>
-                                    <QItemSection class="text-grey">
-                                        {{ t('wagon.warnings.noData') }}
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </QSelect>
-                    </div>
+                    <QInput
+                        filled
+                        v-model="wagon.volume"
+                        :label="t('wagon.create.volume')"
+                        type="number"
+                        min="0"
+                        :rules="[
+                            (val) => !!val || t('wagon.warnings.volumeNotEmpty'),
+                        ]"
+                    />
+                    <QSelect
+                        filled
+                        v-model="wagon.typeFk"
+                        use-input
+                        fill-input
+                        hide-selected
+                        input-debounce="0"
+                        option-label="name"
+                        option-value="id"
+                        emit-value
+                        map-options
+                        :label="t('wagon.create.type')"
+                        :options="filteredWagonTypes"
+                        :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
+                        @filter="filterType"
+                    >
+                        <template v-if="wagon.typeFk" #append>
+                            <QIcon
+                                name="cancel"
+                                @click.stop.prevent="wagon.typeFk = null"
+                                class="cursor-pointer"
+                            />
+                        </template>
+                        <template #no-option>
+                            <QItem>
+                                <QItemSection class="text-grey">
+                                    {{ t('wagon.warnings.noData') }}
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </QSelect>
                 </div>
             </QCard>
             <div class="q-mt-md">
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 4f1786a67..4ff5c9b2f 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
+import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -35,8 +35,8 @@ const workersFilter = {
     limit: 30,
 };
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
-    order: 'country ASC',
+    fields: ['id', 'name', 'code'],
+    order: 'name ASC',
     limit: 30,
 };
 const educationLevelsFilter = { fields: ['id', 'name'], order: 'name ASC', limit: 30 };
@@ -74,12 +74,11 @@ const maritalStatus = [
         model="Worker"
     >
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput :label="t('Name')" clearable v-model="data.firstName" />
                 <VnInput :label="t('Last name')" clearable v-model="data.lastName" />
             </VnRow>
-
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput v-model="data.phone" :label="t('Business phone')" clearable />
                 <VnInput
                     v-model="data.mobileExtension"
@@ -88,7 +87,7 @@ const maritalStatus = [
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Boss')"
                     :options="workersOptions"
@@ -119,12 +118,12 @@ const maritalStatus = [
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Origin country')"
                     :options="countriesOptions"
                     hide-selected
-                    option-label="country"
+                    option-label="name"
                     option-value="id"
                     v-model="data.originCountryFk"
                 />
@@ -138,7 +137,7 @@ const maritalStatus = [
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput v-model="data.SSN" :label="t('SSN')" clearable />
                 <VnInput
                     v-model="data.locker"
@@ -147,6 +146,36 @@ const maritalStatus = [
                     clearable
                 />
             </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('fiDueDate')" v-model="data.fiDueDate" />
+
+                <VnInput v-model="data.sex" :label="t('sex')" clearable />
+            </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('seniority')" v-model="data.seniority" />
+                <VnInput v-model="data.fi" :label="t('fi')" />
+            </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('birth')" v-model="data.birth" />
+            </VnRow>
+            <VnRow>
+                <QCheckbox
+                    size="sm"
+                    :label="t('isFreelance')"
+                    v-model="data.isFreelance"
+                />
+                <QCheckbox
+                    size="sm"
+                    v-model="data.isSsDiscounted"
+                    :label="t(`isSsDiscounted`)"
+                />
+                <QCheckbox
+                    size="sm"
+                    v-model="data.hasMachineryAuthorized"
+                    :label="t(`hasMachineryAuthorized`)"
+                />
+                <QCheckbox size="sm" v-model="data.isDisable" :label="t(`isDisable`)" />
+            </VnRow>
         </template>
     </FormModel>
 </template>
@@ -165,4 +194,13 @@ es:
     Education level: Nivel educación
     SSN: NSS
     Locker: Taquilla
+    fiDueDate: Fecha de caducidad del DNI
+    seniority: Antigüedad
+    hasMachineryAuthorized: Autorizado para llevar maquinaria
+    isFreelance: Autónomo
+    isDisable: Trabajador desactivado
+    fi: DNI/NIE/NIF
+    sex: Sexo
+    birth: Cumpleaños
+    isSsDiscounted: Bonificación SS
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index d76ef6f59..fb9ab9666 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import WorkerDescriptor from './WorkerDescriptor.vue';
+import WorkerFilter from '../WorkerFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Worker"
         base-url="Workers"
         :descriptor="WorkerDescriptor"
-        searchbar-data-key="WorkerList"
-        searchbar-url="Workers/filter"
+        :filter-panel="WorkerFilter"
+        search-data-key="WorkerList"
+        search-url="Workers/filter"
         searchbar-label="Search worker"
         searchbar-info="You can search by worker id or name"
     />
diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue
new file mode 100644
index 000000000..171074b20
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerLocker.vue
@@ -0,0 +1,64 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import { useRole } from 'src/composables/useRole';
+import FormModel from 'components/FormModel.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+import FetchData from 'components/FetchData.vue';
+
+const { hasAny } = useRole();
+const { t } = useI18n();
+const fetchData = ref();
+const originaLockerId = ref();
+const lockers = ref([]);
+const { store } = useArrayData('Worker');
+const entityId = computed(() => useRoute().params.id);
+const filter = computed(() => ({
+    where: {
+        gender: store.data?.sex,
+        or: [{ workerFk: null }, { workerFk: entityId.value }],
+    },
+}));
+
+const save = async (data) => {
+    const lockerId = data.id ?? originaLockerId.value;
+    const workerFk = lockerId == originaLockerId.value ? null : entityId.value;
+
+    await axios.patch(`Lockers/${lockerId}`, { workerFk });
+};
+
+const init = async (data) => {
+    await fetchData.value.fetch();
+    originaLockerId.value = data.id;
+};
+</script>
+<template>
+    <FetchData
+        ref="fetchData"
+        url="Lockers/codes"
+        :filter="filter"
+        @on-fetch="(data) => (lockers = data)"
+    />
+    <FormModel
+        :url="`Workers/${entityId}/locker`"
+        model="worker"
+        auto-load
+        :save-fn="save"
+        @on-fetch="init"
+    >
+        <template #form="{ data }">
+            <VnSelect
+                :label="t('Locker')"
+                v-model="data.id"
+                :options="lockers"
+                option-label="code"
+                option-value="id"
+                hide-selected
+                :readonly="!hasAny(['productionBoss', 'hr'])"
+            />
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Worker/Card/WorkerPBX.vue b/src/pages/Worker/Card/WorkerPBX.vue
index 681194061..3bba5b33e 100644
--- a/src/pages/Worker/Card/WorkerPBX.vue
+++ b/src/pages/Worker/Card/WorkerPBX.vue
@@ -57,13 +57,11 @@ const updateModelValue = (data) => {
     >
         <template #form="{}">
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        :label="t('worker.summary.sipExtension')"
-                        v-model="extension"
-                        @update:model-value="updateModelValue"
-                    />
-                </div>
+                <VnInput
+                    :label="t('worker.summary.sipExtension')"
+                    v-model="extension"
+                    @update:model-value="updateModelValue"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 5e7c89326..976469476 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -1,140 +1,212 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { onMounted, ref, computed } from 'vue';
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import useNotify from 'src/composables/useNotify.js';
-import axios from 'axios';
-import { useRole } from 'src/composables/useRole';
+import { ref, computed } from 'vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
-const route = useRoute();
 const { t } = useI18n();
 const { notify } = useNotify();
-const { hasAny } = useRole();
 
-const fetchCurrentDeviceRef = ref(null);
-const deviceProductionsFilter = {
-    fields: ['id', 'serialNumber', 'modelFk'],
-    where: { stateFk: 'idle' },
-    order: 'id',
-};
-const deviceProductionsOptions = ref([]);
-const newPDA = ref({});
-const currentPDA = ref(null);
+const paginate = ref();
+const dialog = ref();
+const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
+const routeId = computed(() => route.params.id);
 
-const isAllowedToEdit = computed(() => hasAny(['hr', 'productionAssi']));
+const initialData = computed(() => {
+    return {
+        userFk: routeId.value,
+        deviceProductionFk: null,
+        simSerialNumber: null,
+    };
+});
 
-const setCurrentPDA = (data) => {
-    currentPDA.value = data;
-    currentPDA.value.description = `ID: ${currentPDA.value.deviceProductionFk} ${t(
-        'worker.pda.model'
-    )}: ${currentPDA.value.deviceProduction.modelFk} ${t('worker.pda.serialNumber')}: ${
-        currentPDA.value.deviceProduction.serialNumber
-    }`;
-};
-
-const deallocatePDA = async (data) => {
+const deallocatePDA = async (deviceProductionFk) => {
     try {
         await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
-            pda: currentPDA.value.deviceProductionFk,
+            pda: deviceProductionFk,
         });
-        data.pda = null;
-        currentPDA.value = null;
-        await fetchCurrentDeviceRef.value.fetch();
         notify(t('PDA deallocated'), 'positive');
     } catch (err) {
         console.error('Error deallocating PDA');
     }
+    paginate.value.fetch();
 };
 
-onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
+function reloadData() {
+    initialData.value.deviceProductionFk = null;
+    initialData.value.simSerialNumber = null;
+    paginate.value.fetch();
+}
 </script>
 
 <template>
-    <FetchData
-        url="DeviceProductions"
-        :filter="deviceProductionsFilter"
-        auto-load
-        @on-fetch="(data) => (deviceProductionsOptions = data)"
-    />
-    <FetchData
-        ref="fetchCurrentDeviceRef"
-        url="DeviceProductionUsers"
-        :filter="{
-            where: { userFk: route.params.id },
-            include: { relation: 'deviceProduction' },
-        }"
-        auto-load
-        @on-fetch="(data) => setCurrentPDA(data[0])"
-    />
-    <QPage class="column items-center q-pa-md">
-        <FormModel
-            url="DeviceProductionUsers"
-            :url-create="`Workers/${route.params.id}/allocatePDA`"
-            model="DeviceProductionUser"
-            :form-initial-data="newPDA"
+    <QPage class="column items-center q-pa-md centerCard">
+        <FetchData
+            url="workers/getAvailablePda"
+            @on-fetch="(data) => (deviceProductions = data)"
+            auto-load
+        />
+        <VnPaginate
+            ref="paginate"
+            data-key="WorkerPda"
+            url="DeviceProductionUsers"
+            :filter="{ where: { userFk: routeId } }"
+            order="id"
             auto-load
-            :default-buttons="{ save: { label: 'globals.assign', color: 'primary' } }"
-            @on-data-saved="(_, data) => setCurrentPDA(data)"
         >
-            <template #form="{ data }">
-                <QField
-                    v-if="currentPDA && currentPDA.description"
-                    :label="t('worker.pda.currentPDA')"
-                    :model-value="currentPDA.description"
-                    :editable="false"
-                    class="full-width"
+            <template #body="{ rows }">
+                <QCard
+                    flat
+                    bordered
+                    :key="row.id"
+                    v-for="row of rows"
+                    class="card q-pt-xs q-mb-sm"
                 >
-                    <template #control>
-                        <div tabindex="0">
-                            {{ currentPDA.description }}
-                        </div>
-                    </template>
-                    <template v-if="isAllowedToEdit" #append>
-                        <QIcon
-                            name="delete"
-                            size="sm"
-                            class="cursor-pointer"
-                            color="primary"
-                            @click="deallocatePDA(data)"
-                        >
-                            <QTooltip>
-                                {{ t('worker.pda.removePDA') }}
-                            </QTooltip>
-                        </QIcon>
-                    </template>
-                </QField>
-
-                <VnSelect
-                    v-else
-                    :label="t('worker.pda.newPDA')"
-                    v-model="data.pda"
-                    :options="deviceProductionsOptions"
-                    option-label="serialNumber"
-                    option-value="id"
-                    hide-selected
-                    :disable="!isAllowedToEdit"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>ID: {{ scope.opt?.id }}</QItemLabel>
-                                <QItemLabel caption>
-                                    {{ scope.opt?.modelFk }},
-                                    {{ scope.opt?.serialNumber }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                    <QItem>
+                        <QItemSection side-left>
+                            <VnRow>
+                                <QField
+                                    :label="t('worker.pda.currentPDA')"
+                                    :model-value="row?.deviceProductionFk"
+                                    disable
+                                >
+                                    <template #control>
+                                        <div tabindex="0" style="padding: none">
+                                            <span>Id: </span>
+                                            <span>
+                                                {{ row?.deviceProductionFk }}&nbsp;
+                                            </span>
+                                            <span>{{ t('Model') }}: </span>
+                                            <span>
+                                                {{ row?.deviceProduction?.modelFk }}&nbsp;
+                                            </span>
+                                            <span>{{ t('SIM serial number') }}: </span>
+                                            <span>
+                                                {{
+                                                    row?.deviceProduction?.serialNumber
+                                                }}&nbsp;
+                                            </span>
+                                        </div>
+                                    </template>
+                                </QField>
+                                <QField
+                                    :label="t('Current SIM')"
+                                    :model-value="row?.simSerialNumber"
+                                    disable
+                                >
+                                    <template #control>
+                                        <div tabindex="0">{{ row?.simSerialNumber }}</div>
+                                    </template>
+                                </QField>
+                            </VnRow>
+                        </QItemSection>
+                        <QItemSection side>
+                            <QIcon
+                                name="delete"
+                                size="sm"
+                                class="cursor-pointer"
+                                color="primary"
+                                @click="
+                                    openConfirmationModal(
+                                        t(`Remove PDA`),
+                                        t('Do you want to remove this PDA?'),
+                                        () => deallocatePDA(row.deviceProductionFk)
+                                    )
+                                "
+                            >
+                                <QTooltip>
+                                    {{ t('worker.pda.removePDA') }}
+                                </QTooltip>
+                            </QIcon>
+                        </QItemSection>
+                    </QItem>
+                </QCard>
             </template>
-        </FormModel>
+        </VnPaginate>
+        <QPageSticky :offset="[18, 18]">
+            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+                <QDialog ref="dialog">
+                    <FormModelPopup
+                        :title="t('Add new device')"
+                        url-create="DeviceProductionUsers"
+                        model="DeviceProductionUser"
+                        :form-initial-data="initialData"
+                        @on-data-saved="reloadData()"
+                    >
+                        <template #form-inputs="{ data }">
+                            <VnRow class="row q-gutter-md q-mb-md">
+                                <VnSelect
+                                    :label="t('worker.pda.newPDA')"
+                                    v-model="data.deviceProductionFk"
+                                    :options="deviceProductions"
+                                    option-label="id"
+                                    option-value="id"
+                                    id="deviceProductionFk"
+                                    hide-selected
+                                >
+                                    <template #option="scope">
+                                        <QItem v-bind="scope.itemProps">
+                                            <QItemSection>
+                                                <QItemLabel
+                                                    >ID: {{ scope.opt?.id }}</QItemLabel
+                                                >
+                                                <QItemLabel caption>
+                                                    {{ scope.opt?.modelFk }},
+                                                    {{ scope.opt?.serialNumber }}
+                                                </QItemLabel>
+                                            </QItemSection>
+                                        </QItem>
+                                    </template>
+                                </VnSelect>
+                                <VnInput
+                                    v-model="data.simSerialNumber"
+                                    :label="t('SIM serial number')"
+                                    id="simSerialNumber"
+                                    use-input
+                                />
+                            </VnRow>
+                        </template>
+                    </FormModelPopup>
+                </QDialog>
+            </QBtn>
+            <QTooltip>
+                {{ t('globals.new') }}
+            </QTooltip>
+        </QPageSticky>
     </QPage>
 </template>
-
+<style lang="scss" scoped>
+.centerCard {
+    padding: 5%;
+    width: 100%;
+    max-width: 70%;
+    margin: 0 auto;
+}
+.label {
+    color: red;
+}
+.q-field {
+    height: 65px;
+}
+</style>
 <i18n>
 es:
+    Remove PDA: Eliminar PDA
+    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
     PDA deallocated: PDA desasignada
+    SIM serial number: Número de serie de la SIM
+    Model: Modelo
+    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+    Add new device: Añadir nuevo dispositivo
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 5b25fe335..129e0ce8c 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -2,7 +2,7 @@
 import { ref, onMounted, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { dashIfEmpty } from 'src/filters';
+import { dashIfEmpty, toDate } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
@@ -111,6 +111,47 @@ const filter = {
                 </VnLv>
                 <VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
             </QCard>
+            <QCard class="vn-one">
+                <VnTitle
+                    :url="workerUrl + `basic-data`"
+                    :text="t('worker.summary.basicData')"
+                />
+                <VnLv
+                    :label="t('worker.summary.fiDueDate')"
+                    :value="toDate(worker.fiDueDate)"
+                />
+                <VnLv :label="t('worker.summary.sex')" :value="worker.sex" />
+                <VnLv
+                    :label="t('worker.summary.seniority')"
+                    :value="toDate(worker.seniority)"
+                />
+                <VnLv :label="t('worker.summary.fi')" :value="worker.fi" />
+                <VnLv :label="t('worker.summary.birth')" :value="toDate(worker.birth)" />
+                <QCheckbox
+                    class="padding-none"
+                    :label="t('worker.summary.isFreelance')"
+                    v-model="worker.isFreelance"
+                    :disable="true"
+                />
+                <QCheckbox
+                    class="padding-none"
+                    :label="t('worker.summary.isSsDiscounted')"
+                    v-model="worker.isSsDiscounted"
+                    :disable="true"
+                />
+                <QCheckbox
+                    class="padding-none"
+                    :label="t('worker.summary.hasMachineryAuthorized')"
+                    v-model="worker.hasMachineryAuthorized"
+                    :disable="true"
+                />
+                <QCheckbox
+                    class="padding-none"
+                    :label="t('worker.summary.isDisable')"
+                    v-model="worker.isDisable"
+                    :disable="true"
+                />
+            </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('worker.summary.userData')" />
                 <VnLv :label="t('worker.summary.userId')" :value="worker.user.id" />
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 6c2c9f36e..9d962e450 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -9,7 +9,6 @@ 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 CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.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';
@@ -57,7 +56,7 @@ const onBankEntityCreated = (data) => {
 };
 
 function handleLocation(data, location) {
-    const { town, postcode: code, provinceFk, countryFk } = location ?? {};
+    const { town, code, provinceFk, countryFk } = location ?? {};
     data.postcode = code;
     data.city = town;
     data.provinceFk = provinceFk;
@@ -108,155 +107,122 @@ onMounted(async () => {
         >
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.firstName"
-                            :label="t('worker.create.name')"
-                            :rules="validate('Worker.firstName')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.lastNames"
-                            :label="t('worker.create.lastName')"
-                            :rules="validate('Worker.lastNames')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInputDate
-                            v-model="data.birth"
-                            :label="t('worker.create.birth')"
-                            :rules="validate('Worker.birth')"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.firstName"
+                        :label="t('worker.create.name')"
+                        :rules="validate('Worker.firstName')"
+                    />
+                    <VnInput
+                        v-model="data.lastNames"
+                        :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">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.fi"
-                            :label="t('worker.create.fi')"
-                            :rules="validate('Worker.fi')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.code"
-                            :label="t('worker.create.code')"
-                            :rules="validate('Worker.code')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.phone"
-                            :label="t('worker.create.phone')"
-                            :rules="validate('Worker.phone')"
-                        />
-                    </div>
+                    <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">
-                    <div class="col">
-                        <VnLocation
-                            :rules="validate('Worker.postcode')"
-                            :roles-allowed-to-create="['deliveryAssistant']"
-                            :options="postcodesOptions"
-                            v-model="data.location"
-                            @update:model-value="
-                                (location) => handleLocation(data, location)
-                            "
-                        >
-                        </VnLocation>
-                    </div>
+                    <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">
-                    <div class="col">
-                        <VnInput
-                            :label="t('worker.create.street')"
-                            v-model="data.street"
-                            :rules="validate('Worker.street')"
-                        />
-                    </div>
+                    <VnInput
+                        :label="t('worker.create.street')"
+                        v-model="data.street"
+                        :rules="validate('Worker.street')"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.name"
-                            :label="t('worker.create.webUser')"
-                            :rules="validate('Worker.name')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.email"
-                            :label="t('worker.create.personalEmail')"
-                            :rules="validate('Worker.email')"
-                        />
-                    </div>
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('worker.create.webUser')"
+                        :rules="validate('Worker.name')"
+                    />
+                    <VnInput
+                        v-model="data.email"
+                        :label="t('worker.create.personalEmail')"
+                        :rules="validate('Worker.email')"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('worker.create.company')"
-                            v-model="data.companyFk"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                            hide-selected
-                            :rules="validate('Worker.company')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('worker.create.boss')"
-                            v-model="data.bossFk"
-                            :options="workersOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            :rules="validate('Worker.boss')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                        <QItemLabel caption
-                                            >{{ scope.opt.nickname }},
-                                            {{ scope.opt.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
+                    <VnSelect
+                        :label="t('worker.create.company')"
+                        v-model="data.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        hide-selected
+                        :rules="validate('Worker.company')"
+                    />
+                    <VnSelect
+                        :label="t('worker.create.boss')"
+                        v-model="data.bossFk"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        :rules="validate('Worker.boss')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt.nickname }},
+                                        {{ scope.opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('worker.create.payMethods')"
-                            v-model="data.payMethodFk"
-                            :options="payMethodsOptions"
-                            option-value="id"
-                            option-label="name"
-                            map-options
-                            hide-selected
-                            :rules="validate('Worker.payMethodFk')"
-                        />
-                    </div>
-
-                    <div class="col">
-                        <VnInput
-                            v-model="data.iban"
-                            :label="t('worker.create.iban')"
-                            :rules="validate('Worker.iban')"
-                        >
-                            <template #append>
-                                <QIcon name="info" class="cursor-info">
-                                    <QTooltip>{{
-                                        t('components.iban_tooltip')
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </VnInput>
-                    </div>
+                    <VnSelect
+                        :label="t('worker.create.payMethods')"
+                        v-model="data.payMethodFk"
+                        :options="payMethodsOptions"
+                        option-value="id"
+                        option-label="name"
+                        map-options
+                        hide-selected
+                        :rules="validate('Worker.payMethodFk')"
+                    />
+                    <VnInput
+                        v-model="data.iban"
+                        :label="t('worker.create.iban')"
+                        :rules="validate('Worker.iban')"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </VnInput>
                     <VnSelectDialog
                         :label="t('worker.create.bankEntity')"
                         v-model="data.bankEntityFk"
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 86dd9d0d9..a960dffe6 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -1,2 +1,3 @@
 Search worker: Buscar trabajador
 You can search by worker id or name: Puedes buscar por id o nombre del trabajador
+Locker: Taquilla
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 5d57b920e..7a2c505fa 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -1,34 +1,24 @@
 <script setup>
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
+import { ref } from 'vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { QCheckbox } from 'quasar';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-const zoneFilter = {
-    include: [
-        {
-            relation: 'agency',
-            scope: {
-                fields: ['name'],
-                include: { relation: 'agencyModeFk', scope: { fields: ['id'] } },
-            },
-        },
-        { relation: 'sip', scope: { fields: ['extension', 'secret'] } },
-        { relation: 'department', scope: { include: { relation: 'department' } } },
-        { relation: 'client', scope: { fields: ['phone'] } },
-    ],
-};
+
 const agencyFilter = {
     fields: ['id', 'name'],
     order: 'name ASC',
     limit: 30,
 };
+const agencyOptions = ref([]);
 </script>
 
 <template>
@@ -36,58 +26,90 @@ const agencyFilter = {
         :filter="agencyFilter"
         @on-fetch="(data) => (agencyOptions = data)"
         auto-load
-        url="agencies"
-    />
-    <FetchData
-        :filter="zoneFilter"
-        @on-fetch="(data) => (zoneOptions = data)"
-        auto-load
-        url="zones"
+        url="AgencyModes/isActive"
     />
 
-    <FormModel
-        :filter="zoneFilter"
-        :url="`zone/${route.params.id}/basic-data`"
-        auto-load
-        model="Zone"
-    >
-        <template #form="{ data }">
+    <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">
+        <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput :label="t('Name')" clearable v-model="data.zone.name" />
+                <VnInput :label="t('Name')" clearable v-model="data.name" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.agency.name" :label="t('Agency')" clearable />
-                <VnInput v-model="data.zone.itemMaxSize" :label="t('Max m³')" clearable />
-                <VnInput v-model="data.zone.m3Max" :label="t('Maximum m³')" clearable />
+                <VnSelect
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.agencyModeFk"
+                    :rules="validate('zone.agencyModeFk')"
+                    :options="agencyOptions"
+                    :label="t('Agency')"
+                    emit-value
+                    map-options
+                    use-input
+                    hide-bottom-space
+                />
+                <VnInput
+                    class="mw-10"
+                    v-model="data.itemMaxSize"
+                    :label="t('Max m³')"
+                    clearable
+                    type="number"
+                    min="0"
+                />
+                <VnInput
+                    class="mw-10"
+                    v-model="data.m3Max"
+                    :label="t('Maximum m³')"
+                    clearable
+                    type="number"
+                    min="0"
+                />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
-                    v-model="data.zone.travelingDays"
+                    v-model="data.travelingDays"
                     :label="t('Traveling days')"
                     clearable
+                    type="number"
+                    min="0"
                 />
-                <VnInput v-model="data.zone.hour" :label="t('Closing')" clearable />
-            </VnRow>
-
-            <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.zone.price" :label="t('Price')" clearable />
-                <VnInput v-model="data.zone.bonus" :label="t('Bonus')" clearable />
+                <VnInputTime v-model="data.hour" :label="t('Closing')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
-                    v-model="data.zone.inflation"
-                    :label="t('Inflation')"
+                    v-model="data.price"
+                    :label="t('Price')"
+                    type="number"
+                    min="0"
                     clearable
                 />
-                <QCheckbox v-model="data.zone.isVolumetric" :label="t('Volumetric')" />
+                <VnInput
+                    v-model="data.bonus"
+                    :label="t('Bonus')"
+                    type="number"
+                    min="0"
+                    clearable
+                />
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput v-model="data.inflation" :label="t('Inflation')" clearable />
+                <QCheckbox
+                    v-model="data.isVolumetric"
+                    :label="t('Volumetric')"
+                    :toggle-indeterminate="false"
+                />
             </VnRow>
         </template>
     </FormModel>
 </template>
-
+<style lang="scss" scoped>
+.mw-10 {
+    max-width: 10vw;
+}
+</style>
 <i18n>
 es:
     Name: Nombre
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 948636c55..6451fe00c 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -1,6 +1,42 @@
 <script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
+
 import VnCard from 'components/common/VnCard.vue';
+import ZoneDescriptor from './ZoneDescriptor.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const searchBarDataKeys = {
+    ZoneWarehouses: 'ZoneWarehouses',
+    ZoneSummary: 'ZoneSummary',
+};
 </script>
 <template>
-    <VnCard data-key="Zone" base-url="Zones" />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                :data-key="searchBarDataKeys[routeName]"
+                :custom-route-redirect-name="routeName"
+                :label="t('list.searchZone')"
+                :info="t('list.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <VnCard
+        data-key="Zone"
+        base-url="Zones"
+        :descriptor="ZoneDescriptor"
+        searchbar-data-key="ZoneList"
+        searchbar-url="Zones/filter"
+        searchbar-label="Search zones"
+        searchbar-info="You can search by zone reference"
+    />
 </template>
diff --git a/src/pages/Zone/Card/ZoneCreateWarehouse.vue b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
new file mode 100644
index 000000000..0f35ee679
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
@@ -0,0 +1,47 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'components/FormPopup.vue';
+
+const emit = defineEmits(['onSubmitCreateWarehouse']);
+const { t } = useI18n();
+
+const ZoneWarehouseFormData = reactive({
+    warehouseFk: null,
+});
+
+const warehousesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="Warehouses"
+        :filter="{ order: 'name' }"
+        auto-load
+        @on-fetch="(data) => (warehousesOptions = data)"
+    />
+    <FormPopup
+        model="ZoneWarehouse"
+        @on-submit="emit('onSubmitCreateWarehouse', ZoneWarehouseFormData)"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelect
+                        :label="t('warehouses.warehouse')"
+                        v-model="ZoneWarehouseFormData.warehouseFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        :required="true"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormPopup>
+</template>
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 93e951801..b3a55bbe0 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -6,8 +6,10 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { toTimeFormat } from 'src/filters/date';
+import { toCurrency } from 'filters/index';
 
 import useCardDescription from 'src/composables/useCardDescription';
+import ZoneDescriptorMenuItems from './ZoneDescriptorMenuItems.vue';
 
 const $props = defineProps({
     id: {
@@ -58,7 +60,7 @@ const setData = (entity) => {
                 flat
                 dense
                 size="md"
-                icon="preview"
+                icon="vn:zone"
                 color="white"
                 class="link"
                 :to="{ name: 'ZoneList' }"
@@ -68,29 +70,15 @@ const setData = (entity) => {
                 </QTooltip>
             </QBtn>
         </template>
-        <!-- <template #menu="{ entity }">
+        <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
-        </template> -->
+        </template>
         <template #body="{ entity }">
-            {{ console.log('entity', entity) }}
-            <VnLv :label="t('Agency')" :value="entity.agencyMode.name" />
-            <VnLv :label="t('Closing hour')" :value="toTimeFormat(entity.hour)" />
-            <VnLv :label="t('zoneing days')" :value="entity.zoneingDays" />
-            <VnLv :label="t('Price')" :value="entity.price" />
-            <VnLv :label="t('Bonus')" :value="entity.bonus" />
+            <VnLv :label="t('summary.agency')" :value="entity.agencyMode.name" />
+            <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(entity.hour)" />
+            <VnLv :label="t('summary.travelingDays')" :value="entity.travelingDays" />
+            <VnLv :label="t('summary.price')" :value="toCurrency(entity.price)" />
+            <VnLv :label="t('summary.bonus')" :value="toCurrency(entity.bonus)" />
         </template>
     </CardDescriptor>
 </template>
-
-<i18n>
-es:
-    Summary: Detalles
-    The zone will be deleted: El envío será eliminado
-    Do you want to delete this zone?: ¿Quieres eliminar este envío?
-    All zones with current agency: Todos los envíos con la agencia actual
-    Agency: Agencia
-    Closing hour: Hora de cierre
-    zoneing days: Días de viaje
-    Price: Precio
-    Bonus: Bonificación
-</i18n>
diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index b6c7f28b3..8f1168ce9 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -74,20 +74,20 @@ function openConfirmDialog(callback) {
         <QItemSection avatar>
             <QIcon name="delete" />
         </QItemSection>
-        <QItemSection>{{ t('deleteOrder') }}</QItemSection>
+        <QItemSection>{{ t('deleteZone') }}</QItemSection>
     </QItem>
 </template>
 
 <i18n>
 en:
-    deleteOrder: Delete order
+    deleteZone: Delete zone
     confirmDeletion: Confirm deletion
-    confirmDeletionMessage: Are you sure you want to delete this order?
+    confirmDeletionMessage: Are you sure you want to delete this zone?
 
 es:
     To clone zone: Clonar zone
-    deleteOrder: Eliminar pedido
+    deleteZone: Eliminar zona
     confirmDeletion: Confirmar eliminación
-    confirmDeletionMessage: Seguro que quieres eliminar este pedido?
+    confirmDeletionMessage: Seguro que quieres eliminar este zona?
 
 </i18n>
diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index 00df03cb0..d46282c10 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -2,14 +2,16 @@
 import { ref, onMounted, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { dashIfEmpty } from 'src/filters';
-import { getUrl } from 'src/composables/getUrl';
+
 import VnLv from 'src/components/ui/VnLv.vue';
-import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
+import { getUrl } from 'src/composables/getUrl';
+import { toCurrency } from 'filters/index';
+import { toTimeFormat } from 'src/filters/date';
+import axios from 'axios';
+
 const route = useRoute();
 const { t } = useI18n();
 
@@ -23,71 +25,84 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const zoneUrl = ref();
 
-onMounted(async () => {
-    zoneUrl.value = (await getUrl('')) + `zone/${entityId.value}/`;
+const filter = computed(() => {
+    const filter = {
+        include: {
+            relation: 'agencyMode',
+            fields: ['name'],
+        },
+        where: {
+            id: entityId,
+        },
+    };
+    return filter;
 });
 
-const filter = computed(() => {
-    return { where: { id: entityId.value } };
+const columns = computed(() => [
+    {
+        label: t('summary.name'),
+        name: 'name',
+        field: 'warehouse',
+        align: 'left',
+        format: (val) => val.name,
+    },
+]);
+const warehouses = ref([]);
+
+const getWarehouses = async () => {
+    const params = {
+        filter: {
+            include: {
+                relation: 'warehouse',
+                fields: ['name'],
+            },
+        },
+    };
+
+    const { data } = await axios.get(`Zones/${entityId.value}/warehouses`, { params });
+    warehouses.value = data;
+};
+
+onMounted(async () => {
+    zoneUrl.value = (await getUrl('')) + `zone/${entityId.value}/`;
+    await getWarehouses();
 });
 </script>
 
 <template>
     <CardSummary
-        data-key="zoneData"
+        data-key="ZoneSummary"
         ref="summary"
-        :url="`Zones/summary`"
+        url="Zones/findOne"
         :filter="filter"
     >
         <template #header="{ entity }">
-            <div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>
+            <div>#{{ entity.id }} - {{ entity.name }}</div>
         </template>
         <template #body="{ entity: zone }">
             <QCard class="vn-one">
-                <VnTitle
-                    :url="zoneUrl + `basic-data`"
-                    :text="t('zone.summary.basicData')"
-                />
-                <VnLv :label="t('zone.card.name')" :value="zone.user?.nickname" />
-                <VnLv
-                    :label="t('zone.list.department')"
-                    :value="zone.department?.department?.name"
-                />
-                <VnLv :label="t('zone.list.email')" :value="zone.user.email" copy />
-                <VnLv :label="t('zone.summary.boss')" link>
-                    <template #value>
-                        <VnUserLink
-                            v-if="zone.boss"
-                            :name="dashIfEmpty(zone.boss?.name)"
-                            :zone-id="zone.bossFk"
-                        />
-                    </template>
-                </VnLv>
-                <VnLv :value="zone.mobileExtension">
-                    <template #label>
-                        {{ t('zone.summary.phoneExtension') }}
-                        <VnLinkPhone :phone-number="zone.mobileExtension" />
-                    </template>
-                </VnLv>
-                <VnLv :value="zone.phone">
-                    <template #label>
-                        {{ t('zone.summary.entPhone') }}
-                        <VnLinkPhone :phone-number="zone.phone" />
-                    </template>
-                </VnLv>
-                <VnLv :label="t('zone.summary.locker')" :value="zone.locker" />
+                <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
+                <VnLv :label="t('summary.agency')" :value="zone.agencyMode?.name" />
+                <VnLv :label="t('summary.price')" :value="toCurrency(zone.price)" />
+                <VnLv :label="t('summary.bonus')" :value="toCurrency(zone.bonus)" />
             </QCard>
             <QCard class="vn-one">
-                <VnTitle :text="t('zone.summary.userData')" />
-                <VnLv :label="t('zone.summary.userId')" :value="zone.user.id" />
-                <VnLv :label="t('zone.card.name')" :value="zone.user.nickname" />
-                <VnLv :label="t('zone.summary.role')" :value="zone.user.role.name" />
-                <VnLv :value="zone?.sip?.extension">
-                    <template #label>
-                        {{ t('zone.summary.sipExtension') }}
-                        <VnLinkPhone :phone-number="zone?.sip?.extension" />
-                    </template>
-                </VnLv>
+                <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
+                <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(zone.hour)" />
+                <VnLv :label="t('summary.travelingDays')" :value="zone.travelingDays" />
+                <QCheckbox
+                    :label="t('summary.volumetric')"
+                    v-model="zone.isVolumetric"
+                    :disable="true"
+                />
+            </QCard>
+            <QCard class="full-width">
+                <VnTitle :url="zoneUrl + `warehouses`" :text="t('summary.warehouse')" />
+                <QTable
+                    :columns="columns"
+                    :rows="warehouses"
+                    :no-data-label="t('globals.noResults')"
+                />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 7ff73a5e9..196333d08 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -1,53 +1,119 @@
 <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 CardList from 'components/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import ZoneCreateWarehouse from './ZoneCreateWarehouse.vue';
 
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import axios from 'axios';
+
+const { t } = useI18n();
 const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
 
-const deleteWarehouse = () => {
-    return true;
+const paginateRef = ref(null);
+const createWarehouseDialogRef = ref(null);
+
+const arrayData = useArrayData('ZoneWarehouses');
+const store = arrayData.store;
+
+const data = computed(() => store.data);
+
+const urlPath = computed(() => `Zones/${route.params.id}/warehouses`);
+
+const columns = computed(() => [
+    {
+        name: 'name',
+    },
+    {
+        name: 'action',
+    },
+]);
+
+const deleteWarehouse = async (row) => {
+    try {
+        await axios.delete(`${urlPath.value}/${row.id}`);
+        fetchWarehouses();
+    } catch (error) {
+        console.error(error);
+    }
 };
+
+const createZoneWarehouse = async (ZoneWarehouseFormData) => {
+    try {
+        await axios.post(urlPath.value, ZoneWarehouseFormData);
+        fetchWarehouses();
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter.include = 'warehouse';
+        fetchWarehouses();
+    }
+);
+
+const fetchWarehouses = () => paginateRef.value.fetch();
+
+const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
 </script>
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
+        <div class="full-width" style="max-width: 400px">
             <VnPaginate
+                ref="paginateRef"
                 data-key="ZoneWarehouses"
-                :url="`Zones/${route.params.id}/warehouses`"
+                :filter="{ include: 'warehouse' }"
+                :url="urlPath"
                 auto-load
             >
                 <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="row.name"
-                        :id="row.id"
-                    >
-                        <template #list-items>
-                            <VnLv :value="row.name" />
-                            <QIcon
-                                name="delete"
-                                size="sm"
-                                class="cursor-pointer"
-                                color="primary"
-                                @click="deleteWarehouse()"
-                            >
-                                <QTooltip>
-                                    {{ t('Remove row') }}
-                                </QTooltip>
-                            </QIcon>
+                    <QTable :rows="data" :columns="columns" hide-header>
+                        <template #body="{ row, rowIndex }">
+                            <QTr>
+                                <QTd>
+                                    <span>{{ row.warehouse?.name }}</span>
+                                </QTd>
+                                <QTd style="width: 50px !important">
+                                    <QIcon
+                                        name="delete"
+                                        size="sm"
+                                        class="cursor-pointer"
+                                        color="primary"
+                                        @click="
+                                            openConfirmationModal(
+                                                t('warehouses.deleteTitle'),
+                                                t('warehouses.deleteSubtitle'),
+                                                () => deleteWarehouse(row, rows, rowIndex)
+                                            )
+                                        "
+                                    >
+                                        <QTooltip>
+                                            {{ t('warehouses.delete') }}
+                                        </QTooltip>
+                                    </QIcon>
+                                </QTd>
+                            </QTr>
                         </template>
-                    </CardList>
+                    </QTable>
                 </template>
             </VnPaginate>
         </div>
+        <QDialog ref="createWarehouseDialogRef">
+            <ZoneCreateWarehouse @on-submit-create-warehouse="createZoneWarehouse" />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="openCreateWarehouseForm()">
+                <QTooltip>{{ t('warehouses.add') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
     </QPage>
 </template>
-
-<i18n>
-    es:
-        Remove row: Eliminar fila
-</i18n>
diff --git a/src/pages/Zone/Delivery/ZoneDeliveryList.vue b/src/pages/Zone/Delivery/ZoneDeliveryList.vue
index 695388a9b..ca87dbd84 100644
--- a/src/pages/Zone/Delivery/ZoneDeliveryList.vue
+++ b/src/pages/Zone/Delivery/ZoneDeliveryList.vue
@@ -63,7 +63,7 @@ async function remove(row) {
                                 outline
                             />
                             <QBtn
-                                :label="t('zone.list.remove')"
+                                :label="t('list.remove')"
                                 @click.stop="remove(row)"
                                 color="primary"
                                 style="margin-top: 15px"
diff --git a/src/pages/Zone/Upcoming/ZoneUpcomingList.vue b/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
index 2d3016f25..89e53132e 100644
--- a/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
+++ b/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
@@ -63,7 +63,7 @@ async function remove(row) {
                                 outline
                             />
                             <QBtn
-                                :label="t('zone.list.remove')"
+                                :label="t('list.remove')"
                                 @click.stop="remove(row)"
                                 color="primary"
                                 style="margin-top: 15px"
diff --git a/src/pages/Zone/ZoneClosingTable.vue b/src/pages/Zone/ZoneClosingTable.vue
new file mode 100644
index 000000000..ce0c91af7
--- /dev/null
+++ b/src/pages/Zone/ZoneClosingTable.vue
@@ -0,0 +1,112 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { computed } from 'vue';
+import { toCurrency } from 'src/filters';
+
+import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
+
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { toTimeFormat } from 'filters/date.js';
+
+const { t } = useI18n();
+const router = useRouter();
+const { viewSummary } = useSummaryDialog();
+
+defineProps({
+    rows: {
+        type: Array,
+        required: true,
+        default: () => [],
+    },
+});
+
+const columns = computed(() => [
+    {
+        label: t('zoneClosingTable.id'),
+        name: 'id',
+        field: 'id',
+        sortable: true,
+        align: 'left',
+    },
+    {
+        label: t('zoneClosingTable.name'),
+        name: 'name',
+        field: 'name',
+        sortable: true,
+        align: 'left',
+    },
+    {
+        label: t('zoneClosingTable.agency'),
+        name: 'agency',
+        field: 'agencyModeName',
+        sortable: true,
+        align: 'left',
+    },
+    {
+        label: t('zoneClosingTable.closing'),
+        name: 'close',
+        field: 'hour',
+        sortable: true,
+        align: 'left',
+        format: (val) => toTimeFormat(val),
+    },
+    {
+        label: t('zoneClosingTable.price'),
+        name: 'price',
+        field: 'price',
+        sortable: true,
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+    {
+        name: 'actions',
+        align: 'left',
+    },
+]);
+
+const redirectToZoneSummary = (id) => {
+    router.push({ name: 'ZoneSummary', params: { id } });
+};
+</script>
+
+<template>
+    <div>
+        <div class="header">
+            <span>{{ t('zoneClosingTable.zones') }}</span>
+        </div>
+        <QTable
+            :rows="rows"
+            :columns="columns"
+            @row-click="(_, row) => redirectToZoneSummary(row.id)"
+            style="max-height: 400px"
+        >
+            <template #body-cell-actions="props">
+                <QTd :props="props">
+                    <div class="table-actions">
+                        <QIcon
+                            name="preview"
+                            size="sm"
+                            color="primary"
+                            @click.stop="viewSummary(props.row.id, ZoneSummary)"
+                        >
+                            <QTooltip>{{ t('zoneClosingTable.preview') }}</QTooltip>
+                        </QIcon>
+                    </div>
+                </QTd>
+            </template>
+        </QTable>
+    </div>
+</template>
+
+<style scoped lang="scss">
+.header {
+    width: 100%;
+    height: 34px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: bold;
+    background-color: $primary;
+}
+</style>
diff --git a/src/pages/Zone/ZoneCreate.vue b/src/pages/Zone/ZoneCreate.vue
index 93ea9589b..e25ccae3a 100644
--- a/src/pages/Zone/ZoneCreate.vue
+++ b/src/pages/Zone/ZoneCreate.vue
@@ -1,184 +1,114 @@
 <script setup>
-import { computed, onMounted, onUpdated, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { QIcon, QInput, QItem, QItemSection, QSelect } from 'quasar';
+import { useRouter } from 'vue-router';
 
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
-import { useRoute, useRouter } from 'vue-router';
-import axios from 'axios';
-
-onMounted(() => fetch());
-onUpdated(() => fetch());
+import VnInputTime from 'components/common/VnInputTime.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const router = useRouter();
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
+
+const newZoneForm = reactive({
+    travelingDays: 0,
+    price: 0.2,
+    bonus: 0.2,
+    hour: Date.vnNew(),
+    isVolumetric: false,
 });
-const entityId = computed(() => $props.id || route.params.id);
+const warehousesOptions = ref([]);
+const agencyOptions = ref([]);
 
-let zoneTypes = [];
-let originalData = {};
-const zone = ref({});
-const filteredZoneTypes = ref(zoneTypes);
-
-async function onSubmit() {
-    try {
-        const params = {
-            id: entityId.value,
-            label: zone.value.label,
-            plate: zone.value.plate,
-            volume: zone.value.volume,
-            typeFk: zone.value.typeFk,
-        };
-        await axios.patch('Zones', params).then((res) => {
-            if (res.status == 200) router.push({ path: `/zone/list` });
-        });
-    } catch (error) {
-        //
-    }
-}
-
-async function onReset() {
-    if (entityId.value) {
-        zone.value = { ...originalData };
-    } else {
-        zone.value = {};
-    }
-}
-
-async function fetch() {
-    try {
-        await axios.get('ZoneTypes').then(async (res) => {
-            if (res.data) {
-                filteredZoneTypes.value = zoneTypes = res.data;
-            }
-        });
-        if (entityId.value) {
-            await axios.get(`Zones/${entityId.value}`).then(async (res) => {
-                const data = res.data;
-                if (data) {
-                    zone.value.label = data.label;
-                    zone.value.plate = data.plate;
-                    zone.value.volume = data.volume;
-                    zone.value.typeFk = data.typeFk;
-                    originalData = { ...zone.value };
-                }
-            });
-        }
-    } catch (e) {
-        //
-    }
-}
-
-function filterType(val, update) {
-    update(() => {
-        const needle = val.toLowerCase();
-        filteredZoneTypes.value = zoneTypes.filter(
-            (v) => v.name.toLowerCase().indexOf(needle) > -1
-        );
-    });
-}
+const redirectToZoneLocations = (_, { id }) => {
+    router.push({ name: 'ZoneLocations', params: { id } });
+};
 </script>
 
 <template>
-    <QPage class="q-pa-sm q-mx-xl">
-        <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
-            <QCard class="q-pa-md">
-                <div class="row q-col-gutter-md">
-                    <div class="col">
-                        <QInput
-                            filled
-                            v-model="zone.label"
-                            :label="t('zone.create.name')"
-                            type="number"
-                            min="0"
-                            :rules="[(val) => !!val || t('zone.warnings.labelNotEmpty')]"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            filled
-                            v-model="zone.plate"
-                            :label="t('zone.create.agency')"
-                            :rules="[(val) => !!val || t('zone.warnings.plateNotEmpty')]"
-                        />
-                    </div>
-                </div>
-                <div class="row q-col-gutter-md">
-                    <div class="col">
-                        <QInput
-                            filled
-                            v-model="zone.volume"
-                            :label="t('zone.create.close')"
-                            type="number"
-                            min="0"
-                            :rules="[(val) => !!val || t('zone.warnings.volumeNotEmpty')]"
-                        />
-                    </div>
-                    <div class="col">
-                        <QSelect
-                            filled
-                            v-model="zone.typeFk"
-                            use-input
-                            fill-input
-                            hide-selected
-                            input-debounce="0"
-                            option-label="name"
-                            option-value="id"
-                            emit-value
-                            map-options
-                            :label="t('zone.create.price')"
-                            :options="filteredZoneTypes"
-                            :rules="[(val) => !!val || t('zone.warnings.typeNotEmpty')]"
-                            @filter="filterType"
-                        >
-                            <template v-if="zone.typeFk" #append>
-                                <QIcon
-                                    name="cancel"
-                                    @click.stop.prevent="zone.typeFk = null"
-                                    class="cursor-pointer"
-                                />
-                            </template>
-                            <template #no-option>
-                                <QItem>
-                                    <QItemSection class="text-grey">
-                                        {{ t('zone.warnings.noData') }}
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </QSelect>
-                    </div>
-                </div>
-            </QCard>
-            <div class="q-mt-md">
-                <QBtn :label="t('zone.type.submit')" type="submit" color="primary" />
-                <QBtn
-                    :label="t('zone.type.reset')"
-                    type="reset"
-                    color="primary"
-                    flat
-                    class="q-ml-sm"
-                />
-            </div>
-        </QForm>
+    <FetchData
+        url="Warehouses"
+        :filter="{ order: ['name'] }"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="AgencyModes/isActive"
+        :filter="{ order: ['name'] }"
+        @on-fetch="(data) => (agencyOptions = data)"
+        auto-load
+    />
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            url-create="Zones"
+            model="Zones"
+            :form-initial-data="newZoneForm"
+            @on-data-saved="redirectToZoneLocations"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('create.name')"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :label="t('create.warehouse')"
+                        :options="warehousesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.warehouseFk"
+                    />
+                    <VnSelect
+                        :label="t('create.agency')"
+                        :options="agencyOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.agencyModeFk"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        v-model="data.travelingDays"
+                        :label="t('create.travelingDays')"
+                        type="number"
+                        min="0"
+                    />
+
+                    <VnInputTime v-model="data.hour" :label="t('create.closingHour')" />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        v-model="data.price"
+                        :label="t('create.price')"
+                        type="number"
+                        min="0"
+                    />
+                    <VnInput
+                        v-model="data.bonus"
+                        :label="t('create.bonus')"
+                        type="number"
+                        min="0"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <QCheckbox
+                        :label="t('create.volumetric')"
+                        v-model="data.isVolumetric"
+                        :toggle-indeterminate="false"
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.q-page {
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
-}
-
-.q-form {
-    width: 70%;
-}
-</style>
diff --git a/src/pages/Zone/ZoneDeliveryCalendar.vue b/src/pages/Zone/ZoneDeliveryCalendar.vue
new file mode 100644
index 000000000..96a62086e
--- /dev/null
+++ b/src/pages/Zone/ZoneDeliveryCalendar.vue
@@ -0,0 +1,192 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { date } from 'quasar';
+
+import ZoneClosingTable from './ZoneClosingTable.vue';
+import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
+import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
+
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import axios from 'axios';
+
+const props = defineProps({
+    year: {
+        type: Number,
+        required: true,
+    },
+    month: {
+        type: Number,
+        required: true,
+    },
+    monthDate: {
+        type: Object,
+        default: null,
+    },
+    geoExclusions: {
+        type: Object,
+        default: () => {},
+    },
+    exclusions: {
+        type: Object,
+        default: () => {},
+    },
+    daysMap: {
+        type: Object,
+        default: null,
+    },
+});
+
+const { locale } = useI18n();
+
+const calendarRef = ref(null);
+const weekdayStore = useWeekdayStore();
+const showZoneClosingTable = ref(false);
+const zoneClosingData = ref(null);
+const today = ref(date.formatDate(Date.vnNew(), 'YYYY-MM-DD'));
+const todayTimestamp = computed(() => {
+    const date = Date.vnNew();
+    date.setHours(0, 0, 0, 0);
+    return date.getTime();
+});
+const _monthDate = computed(() => date.formatDate(props.monthDate, 'YYYY-MM-DD'));
+
+const onEventSelection = async ({ year, month, day }) => {
+    const date = new Date(year, month - 1, day);
+    const stamp = date.getTime();
+    const events = props.daysMap[stamp];
+    if (!events) return;
+
+    const zoneIds = [];
+    for (let event of events) zoneIds.push(event.zoneFk);
+
+    const params = {
+        zoneIds: zoneIds,
+        date: date,
+    };
+
+    const { data } = await axios.post('Zones/getZoneClosing', params);
+    zoneClosingData.value = data;
+    showZoneClosingTable.value = true;
+};
+
+const getEventByTimestamp = ({ year, month, day }) => {
+    const stamp = new Date(year, month - 1, day).getTime();
+    return (
+        props.daysMap[stamp] ||
+        props.exclusions[stamp] ||
+        props.geoExclusions[stamp] ||
+        null
+    );
+};
+
+const getEventAttrs = ({ year, month, day }) => {
+    const stamp = new Date(year, month - 1, day).getTime();
+
+    let colorClass = '--event';
+    if (props.geoExclusions[stamp]) colorClass = '--geoExcluded';
+    else if (props.exclusions[stamp]) colorClass = '--excluded';
+
+    const attrs = {
+        class: colorClass,
+        label: day,
+    };
+
+    return attrs;
+};
+
+const isToday = (timestamp) => {
+    const { year, month, day } = timestamp;
+    return todayTimestamp.value === new Date(year, month - 1, day).getTime();
+};
+
+const calendarHeaderTitle = computed(() => {
+    return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
+});
+</script>
+
+<template>
+    <QCalendarMonthWrapper
+        style="height: 290px; width: 290px"
+        transparent-background
+        view-customization="workerCalendar"
+    >
+        <template #header>
+            <span class="full-width text-center text-body1 q-py-sm">{{
+                calendarHeaderTitle
+            }}</span>
+        </template>
+        <template #calendar>
+            <QCalendarMonth
+                ref="calendarRef"
+                :model-value="_monthDate"
+                show-work-weeks
+                no-outside-days
+                no-active-date
+                :weekdays="[1, 2, 3, 4, 5, 6, 0]"
+                short-weekday-label
+                :locale="locale"
+                :now="today"
+                mini-mode
+            >
+                <template #day="{ scope: { timestamp } }">
+                    <!-- Este slot representa cada día del calendario y muestra un botón representando el correspondiente evento -->
+                    <QBtn
+                        v-if="getEventByTimestamp(timestamp)"
+                        v-bind="{ ...getEventAttrs(timestamp) }"
+                        @click="onEventSelection(timestamp)"
+                        rounded
+                        dense
+                        flat
+                        class="calendar-event"
+                        :class="{
+                            '--today': isToday(timestamp),
+                        }"
+                    >
+                        <QPopupProxy>
+                            <ZoneClosingTable
+                                v-if="zoneClosingData && zoneClosingData.length"
+                                :rows="zoneClosingData"
+                            />
+                        </QPopupProxy>
+                    </QBtn>
+                </template>
+            </QCalendarMonth>
+        </template>
+    </QCalendarMonthWrapper>
+</template>
+
+<style lang="scss">
+.calendar-event {
+    display: flex;
+    justify-content: center;
+    width: 32px;
+    height: 32px;
+    font-size: 13px;
+    line-height: 1.715em;
+    cursor: pointer;
+    color: white;
+
+    &.--today {
+        border: 2px solid $info;
+    }
+
+    &.--event {
+        background-color: $positive;
+        color: black;
+    }
+
+    &.--excluded {
+        background-color: $negative;
+    }
+
+    &.--geoExcluded {
+        background-color: $primary;
+    }
+
+    &:hover {
+        opacity: 0.8;
+    }
+}
+</style>
diff --git a/src/pages/Zone/ZoneDeliveryDays.vue b/src/pages/Zone/ZoneDeliveryDays.vue
index 485500dba..d6ce70f6d 100644
--- a/src/pages/Zone/ZoneDeliveryDays.vue
+++ b/src/pages/Zone/ZoneDeliveryDays.vue
@@ -1 +1,257 @@
-<template>Zone Delivery days</template>
+<script setup>
+import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
+import ZoneDeliveryCalendar from './ZoneDeliveryCalendar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+const weekdayStore = useWeekdayStore();
+
+const nMonths = ref(4);
+const _date = ref(Date.vnNew());
+const _data = ref(null);
+const firstDay = ref(null);
+const lastDay = ref(null);
+const months = ref([]);
+const days = ref({});
+const exclusions = ref({});
+const geoExclusions = ref({});
+const events = ref([]);
+const arrayData = useArrayData('ZoneDeliveryDays', {
+    url: 'Zones/getEvents',
+});
+const { store } = arrayData;
+
+const refreshEvents = () => {
+    days.value = {};
+    if (!data.value) return;
+
+    let day = new Date(firstDay.value.getTime());
+
+    while (day <= lastDay.value) {
+        let stamp = day.getTime();
+        let wday = day.getDay();
+        let dayEvents = [];
+        let _exclusions = exclusions.value[stamp] || [];
+
+        if (events.value) {
+            for (let event of events.value) {
+                let match;
+                switch (event.type) {
+                    case 'day':
+                        match = event.dated == stamp;
+                        break;
+                    default:
+                        match =
+                            event.wdays[wday] &&
+                            (!event.started || stamp >= event.started) &&
+                            (!event.ended || stamp <= event.ended);
+                        break;
+                }
+                if (match && !_exclusions.find((e) => e.zoneFk == event.zoneFk)) {
+                    dayEvents.push(event);
+                }
+            }
+        }
+        if (dayEvents.length) days.value[stamp] = dayEvents;
+
+        day.setDate(day.getDate() + 1);
+    }
+};
+
+const date = computed({
+    get: () => _date.value,
+    set: (value) => {
+        _date.value = value;
+        let stamp = value.getTime();
+
+        firstDay.value = new Date(stamp);
+        firstDay.value.setDate(1);
+
+        lastDay.value = new Date(stamp);
+        lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
+        lastDay.value.setDate(0);
+
+        months.value = [];
+        for (let i = 0; i < nMonths.value; i++) {
+            let monthDate = new Date(stamp);
+            monthDate.setMonth(value.getMonth() + i);
+            months.value.push(monthDate);
+        }
+        refreshEvents();
+    },
+});
+
+const data = computed({
+    get: () => {
+        return _data.value;
+    },
+    set: (value) => {
+        _data.value = value;
+
+        value = value || {};
+
+        events.value = value.events;
+        function toStamp(date) {
+            return date && new Date(date).setHours(0, 0, 0, 0);
+        }
+
+        exclusions.value = {};
+        let _exclusions = value.exclusions;
+
+        if (_exclusions) {
+            for (let exclusion of _exclusions) {
+                let stamp = toStamp(exclusion.dated);
+                if (!exclusions[stamp]) exclusions.value[stamp] = [];
+                exclusions.value[stamp].push(exclusion);
+            }
+        }
+
+        geoExclusions.value = {};
+        let _geoExclusions = value.geoExclusions;
+
+        if (_geoExclusions) {
+            for (let geoExclusion of _geoExclusions) {
+                let stamp = toStamp(geoExclusion.dated);
+                if (!geoExclusions[stamp]) geoExclusions.value[stamp] = [];
+                geoExclusions.value[stamp].push(geoExclusion);
+            }
+        }
+
+        let _events = value.events;
+        if (_events) {
+            for (let event of _events) {
+                event.dated = toStamp(event.dated);
+                event.ended = toStamp(event.ended);
+                event.started = toStamp(event.started);
+                event.wdays = weekdayStore.fromSet(event.weekDays || '');
+            }
+        }
+
+        refreshEvents();
+    },
+});
+
+watch(
+    () => store.data,
+    (value) => {
+        data.value = value;
+    },
+    { immediate: true }
+);
+
+const getMonthNameAndYear = (date) => {
+    const monthName = weekdayStore.getLocaleMonths[date.getMonth()].locale;
+    const year = date.getFullYear();
+    return `${monthName} ${year}`;
+};
+
+const headerTitle = computed(() => {
+    if (!months.value?.length) return;
+
+    const firstMonth = getMonthNameAndYear(months.value[0]);
+    const lastMonth = getMonthNameAndYear(months.value[months.value.length - 1]);
+
+    return `${firstMonth} - ${lastMonth}`;
+});
+
+const step = (direction) => {
+    const _date = new Date(date.value);
+    _date.setMonth(_date.getMonth() + nMonths.value * direction);
+    date.value = _date;
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    let initialDate = Date.vnNew();
+    initialDate.setDate(1);
+    initialDate.setHours(0, 0, 0, 0);
+    date.value = initialDate;
+    weekdayStore.initStore();
+});
+
+onUnmounted(() => arrayData.destroy());
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ZoneDeliveryPanel />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="q-pa-md flex justify-center">
+        <QCard style="height: max-content">
+            <div class="calendars-header">
+                <QBtn
+                    icon="arrow_left"
+                    size="sm"
+                    flat
+                    class="full-height"
+                    @click="step(-1)"
+                />
+                <span>{{ headerTitle }}</span>
+                <QBtn
+                    icon="arrow_right"
+                    size="sm"
+                    flat
+                    class="full-height"
+                    @click="step(1)"
+                />
+            </div>
+            <div class="calendars-container">
+                <ZoneDeliveryCalendar
+                    v-for="(month, index) in months"
+                    :key="index"
+                    :month="month.getMonth() + 1"
+                    :year="month.getFullYear()"
+                    :month-date="month"
+                    :geo-exclusions="geoExclusions"
+                    :exclusions="exclusions"
+                    :days-map="days"
+                />
+            </div>
+        </QCard>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.calendars-header {
+    height: 45px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: $primary;
+    font-weight: bold;
+    font-size: 16px;
+}
+
+.calendars-container {
+    max-width: 800px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+}
+</style>
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
new file mode 100644
index 000000000..c754d484f
--- /dev/null
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -0,0 +1,149 @@
+<script setup>
+import { onMounted, ref, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { watch } from 'vue';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const deliveryMethodFk = ref(null);
+const deliveryMethods = ref([]);
+const formData = reactive({});
+
+const arrayData = useArrayData('ZoneDeliveryDays', {
+    url: 'Zones/getEvents',
+});
+
+const fetchDeliveryMethods = async (filter) => {
+    try {
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get('DeliveryMethods', { params });
+        return data.map((deliveryMethod) => deliveryMethod.id);
+    } catch (err) {
+        console.error('Error fetching delivery methods: ', err);
+    }
+};
+
+watch(
+    () => deliveryMethodFk.value,
+    async (val) => {
+        let filter;
+        if (val === 'pickUp') filter = { where: { code: 'PICKUP' } };
+        else filter = { where: { code: { inq: ['DELIVERY', 'AGENCY'] } } };
+
+        deliveryMethods.value = await fetchDeliveryMethods(filter);
+    },
+    { immediate: true }
+);
+
+const fetchData = async (params) => {
+    try {
+        const { data } = params
+            ? await arrayData.applyFilter({
+                  params,
+              })
+            : await arrayData.fetch({ append: false });
+        if (!data.events || !data.events.length)
+            notify(t('deliveryPanel.noEventsWarning'), 'warning');
+    } catch (err) {
+        console.error('Error fetching events: ', err);
+    }
+};
+
+const onSubmit = async () => {
+    const params = { deliveryMethodFk: deliveryMethodFk.value, ...formData };
+    await fetchData(params);
+};
+
+onMounted(async () => {
+    deliveryMethodFk.value = 'delivery';
+    formData.geoFk = arrayData.store?.userParams?.geoFk;
+    formData.agencyModeFk = arrayData.store?.userParams?.agencyModeFk;
+    if (formData.geoFk || formData.agencyModeFk) await fetchData();
+});
+</script>
+
+<template>
+    <QForm @submit="onSubmit()" class="q-pa-md">
+        <div class="column q-gutter-y-sm">
+            <QRadio
+                v-model="deliveryMethodFk"
+                dense
+                val="pickUp"
+                :label="t('deliveryPanel.pickup')"
+            />
+            <QRadio
+                v-model="deliveryMethodFk"
+                dense
+                val="delivery"
+                :label="t('deliveryPanel.delivery')"
+                class="q-mb-sm"
+            />
+            <VnSelect
+                v-if="deliveryMethodFk === 'delivery'"
+                :label="t('deliveryPanel.postcode')"
+                v-model="formData.geoFk"
+                url="Postcodes/location"
+                :fields="['geoFk', 'code', 'townFk']"
+                sort-by="code, townFk"
+                option-value="geoFk"
+                option-label="code"
+                option-filter="code"
+                hide-selected
+                dense
+                outlined
+                rounded
+            >
+                <template #option="{ itemProps, opt }">
+                    <QItem v-bind="itemProps">
+                        <QItemSection v-if="opt.code">
+                            <QItemLabel>{{ opt.code }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ opt.town?.province?.name }},
+                                {{ opt.town?.province?.country?.country }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <VnSelect
+                :label="
+                    t(
+                        deliveryMethodFk === 'delivery'
+                            ? 'deliveryPanel.agency'
+                            : 'deliveryPanel.warehouse'
+                    )
+                "
+                v-model="formData.agencyModeFk"
+                url="AgencyModes/isActive"
+                :fields="['id', 'name']"
+                :where="{
+                    deliveryMethodFk: { inq: deliveryMethods },
+                }"
+                sort-by="name ASC"
+                option-value="id"
+                option-label="name"
+                hide-selected
+                dense
+                outlined
+                rounded
+            />
+        </div>
+        <QBtn
+            :label="t('deliveryPanel.query')"
+            type="submit"
+            color="primary"
+            class="q-mt-md full-width"
+            unelevated
+            rounded
+            dense
+        />
+    </QForm>
+</template>
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 94765919d..c84355eb0 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -17,37 +17,47 @@ const props = defineProps({
         default: null,
     },
 });
+
 const agencies = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="agencies"
-        limit="30"
-        @on-fetch="(data) => (agencies = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        <template #body="{ params }">
+    <FetchData url="agencies" @on-fetch="(data) => (agencies = data)" auto-load />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="['search']"
+    >
+        <template #tags="{ tag }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`filterPanel.${tag.label}`) }}: </strong>
+                <span>{{ tag.value }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                    <VnInput
+                        :label="t('filterPanel.name')"
+                        v-model="params.name"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
-                        :label="t('Agency')"
-                        v-model="params.agencyModefK"
+                    <VnSelect
+                        :label="t('filterPanel.agencyModeFk')"
+                        v-model="params.agencyModeFk"
                         :options="agencies"
                         option-value="id"
                         option-label="name"
-                        @input-value="agencies.fetch()"
+                        @update:model-value="searchFn()"
                         dense
                         outlined
                         rounded
                     >
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
         </template>
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index f260eb134..5a7d07d71 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -1,111 +1,212 @@
 <script setup>
-import axios from 'axios';
-import { useQuasar } from 'quasar';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import FetchData from 'src/components/FetchData.vue';
+import { onMounted, computed } from 'vue';
+import { toCurrency } from 'src/filters';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import ZoneFilterPanel from './ZoneFilterPanel.vue';
+
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toTimeFormat } from 'src/filters/date';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import useNotify from 'src/composables/useNotify.js';
+import { useStateStore } from 'stores/useStateStore';
+import axios from 'axios';
 
-const quasar = useQuasar();
-const arrayData = useArrayData('ZoneList');
-const store = arrayData.store;
-const router = useRouter();
+const stateStore = useStateStore();
 const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
 const { viewSummary } = useSummaryDialog();
+const { openConfirmationModal } = useVnConfirm();
 
-function navigate(id) {
-    router.push({ path: `/zone/${id}/edit` });
-}
+const redirectToZoneSummary = (event, { id }) => {
+    router.push({ name: 'ZoneSummary', params: { id } });
+};
 
-function create() {
-    router.push({ path: `/zone/create` });
-}
+const columns = computed(() => [
+    {
+        name: 'ID',
+        label: t('list.id'),
+        field: (row) => row.id,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'name',
+        label: t('list.name'),
+        field: (row) => row.name,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'agency',
+        label: t('list.agency'),
+        field: (row) => row?.agencyMode?.name,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'close',
+        label: t('list.close'),
+        field: (row) => (row?.hour ? toTimeFormat(row?.hour) : '-'),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'price',
+        label: t('list.price'),
+        field: (row) => (row?.price ? toCurrency(row.price) : '-'),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'actions',
+        label: '',
+        sortable: false,
+        align: 'right',
+    },
+]);
 
-async function remove(row) {
-    try {
-        await axios.delete(`Zones/${row.id}`).then(async () => {
-            quasar.notify({
-                message: t('zone.list.removeItem'),
-                type: 'positive',
-            });
-            store.data.splice(store.data.indexOf(row), 1);
-        });
-    } catch (error) {
-        //
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'agencyModeFk':
+            return {
+                agencyModeFk: value,
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        name: {
+                            like: `%${value}%`,
+                        },
+                    };
+                }
+            }
     }
+};
+
+async function clone(id) {
+    const { data } = await axios.post(`Zones/${id}/clone`);
+    notify(t('globals.dataSaved'), 'positive');
+    router.push({ name: 'ZoneBasicData', params: { id: data.id } });
 }
+const handleClone = (id) => {
+    openConfirmationModal(
+        t('list.confirmCloneTitle'),
+        t('list.confirmCloneSubtitle'),
+        () => clone(id)
+    );
+};
+onMounted(() => (stateStore.rightDrawer = true));
 </script>
 
 <template>
-    <FetchData
-        url="/Agencies"
-        @on-fetch="(data) => (agencyOptions = data)"
-        :filter="{ fields: ['id', 'name'] }"
-        auto-load
-    />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="ZoneList"
+                url="Zones"
+                :filter="{
+                    include: { relation: 'agencyMode', scope: { fields: ['name'] } },
+                }"
+                :expr-builder="exprBuilder"
+                :label="t('list.searchZone')"
+                :info="t('list.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
+        </QScrollArea>
+    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
-            <VnPaginate data-key="ZoneList" url="/Zones" order="id DESC" auto-load>
+            <VnPaginate
+                data-key="ZoneList"
+                url="Zones"
+                :filter="{
+                    include: { relation: 'agencyMode', scope: { fields: ['name'] } },
+                }"
+                :limit="20"
+                auto-load
+            >
                 <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="(row.label || '').toString()"
-                        :id="row.id"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv
-                                :label="t('zone.list.id')"
-                                :title-label="t('zone.list.id')"
-                                :value="row.id"
-                            />
-                            <VnLv :label="t('zone.list.name')" :value="row?.name" />
-                            <VnLv
-                                :label="t('zone.list.agency')"
-                                :options="agencyOptions"
-                                option-value="id"
-                                option-label="name"
-                                :value="row?.agencyFk"
-                            />
-                            <VnLv
-                                :label="t('zone.list.close')"
-                                :value="toTimeFormat(row?.hour)"
-                            />
-                            <VnLv :label="t('zone.list.price')" :value="row?.price" />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
-                                outline
-                            />
-                            <QBtn
-                                :label="t('zone.list.openSummary')"
-                                @click.stop="viewSummary(row.id, ZoneSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                            <!--AQUI PONER BOTÓN CLONAR-->
-                            <QBtn
-                                :label="t('zone.list.clone')"
-                                @click.stop="remove(row)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
+                    <div class="q-pa-md">
+                        <QTable
+                            :rows="rows"
+                            :columns="columns"
+                            row-key="clientId"
+                            class="full-width"
+                            @row-click="redirectToZoneSummary"
+                        >
+                            <template #header="props">
+                                <QTr :props="props" class="bg">
+                                    <QTh
+                                        v-for="col in props.cols"
+                                        :key="col.name"
+                                        :props="props"
+                                    >
+                                        {{ t(col.label) }}
+                                        <QTooltip v-if="col.tooltip">{{
+                                            col.tooltip
+                                        }}</QTooltip>
+                                    </QTh>
+                                </QTr>
+                            </template>
+
+                            <template #body-cell="props">
+                                <QTd :props="props">
+                                    <QTr :props="props" class="cursor-pointer">
+                                        {{ props.value }}
+                                    </QTr>
+                                </QTd>
+                            </template>
+                            <template #body-cell-actions="props">
+                                <QTd :props="props" class="q-gutter-x-sm">
+                                    <QIcon
+                                        name="vn:clone"
+                                        size="sm"
+                                        color="primary"
+                                        @click.stop="handleClone(props.row.id)"
+                                    >
+                                        <QTooltip>{{ t('globals.clone') }}</QTooltip>
+                                    </QIcon>
+                                    <QIcon
+                                        name="preview"
+                                        size="sm"
+                                        color="primary"
+                                        @click.stop="
+                                            viewSummary(props.row.id, ZoneSummary)
+                                        "
+                                    >
+                                        <QTooltip>{{ t('Preview') }}</QTooltip>
+                                    </QIcon>
+                                </QTd>
+                            </template>
+                        </QTable>
+                    </div>
                 </template>
             </VnPaginate>
         </div>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="create" fab icon="add" color="primary">
-                <QTooltip>{{ t('zone.list.create') }}</QTooltip>
+            <QBtn :to="{ path: `/zone/create` }" fab icon="add" color="primary">
+                <QTooltip>{{ t('list.create') }}</QTooltip>
             </QBtn>
         </QPageSticky>
     </QPage>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index e62111d57..dd79f6ac4 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -1,19 +1,66 @@
 zone:
-    list:
-        volume: Volume
-        clone: Clone
-        id: Id
-        name: Name
-        agency: Agency
-        close: Close
-        price: Price
-        create: Create zone
-        openSummary: Details
-    create:
-        name: Name
-        agency: Agency
-        close: Close
-        price: Price
-    type:
-        submit: Save
-        reset: Reset
+    pageTitles:
+        zones: Zone
+        zonesList: Zones
+        zoneCreate: Create zone
+        locations: Locations
+        deliveryDays: Delivery days
+        upcomingList: Upcoming deliveries
+        warehouses: Warehouses
+list:
+    clone: Clone
+    id: Id
+    name: Name
+    agency: Agency
+    close: Close
+    price: Price
+    create: Create zone
+    openSummary: Details
+    searchZone: Search zones
+    searchInfo: Search zone by id or name
+    confirmCloneTitle: All it's properties will be copied
+    confirmCloneSubtitle: Do you want to clone this zone?
+create:
+    name: Name
+    warehouse: Warehouse
+    agency: Agency
+    travelingDays: Traveling days
+    closingHour: Closing hour
+    price: Price
+    bonus: Bonus
+    volumetric: Volumetric
+summary:
+    agency: Agency
+    price: Price
+    basicData: Basic data
+    bonus: Bonus
+    closeHour: Close hour
+    travelingDays: Traveling days
+    volumetric: Volumetric
+    warehouse: Warehouse
+    name: Name
+filterPanel:
+    name: Name
+    agencyModeFk: Agency
+deliveryPanel:
+    pickup: Pick up
+    delivery: Delivery
+    postcode: Postcode
+    agency: Agency
+    warehouse: Warehouse
+    query: Query
+    noEventsWarning: No service for the specified zone
+zoneClosingTable:
+    id: Id
+    name: Name
+    agency: Agency
+    closing: Closing
+    price: Price
+    preview: Preview
+    zones: Zones
+warehouses:
+    delete: Delete
+    deleteTitle: This item will be deleted
+    deleteSubtitle: Are you sure you want to continue?
+    warehouse: Warehouse
+    add: Add
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 5d7a265bf..43b636d4f 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -1,19 +1,68 @@
 zone:
-    list:
-        volume: Volumen
-        clone: Clonar
-        id: Id
-        name: Nombre
-        agency: Agencia
-        close: Cierre
-        price: Precio
-        create: Crear zona
-        openSummary: Detalles
-    create:
-        name: Nombre
-        agency: Agencia
-        close: Cierre
-        price: Precio
-    type:
-        submit: Guardar
-        reset: Reiniciar
+    pageTitles:
+        zones: Zonas
+        zonesList: Zonas
+        zoneCreate: Nueva zona
+        locations: Localizaciones
+        deliveryDays: Días de entrega
+        upcomingList: Próximos repartos
+        warehouses: Almacenes
+list:
+    clone: Clonar
+    id: Id
+    name: Nombre
+    agency: Agencia
+    close: Cierre
+    price: Precio
+    create: Crear zona
+    openSummary: Detalles
+    searchZone: Buscar zonas
+    searchInfo: Buscar zonas por identificador o nombre
+    confirmCloneTitle: Todas sus propiedades serán copiadas
+    confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
+create:
+    name: Nombre
+    warehouse: Almacén
+    agency: Agencia
+    travelingDays: Días de viaje
+    closingHour: Hora de cierre
+    price: Precio
+    bonus: Bonificación
+    volumetric: Volumétrico
+summary:
+    agency: Agencia
+    price: Precio
+    basicData: Datos básicos
+    bonus: Bonificación
+    closeHour: Hora de cierre
+    travelingDays: Días de viaje
+    volumetric: Volumétrico
+    warehouse: Almacén
+    name: Nombre
+filterPanel:
+    name: Nombre
+    agencyModeFk: Agencia
+deliveryPanel:
+    pickup: Recogida
+    delivery: Entrega
+    postcode: Código postal
+    agency: Agencia
+    warehouse: Almacén
+    query: Consultar
+    noEventsWarning: No hay servicio para la zona especificada
+zoneClosingTable:
+    id: Id
+    name: Nombre
+    agency: Agencia
+    closing: Cierre
+    preview: Vista previa
+    price: Precio
+    zones: Zonas
+Search zones: Buscar zonas
+You can search by zone reference: Puedes buscar por referencia de la zona
+warehouses:
+    delete: Eliminar
+    deleteTitle: Este elemento será eliminado
+    deleteSubtitle: ¿Seguro que quieres continuar?
+    warehouse: Almacén
+    add: Añadir
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 5ef5945f3..092d60639 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -87,7 +87,7 @@ export default {
                     name: 'CustomerNotifications',
                     meta: {
                         title: 'notifications',
-                        icon: 'notifications',
+                        icon: 'campaign',
                     },
                     component: () =>
                         import(
@@ -99,7 +99,7 @@ export default {
                     name: 'CustomerDefaulter',
                     meta: {
                         title: 'defaulter',
-                        icon: 'vn:risk',
+                        icon: 'vn:defaulter',
                     },
                     component: () =>
                         import('src/pages/Customer/Defaulter/CustomerDefaulter.vue'),
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 7fff2f2e5..38bcd54d5 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -18,6 +18,7 @@ import Parking from './parking';
 import Agency from './agency';
 import ItemType from './itemType';
 import Zone from './zone';
+import Monitor from './monitor';
 
 export default [
     Item,
@@ -40,4 +41,5 @@ export default [
     Agency,
     ItemType,
     Zone,
+    Monitor,
 ];
diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js
new file mode 100644
index 000000000..6c388a474
--- /dev/null
+++ b/src/router/modules/monitor.js
@@ -0,0 +1,36 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/monitor',
+    name: 'Monitor',
+    meta: {
+        title: 'monitors',
+        icon: 'grid_view',
+        moduleName: 'Monitor',
+    },
+    component: RouterView,
+    redirect: { name: 'MonitorMain' },
+    menus: {
+        main: ['MonitorList'],
+        card: [],
+    },
+    children: [
+        {
+            path: '',
+            name: 'MonitorMain',
+            component: () => import('src/pages/Monitor/MonitorMain.vue'),
+            redirect: { name: 'MonitorList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'MonitorList',
+                    meta: {
+                        title: 'list',
+                        icon: 'grid_view',
+                    },
+                    component: () => import('src/pages/Monitor/MonitorList.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index eb6c1b6d2..6cb7291dc 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
-        card: ['TicketBoxing', 'TicketSms'],
+        card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
     },
     children: [
         {
@@ -66,6 +66,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketBasicData.vue'),
                 },
+                {
+                    name: 'TicketSale',
+                    path: 'sale',
+                    meta: {
+                        title: 'sale',
+                        icon: 'vn:lines',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketSale.vue'),
+                },
                 {
                     path: 'boxing',
                     name: 'TicketBoxing',
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index d4d3bc3e7..384978d13 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -22,6 +22,7 @@ export default {
             'WorkerCalendar',
             'WorkerDms',
             'WorkerTimeControl',
+            'WorkerLocker',
         ],
         departmentCard: ['BasicData'],
     },
@@ -167,6 +168,15 @@ export default {
                     component: () =>
                         import('src/pages/Worker/Card/WorkerTimeControl.vue'),
                 },
+                {
+                    name: 'WorkerLocker',
+                    path: 'locker',
+                    meta: {
+                        title: 'locker',
+                        icon: 'lock',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerLocker.vue'),
+                },
             ],
         },
     ],
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index 079dfaa84..b79c430e5 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -11,58 +11,54 @@ export default {
     component: RouterView,
     redirect: { name: 'ZoneMain' },
     menus: {
-        main: [
-            /*'ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'*/
-        ],
-        card: [
-            //
-        ],
+        main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingList'],
+        card: ['ZoneBasicData', 'ZoneWarehouses', 'ZoneHistory', 'ZoneLocations'],
     },
     children: [
-        // {
-        // path: '/zone',
-        // name: 'ZoneMain',
-        // component: () => import('src/pages/Zone/ZoneMain.vue'),
-        // redirect: { name: 'ZoneList' },
-        // children: [
-        //     {
-        //         path: 'list',
-        //         name: 'ZoneList',
-        //         meta: {
-        //             title: 'zonesList',
-        //             icon: 'vn:zone',
-        //         },
-        //         component: () => import('src/pages/Zone/ZoneList.vue'),
-        //     },
-        // {
-        //     path: 'create',
-        //     name: 'ZoneCreate',
-        //     meta: {
-        //         title: 'zoneCreate',
-        //         icon: 'create',
-        //     },
-        //     component: () => import('src/pages/Zone/ZoneCreate.vue'),
-        // },
-        // {
-        //     path: ':id/edit',
-        //     name: 'ZoneEdit',
-        //     meta: {
-        //         title: 'zoneEdit',
-        //         icon: 'edit',
-        //     },
-        //     component: () => import('src/pages/Zone/ZoneCreate.vue'),
-        // },
-        // {
-        //     path: 'counter',
-        //     name: 'ZoneCounter',
-        //     meta: {
-        //         title: 'zoneCounter',
-        //         icon: 'add_circle',
-        //     },
-        //     component: () => import('src/pages/Zone/ZoneCounter.vue'),
-        // },
-        // ],
-        // },
+        {
+            path: '/zone',
+            name: 'ZoneMain',
+            component: () => import('src/pages/Zone/ZoneMain.vue'),
+            redirect: { name: 'ZoneList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'ZoneList',
+                    meta: {
+                        title: 'zonesList',
+                        icon: 'vn:zone',
+                    },
+                    component: () => import('src/pages/Zone/ZoneList.vue'),
+                },
+                {
+                    path: 'delivery-days',
+                    name: 'ZoneDeliveryDays',
+                    meta: {
+                        title: 'deliveryDays',
+                        icon: 'vn:calendar',
+                    },
+                    component: () => import('src/pages/Zone/ZoneDeliveryDays.vue'),
+                },
+                {
+                    path: 'create',
+                    name: 'ZoneCreate',
+                    meta: {
+                        title: 'zoneCreate',
+                        icon: 'create',
+                    },
+                    component: () => import('src/pages/Zone/ZoneCreate.vue'),
+                },
+                {
+                    path: ':id/edit',
+                    name: 'ZoneEdit',
+                    meta: {
+                        title: 'zoneEdit',
+                        icon: 'edit',
+                    },
+                    component: () => import('src/pages/Zone/ZoneCreate.vue'),
+                },
+            ],
+        },
         {
             name: 'ZoneCard',
             path: ':id',
@@ -78,82 +74,42 @@ export default {
                     },
                     component: () => import('src/pages/Zone/Card/ZoneSummary.vue'),
                 },
-                // {
-                //     path: '/zone/delivery',
-                //     name: 'ZoneDeliveryMain',
-                //     component: () => import('src/pages/Zone/ZoneMain.vue'),
-                //     redirect: { name: 'ZoneDeliveryList' },
-                //     children: [
-                //         {
-                //             path: 'list',
-                //             name: 'ZoneDeliveryList',
-                //             meta: {
-                //                 title: 'deliveryList',
-                //                 icon: 'today',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Delivery/ZoneDeliveryList.vue'),
-                //         },
-                //         {
-                //             path: 'create',
-                //             name: 'ZoneDeliveryCreate',
-                //             meta: {
-                //                 title: 'deliveryCreate',
-                //                 icon: 'create',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Delivery/ZoneDeliveryCreate.vue'),
-                //         },
-                //         {
-                //             path: ':id/edit',
-                //             name: 'ZoneDeliveryEdit',
-                //             meta: {
-                //                 title: 'deliveryEdit',
-                //                 icon: 'edit',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Delivery/ZoneDeliveryCreate.vue'),
-                //         },
-                //     ],
-                // },
-                // {
-                //     path: '/zone/upcoming',
-                //     name: 'ZoneUpcomingMain',
-                //     component: () => import('src/pages/Zone/ZoneMain.vue'),
-                //     redirect: { name: 'ZoneUpcomingList' },
-                //     children: [
-                //         {
-                //             path: 'list',
-                //             name: 'ZoneUpcomingList',
-                //             meta: {
-                //                 title: 'upcomingList',
-                //                 icon: 'today',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingList.vue'),
-                //         },
-                //         {
-                //             path: 'create',
-                //             name: 'ZoneUpcomingCreate',
-                //             meta: {
-                //                 title: 'upcomingCreate',
-                //                 icon: 'create',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue'),
-                //         },
-                //         {
-                //             path: ':id/edit',
-                //             name: 'ZoneUpcomingEdit',
-                //             meta: {
-                //                 title: 'upcomingEdit',
-                //                 icon: 'edit',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue'),
-                //         },
-                //     ],
-                // },
+                {
+                    name: 'ZoneBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneBasicData.vue'),
+                },
+                {
+                    name: 'ZoneLocations',
+                    path: 'location',
+                    meta: {
+                        title: 'locations',
+                        icon: 'vn:greuge',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
+                },
+                {
+                    name: 'ZoneWarehouses',
+                    path: 'warehouses',
+                    meta: {
+                        title: 'warehouses',
+                        icon: 'home',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneWarehouses.vue'),
+                },
+                {
+                    name: 'ZoneHistory',
+                    path: 'history',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
+                },
             ],
         },
     ],
diff --git a/src/router/routes.js b/src/router/routes.js
index 04780ee17..6a0430d51 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -18,6 +18,7 @@ import roadmap from 'src/router/modules/roadmap';
 import parking from 'src/router/modules/parking';
 import agency from 'src/router/modules/agency';
 import zone from 'src/router/modules/zone';
+import monitor from 'src/router/modules/monitor';
 
 const routes = [
     {
@@ -65,6 +66,7 @@ const routes = [
             shelving,
             invoiceOut,
             invoiceIn,
+            monitor,
             wagon,
             order,
             route,
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index ee1e04e9b..263a9dec8 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -15,6 +15,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'travel',
         'invoiceOut',
         'invoiceIn',
+        'monitor',
         'supplier',
         'claim',
         'route',
@@ -31,7 +32,6 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         for (const module of modules) {
             const moduleDef = routes.find((route) => toLowerCamel(route.name) === module);
             if (!moduleDef) continue;
-
             const item = addMenuItem(module, moduleDef, modulesRoutes.value);
             if (!item) continue;
 
diff --git a/src/stores/useWeekdayStore.js b/src/stores/useWeekdayStore.js
index a7b0496c6..ac17356ae 100644
--- a/src/stores/useWeekdayStore.js
+++ b/src/stores/useWeekdayStore.js
@@ -85,6 +85,27 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
         return locales;
     });
 
+    /**
+     * Transforms weekday set into an array whose indexes are weekday index
+     * with selected days set to %true.
+     *
+     * @param {String} weekDays Weekday codes separated by commas
+     * @return {Array<Boolean>} Array with selected days set to %true
+     */
+    const fromSet = (_weekDays) => {
+        let wdays = [];
+
+        if (_weekDays) {
+            let codes = _weekDays.split(',');
+            for (let code of codes) {
+                let data = weekdaysMap[code];
+                if (data) wdays[data.index] = true;
+            }
+        }
+
+        return wdays;
+    };
+
     return {
         initStore,
         weekdaysMap,
@@ -93,5 +114,6 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
         weekdays,
         monthCodes,
         getLocaleMonths,
+        fromSet,
     };
 });
diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index f373bad8a..d1cddd0e7 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -1,13 +1,13 @@
 const locationOptions = '[role="listbox"] > div.q-virtual-scroll__content > .q-item';
 describe('VnLocation', () => {
     const dialogInputs = '.q-dialog label input';
-    describe('Create', () => {
+    describe('Worker Create', () => {
         const inputLocation =
-            '.q-form .q-card> :nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
+            '.q-form .q-card > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
-            cy.visit('/#/worker/create');
+            cy.visit('/#/worker/create', { timeout: 5000 });
             cy.waitForElement('.q-card');
         });
         it('Show all options', function () {
@@ -25,34 +25,35 @@ describe('VnLocation', () => {
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('ecuador');
             cy.get(locationOptions).should('have.length.at.least', 1);
-            cy.get(`${locationOptions}:nth-child(1)`).click();
-            cy.get(inputLocation + '> :nth-child(2) > .q-icon').click();
+            cy.get(
+                '.q-form .q-card > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+            ).click();
         });
     });
     describe('Fiscal-data', () => {
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
-            cy.visit('/#/supplier/567/fiscal-data', { timeout: 2000 });
-            cy.waitForElement('.q-card');
+            cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
+            cy.waitForElement('.q-form');
         });
         it('Create postCode', function () {
             cy.get(
-                ':nth-child(6) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+                ':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
             ).click();
             cy.get('.q-card > h1').should('have.text', 'New postcode');
             cy.get(dialogInputs).eq(0).clear('12');
             cy.get(dialogInputs).eq(0).type('1234453');
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4)   > .q-select > .q-field__inner > .q-field__control ',
                 'Valencia'
             );
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5)   > .q-select > .q-field__inner > .q-field__control ',
                 'Province one'
             );
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(6)  > .q-select > .q-field__inner > .q-field__control ',
                 'España'
             );
             cy.get('.q-mt-lg > .q-btn--standard').click();
diff --git a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
index fc989d6c5..963dda3e2 100644
--- a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
@@ -1,7 +1,8 @@
 /// <reference types="cypress" />
 describe('InvoiceInBasicData', () => {
-    const selects = '.q-form .q-card>:nth-child(1) > :nth-child(1) > .q-field';
-    const appendBtns = 'label button';
+    const formInputs = '.q-form > .q-card input';
+    const firstFormSelect = '.q-card > .vn-row:nth-child(1) > .q-select';
+    const appendBtns = '.q-form label button';
     const dialogAppendBtns = '.q-dialog label button';
     const dialogInputs = '.q-dialog input';
     const dialogActionBtns = '.q-card__actions button';
@@ -12,15 +13,14 @@ describe('InvoiceInBasicData', () => {
     });
 
     it('should edit the provideer and supplier ref', () => {
-        cy.selectOption(selects, 'Bros');
-
+        cy.selectOption(firstFormSelect, 'Bros');
         cy.get('[title="Reset"]').click();
         cy.get(appendBtns).eq(0).click();
-        cy.get('input').eq(2).type(4739);
+        cy.get(formInputs).eq(1).type(4739);
         cy.saveCard();
 
-        cy.get(`${selects} input`).eq(0).invoke('val').should('eq', 'Plants nick');
-        cy.get('input').eq(2).invoke('val').should('eq', '4739');
+        cy.get(`${firstFormSelect} input`).invoke('val').should('eq', 'Plants nick');
+        cy.get(formInputs).eq(1).invoke('val').should('eq', '4739');
     });
 
     it('should edit the dms data', () => {
diff --git a/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js b/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
index f39c80809..124b60c34 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 describe('InvoiceInDueDay', () => {
-    const inputs = 'label input';
+    const amountInput = 'tbody > tr:nth-child(1) td:nth-child(4)';
     const addBtn = '.q-page-sticky > div > .q-btn > .q-btn__content';
 
     beforeEach(() => {
@@ -9,7 +9,7 @@ describe('InvoiceInDueDay', () => {
     });
 
     it('should update the amount', () => {
-        cy.get(inputs).eq(3).type(23);
+        cy.get(amountInput).type('{selectall}{backspace}23');
         cy.saveCard();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
diff --git a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
index 306c0b8c0..c87fd4315 100644
--- a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
@@ -17,10 +17,7 @@ describe('InvoiceInIntrastat', () => {
         cy.saveCard();
         cy.visit(`/#/invoice-in/1/intrastat`);
 
-        cy.getValue(firstLineCode).should(
-            'equal',
-            'Plantas vivas: Esqueje/injerto, Vid'
-        );
+        cy.getValue(firstLineCode).should('equal', 'Plantas vivas: Esqueje/injerto, Vid');
     });
 
     it('should add a new row', () => {
@@ -33,6 +30,6 @@ describe('InvoiceInIntrastat', () => {
     });
 
     it('should remove the first line', () => {
-        cy.removeRow(1);
+        cy.removeRow(2);
     });
 });
diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index ff891399b..389be671c 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -29,7 +29,7 @@ describe('InvoiceInVat', () => {
     });
 
     it('should remove the first line', () => {
-        cy.removeRow(1);
+        cy.removeRow(2);
     });
 
     it('should throw an error if there are fields undefined', () => {
diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 22401f0b4..fc920f346 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 describe('Ticket descriptor', () => {
-    const toCloneOpt = '.q-list > :nth-child(5)';
+    const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
 
diff --git a/test/cypress/integration/worker/workerLocker.spec.js b/test/cypress/integration/worker/workerLocker.spec.js
new file mode 100644
index 000000000..01e74760b
--- /dev/null
+++ b/test/cypress/integration/worker/workerLocker.spec.js
@@ -0,0 +1,19 @@
+describe('WorkerList', () => {
+    const workerId = 1109;
+    const lockerCode = '201A';
+    const input = '.q-card input';
+    const firstOpt = '[role="listbox"] .q-item:nth-child(1)';
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('productionBoss');
+        cy.visit(`/#/worker/${workerId}/locker`);
+    });
+
+    it('should allocates a locker', () => {
+        cy.get(input).click();
+        cy.get(input).type(lockerCode);
+        cy.get(firstOpt).click();
+        cy.saveCard();
+        cy.get(input).invoke('val').should('eq', lockerCode);
+    });
+});
diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
new file mode 100644
index 000000000..9af994a70
--- /dev/null
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -0,0 +1,24 @@
+describe('WorkerPda', () => {
+    const deviceProductionField =
+        '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/worker/1110/pda`);
+    });
+
+    it('assign pda', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(deviceProductionField).type('{downArrow}{enter}');
+        cy.get('.vn-row > #simSerialNumber').type('123{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
+
+    it('delete pda', () => {
+        cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
+        cy.get(
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+        ).click();
+        cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
+    });
+});
diff --git a/test/vitest/__tests__/components/common/VnSearchBar.spec.js b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
deleted file mode 100644
index 0938ae9c0..000000000
--- a/test/vitest/__tests__/components/common/VnSearchBar.spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-// Probar a importar como plugin vue-router en archivo helper
-describe('VnSearchBar', () => {
-    let vm;
-    let wrapper;
-    let pushSpy;
-
-    beforeAll(() => {
-        wrapper = createWrapper(VnSearchbar, {
-            propsData: {
-                dataKey: 'CustomerList',
-                label: 'Search customer',
-                info: 'Info customer',
-            },
-        });
-        vm = wrapper.vm;
-        vm.router.currentRoute.value.matched = [
-            {
-                path: '/',
-            },
-            {
-                path: '/customer',
-            },
-            {
-                path: '/customer/:id',
-            },
-            {
-                path: '/customer/:id/basic-data',
-            },
-        ];
-
-        pushSpy = vi.spyOn(vm.router, 'push');
-        vi.spyOn(vm.arrayData, 'applyFilter');
-    });
-
-    beforeEach(() => (vm.store.data = [{ id: 1112, name: 'Trash' }]));
-    afterEach(() => vi.clearAllMocks());
-
-    it('should be defined', async () => {
-        expect(vm.searchText).toBeDefined();
-        expect(vm.searchText).toEqual('');
-    });
-
-    it('should redirect to list page if there are several results', async () => {
-        vm.store.data.push({ id: 1, name: 'employee' });
-        await vm.search();
-        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/list' });
-    });
-
-    it('should redirect to list page if there is no results', async () => {
-        vm.store.data.pop();
-        await vm.search();
-        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/list' });
-    });
-
-    it('should redirect to basic-data page if there is only one result', async () => {
-        await vm.search();
-        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/1112/basic-data' });
-    });
-});
diff --git a/test/vitest/__tests__/composables/useRedirect.spec.js b/test/vitest/__tests__/composables/useRedirect.spec.js
new file mode 100644
index 000000000..ce56189b9
--- /dev/null
+++ b/test/vitest/__tests__/composables/useRedirect.spec.js
@@ -0,0 +1,52 @@
+import { vi, describe, expect, it, beforeEach, beforeAll } from 'vitest';
+import useRedirect from 'src/composables/useRedirect';
+import { useRouter } from 'vue-router';
+
+vi.mock('vue-router');
+
+describe('useRedirect', () => {
+    useRouter.mockReturnValue({
+        push: vi.fn(),
+        currentRoute: {
+            value: {
+                matched: [
+                    { path: '/' },
+                    { path: '/customer' },
+                    { path: '/customer/:id' },
+                    { path: '/customer/:id/basic-data' },
+                ],
+            },
+        },
+    });
+    const data = [];
+    let navigate;
+    let spy;
+
+    beforeAll(() => {
+        const { navigate: navigateFn } = useRedirect();
+        navigate = navigateFn;
+        spy = useRouter().push;
+    });
+
+    beforeEach(() => {
+        data.length = 0;
+        spy.mockReset();
+    });
+
+    it('should redirect to list page if there are several results', async () => {
+        data.push({ id: 1, name: 'employee' }, { id: 2, name: 'boss' });
+        navigate(data, {});
+        expect(spy).toHaveBeenCalledWith({ path: '/customer/' });
+    });
+
+    it('should redirect to list page if there is no results', async () => {
+        navigate(data, {});
+        expect(spy).toHaveBeenCalledWith({ path: '/customer/' });
+    });
+
+    it('should redirect to basic-data page if there is only one result', async () => {
+        data.push({ id: 1, name: 'employee' });
+        navigate(data, {});
+        expect(spy).toHaveBeenCalledWith({ path: '/customer/1/basic-data' });
+    });
+});