Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection

2024-06-03 15:21:44 +02:00 · 2024-06-03 15:21:44 +02:00 · b93b630c6a
parent e1bf3f5404 76f858ba7e
commit b93b630c6a
251 changed files with 13110 additions and 6164 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,12 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [2420.01]

+### Added
+
+-   (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto
+
 ## [2418.01]

 ## [2416.01] - 2024-04-18

 ### 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
--- a/12
+++ b/12
@ -54,7 +54,6 @@ pipeline {
    }
    environment {
        PROJECT_NAME = 'lilium'
-        STACK_NAME   = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
    }
    stages {
        stage('Install') {
@ -104,15 +103,18 @@ pipeline {
            when {
                expression { PROTECTED_BRANCH }
            }
-            environment {
-                DOCKER_HOST = "${env.SWARM_HOST}"
-            }
            steps {
                script {
                    def packageJson = readJSON file: 'package.json'
                    env.VERSION = packageJson.version
                }
-                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
+                withKubeConfig([
+                    serverUrl: "$KUBERNETES_API",
+                    credentialsId: 'kubernetes',
+                    namespace: 'lilium'
+                ]) {
+                    sh 'kubectl set image deployment/lilium-$BRANCH_NAME lilium-$BRANCH_NAME=$REGISTRY/salix-frontend:$VERSION'
+                }
            }
        }
    }
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,17 +1,7 @@
 version: '3.7'
 services:
  main:
-    image: registry.verdnatura.es/salix-frontend:${BRANCH_NAME:?}
+    image: registry.verdnatura.es/salix-frontend:${VERSION:?}
    build:
      context: .
      dockerfile: ./Dockerfile
-    ports:
-      - 4000
-    deploy:
-      replicas: ${FRONT_REPLICAS:?}
-      placement:
-        constraints:
-          - node.role == worker
-      resources:
-        limits:
-          memory: 1G
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-front",
-    "version": "24.22.0",
+    "version": "24.24.3",
    "description": "Salix frontend",
    "productName": "Salix",
    "author": "Verdnatura",
--- a/quasar.config.js
+++ b/quasar.config.js
@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
        // app boot file (/src/boot)
        // --> boot files are part of "main.js"
        // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.defaults'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],

        // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
        css: ['app.scss'],
--- 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,15 +53,12 @@ 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')"
@ -74,7 +66,6 @@ onMounted(async () => {
                    :required="true"
                    :rules="validate('bankEntity.bic')"
                />
-                </div>
            </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')"
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@ -48,7 +48,11 @@ const onDataSaved = async (formData, requestResponse) => {
    />
    <FetchData
        url="Tickets"
-        :filter="{ fields: ['id', 'nickname'], order: 'shipped DESC', limit: 30 }"
+        :filter="{
+            fields: ['id', 'nickname'],
+            where: { refFk: null },
+            order: 'shipped DESC',
+        }"
        @on-fetch="(data) => (ticketsOptions = data)"
        auto-load
    />
@ -72,7 +76,6 @@ 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"
@ -86,18 +89,14 @@ const onDataSaved = async (formData, requestResponse) => {
                        <QItem v-bind="scope.itemProps">
                            <QItemSection>
                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                    <QItemLabel caption>{{
-                                        scope.opt?.nickname
-                                    }}</QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
                            </QItemSection>
                        </QItem>
                    </template>
                </VnSelect>
-                </div>
                <span class="row items-center" style="max-width: max-content">{{
                    t('Or')
                }}</span>
-                <div class="col">
                <VnSelect
                    :label="t('Client')"
                    :options="clientsOptions"
@ -107,13 +106,9 @@ const onDataSaved = async (formData, requestResponse) => {
                    v-model="data.clientFk"
                    @update:model-value="data.ticketFk = null"
                />
-                </div>
-                <div class="col">
                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
-                </div>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <VnSelect
                    :label="t('Serial')"
                    :options="invoiceOutSerialsOptions"
@ -123,8 +118,6 @@ const onDataSaved = async (formData, requestResponse) => {
                    v-model="data.serial"
                    :required="true"
                />
-                </div>
-                <div class="col">
                <VnSelect
                    :label="t('Area')"
                    :options="taxAreasOptions"
@ -134,7 +127,6 @@ const onDataSaved = async (formData, requestResponse) => {
                    v-model="data.taxArea"
                    :required="true"
                />
-                </div>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
                <VnInput
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@ -40,14 +40,11 @@ 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"
@ -57,7 +54,6 @@ const onDataSaved = (dataSaved) => {
                    v-model="data.provinceFk"
                    :rules="validate('city.provinceFk')"
                />
-                </div>
            </VnRow>
        </template>
    </FormModelPopup>
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@ -30,18 +30,18 @@ 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);
@ -92,14 +92,11 @@ 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"
@ -111,15 +108,11 @@ const onProvinceCreated = async ({ name }, formData) => {
                    :roles-allowed-to-create="['deliveryAssistant']"
                >
                    <template #form>
-                            <CreateNewCityForm
-                                @on-data-saved="onCityCreated($event, data)"
-                            />
+                        <CreateNewCityForm @on-data-saved="onCityCreated($event, data)" />
                    </template>
                </VnSelectDialog>
-                </div>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-xl">
-                <div class="col">
                <VnSelectDialog
                    :label="t('Province')"
                    :options="provincesOptions"
@ -134,21 +127,20 @@ const onProvinceCreated = async ({ name }, formData) => {
                        <CreateNewProvinceForm
                            @on-data-saved="onProvinceCreated($event, data)"
                        />
-                        </template>
-                    </VnSelectDialog>
-                </div>
-                <div class="col">
-                    <VnSelect
+                    </template> </VnSelectDialog
+            ></VnRow>
+            <VnRow class="row q-gutter-md q-mb-xl"
+                ><VnSelect
                    :label="t('Country')"
                    :options="countriesOptions"
                    hide-selected
-                        option-label="country"
+                    option-label="name"
                    option-value="id"
                    v-model="data.countryFk"
                    :rules="validate('postcode.countryFk')"
                />
-                </div> </VnRow
-        ></template>
+            </VnRow>
+        </template>
    </FormModelPopup>
 </template>

--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@ -40,14 +40,11 @@ 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"
@ -57,7 +54,6 @@ const onDataSaved = (dataSaved) => {
                    v-model="data.autonomyFk"
                    :rules="validate('province.autonomyFk')"
                />
-                </div>
            </VnRow>
        </template>
    </FormModelPopup>
--- a/src/components/CreateThermographForm.vue
+++ b/src/components/CreateThermographForm.vue
@ -54,16 +54,12 @@ 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"
@ -74,10 +70,8 @@ const onDataSaved = (dataSaved) => {
                    :required="true"
                    :rules="validate('thermograph.model')"
                />
-                </div>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-xl">
-                <div class="col">
                <VnSelect
                    :label="t('Warehouse')"
                    :options="warehousesOptions"
@ -87,8 +81,6 @@ const onDataSaved = (dataSaved) => {
                    v-model="data.warehouseId"
                    :required="true"
                />
-                </div>
-                <div class="col">
                <VnSelect
                    :label="t('Temperature')"
                    :options="temperaturesOptions"
@ -98,7 +90,6 @@ const onDataSaved = (dataSaved) => {
                    v-model="data.temperatureFk"
                    :required="true"
                />
-                </div>
            </VnRow>
        </template>
    </FormModelPopup>
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@ -1,6 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@ -10,6 +11,7 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';

+const { push } = useRouter();
 const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
@ -60,6 +62,11 @@ const $props = defineProps({
        type: Function,
        default: null,
    },
+    goTo: {
+        type: String,
+        default: '',
+        description: 'It is used for redirect on click "save and continue"',
+    },
 });

 const isLoading = ref(false);
@ -81,6 +88,7 @@ defineExpose({
    hasChanges,
    saveChanges,
    getChanges,
+    formData,
 });

 async function fetch(data) {
@ -127,6 +135,11 @@ async function onSubmit() {
    await saveChanges($props.saveFn ? formData.value : null);
 }

+async function onSumbitAndGo() {
+    await onSubmit();
+    push({ path: $props.goTo });
+}
+
 async function saveChanges(data) {
    if ($props.saveFn) {
        $props.saveFn(data, getChanges);
@ -309,7 +322,40 @@ watch(formUrl, async () => {
                :title="t('globals.reset')"
                v-if="$props.defaultReset"
            />
+            <QBtnDropdown
+                v-if="$props.goTo && $props.defaultSave"
+                @click="onSumbitAndGo"
+                :label="tMobile('globals.saveAndContinue')"
+                :title="t('globals.saveAndContinue')"
+                :disable="!hasChanges"
+                color="primary"
+                icon="save"
+                split
+            >
+                <QList>
+                    <QItem
+                        color="primary"
+                        clickable
+                        v-close-popup
+                        @click="onSubmit"
+                        :title="t('globals.save')"
+                    >
+                        <QItemSection>
+                            <QItemLabel>
+                                <QIcon
+                                    name="save"
+                                    color="white"
+                                    class="q-mr-sm"
+                                    size="sm"
+                                />
+                                {{ t('globals.save').toUpperCase() }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </QList>
+            </QBtnDropdown>
            <QBtn
+                v-else-if="!$props.goTo && $props.defaultSave"
                :label="tMobile('globals.save')"
                ref="saveButtonRef"
                color="primary"
@ -317,7 +363,6 @@ watch(formUrl, async () => {
                @click="onSubmit"
                :disable="!hasChanges"
                :title="t('globals.save')"
-                v-if="$props.defaultSave"
            />
            <slot name="moreAfterActions" />
        </QBtnGroup>
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@ -246,16 +246,13 @@ 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>
                    </VnRow>
                    <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
                        <QFile
                            v-if="uploadMethodSelected === 'computer'"
                            ref="inputFileRef"
@ -289,10 +286,8 @@ const makeRequest = async () => {
                            @update:model-value="updatePhotoPreview($event)"
                            placeholder="https://"
                        />
-                        </div>
                    </VnRow>
                    <VnRow class="row q-gutter-md q-mb-md">
-                        <div class="col">
                        <VnSelect
                            :label="t('Orientation')"
                            :options="viewportTypes"
@ -300,7 +295,6 @@ const makeRequest = async () => {
                            option-label="description"
                            v-model="viewportSelection"
                        />
-                        </div>
                    </VnRow>
                    <div class="q-mt-lg row justify-end">
                        <QBtn
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@ -24,7 +24,7 @@ const $props = defineProps({
        default: '',
    },
    limit: {
-        type: String,
+        type: [String, Number],
        default: '',
    },
    params: {
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@ -152,19 +152,8 @@ 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">
+                <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"
@ -173,8 +162,6 @@ const selectItem = ({ id }) => {
                    option-value="id"
                    v-model="itemFilterParams.producerFk"
                />
-                </div>
-                <div class="col">
                <VnSelect
                    :label="t('entry.buys.type')"
                    :options="ItemTypesOptions"
@ -183,8 +170,6 @@ const selectItem = ({ id }) => {
                    option-value="id"
                    v-model="itemFilterParams.typeFk"
                />
-                </div>
-                <div class="col">
                <VnSelect
                    :label="t('entry.buys.color')"
                    :options="InksOptions"
@ -193,7 +178,6 @@ const selectItem = ({ id }) => {
                    option-value="id"
                    v-model="itemFilterParams.inkFk"
                />
-                </div>
            </VnRow>
            <div class="q-mt-lg row justify-end">
                <QBtn
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@ -145,7 +145,6 @@ 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"
@ -154,8 +153,6 @@ const selectTravel = ({ id }) => {
                    option-value="id"
                    v-model="travelFilterParams.agencyModeFk"
                />
-                </div>
-                <div class="col">
                <VnSelect
                    :label="t('entry.basicData.warehouseOut')"
                    :options="warehousesOptions"
@ -164,8 +161,6 @@ const selectTravel = ({ id }) => {
                    option-value="id"
                    v-model="travelFilterParams.warehouseOutFk"
                />
-                </div>
-                <div class="col">
                <VnSelect
                    :label="t('entry.basicData.warehouseIn')"
                    :options="warehousesOptions"
@ -174,19 +169,14 @@ const selectTravel = ({ id }) => {
                    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>
            </VnRow>
            <div class="q-mt-lg row justify-end">
                <QBtn
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
-import { onBeforeRouteLeave } from 'vue-router';
+import { onBeforeRouteLeave, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useState } from 'src/composables/useState';
@ -11,7 +11,9 @@ import useNotify from 'src/composables/useNotify.js';
 import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
+import { useArrayData } from 'src/composables/useArrayData';

+const { push } = useRouter();
 const quasar = useQuasar();
 const state = useState();
 const stateStore = useStateStore();
@ -74,55 +76,17 @@ const $props = defineProps({
        type: Function,
        default: null,
    },
+    goTo: {
+        type: String,
+        default: '',
+        description: 'It is used for redirect on click "save and continue"',
+    },
 });

 const emit = defineEmits(['onFetch', 'onDataSaved']);

 const componentIsRendered = ref(false);
-
-onMounted(async () => {
-    originalData.value = $props.formInitialData;
-    nextTick(() => {
-        componentIsRendered.value = true;
-    });
-
-    // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
-    state.set($props.model, $props.formInitialData);
-    if ($props.autoLoad && !$props.formInitialData) {
-        await fetch();
-    }
-
-    // Si así se desea disparamos el watcher del form después de 100ms, asi darle tiempo de que se haya cargado la data inicial
-    // para evitar que detecte cambios cuando es data inicial default
-    if ($props.observeFormChanges) {
-        setTimeout(() => {
-            startFormWatcher();
-        }, 100);
-    }
-});
-
-onBeforeRouteLeave((to, from, next) => {
-    if (hasChanges.value && $props.observeFormChanges)
-        quasar.dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('Unsaved changes will be lost'),
-                message: t('Are you sure exit without saving?'),
-                promise: () => next(),
-            },
-        });
-    else next();
-});
-
-onUnmounted(() => {
-    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
-    if (hasChanges.value) {
-        state.set($props.model, originalData.value);
-        return;
-    }
-    if ($props.clearStoreOnUnmount) state.unset($props.model);
-});
-
+const arrayData = useArrayData($props.model);
 const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
 const isResetting = ref(false);
@ -143,26 +107,72 @@ const defaultButtons = computed(() => ({
    },
    ...$props.defaultButtons,
 }));
-const startFormWatcher = () => {
+
+onMounted(async () => {
+    originalData.value = JSON.parse(JSON.stringify($props.formInitialData ?? {}));
+
+    nextTick(() => (componentIsRendered.value = true));
+
+    // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
+    state.set($props.model, $props.formInitialData);
+
+    if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch();
+    else if (arrayData.store.data) updateAndEmit(arrayData.store.data, 'onFetch');
+
+    if ($props.observeFormChanges) {
        watch(
            () => formData.value,
-        (val) => {
-            hasChanges.value = !isResetting.value && val;
+            (newVal, oldVal) => {
+                if (!oldVal) return;
+                hasChanges.value =
+                    !isResetting.value &&
+                    JSON.stringify(newVal) !== JSON.stringify(originalData.value);
                isResetting.value = false;
            },
            { deep: true }
        );
-};
+    }
+});
+
+if (!$props.url)
+    watch(
+        () => arrayData.store.data,
+        (val) => updateAndEmit(val, 'onFetch')
+    );
+
+watch(formUrl, async () => {
+    originalData.value = null;
+    reset();
+    await fetch();
+});
+
+onBeforeRouteLeave((to, from, next) => {
+    if (hasChanges.value && $props.observeFormChanges)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('Unsaved changes will be lost'),
+                message: t('Are you sure exit without saving?'),
+                promise: () => next(),
+            },
+        });
+    else next();
+});
+
+onUnmounted(() => {
+    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
+    if (hasChanges.value) return state.set($props.model, originalData.value);
+    if ($props.clearStoreOnUnmount) state.unset($props.model);
+});

 async function fetch() {
    try {
-        const { data } = await axios.get($props.url, {
+        let { data } = await axios.get($props.url, {
            params: { filter: JSON.stringify($props.filter) },
        });
-        state.set($props.model, data);
-        originalData.value = data && JSON.parse(JSON.stringify(data));
+        if (Array.isArray(data)) data = data[0] ?? {};

-        emit('onFetch', state.get($props.model));
+        updateAndEmit(data, 'onFetch');
    } catch (error) {
        state.set($props.model, {});
        originalData.value = {};
@ -170,38 +180,39 @@ async function fetch() {
 }

 async function save() {
-    if ($props.observeFormChanges && !hasChanges.value) {
-        notify('globals.noChanges', 'negative');
-        return;
-    }
-    isLoading.value = true;
+    if ($props.observeFormChanges && !hasChanges.value)
+        return notify('globals.noChanges', 'negative');

+    isLoading.value = true;
    try {
        const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
+        const method = $props.urlCreate ? 'post' : 'patch';
+        const url =
+            $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
        let response;
+
        if ($props.saveFn) response = await $props.saveFn(body);
-        else
-            response = await axios[$props.urlCreate ? 'post' : 'patch'](
-                $props.urlCreate || $props.urlUpdate || $props.url,
-                body
-            );
+        else response = await axios[method](url, body);
+
        if ($props.urlCreate) notify('globals.dataCreated', 'positive');

-        emit('onDataSaved', formData.value, response?.data);
-        originalData.value = JSON.parse(JSON.stringify(formData.value));
        hasChanges.value = false;
+        isLoading.value = false;
+
+        updateAndEmit(response?.data, 'onDataSaved');
    } catch (err) {
        console.error(err);
        notify('errors.writeRequest', 'negative');
    }
-    isLoading.value = false;
+}
+
+async function saveAndGo() {
+    await save();
+    push({ path: $props.goTo });
 }

 function reset() {
-    state.set($props.model, originalData.value);
-    originalData.value = JSON.parse(JSON.stringify(originalData.value));
-
-    emit('onFetch', state.get($props.model));
+    updateAndEmit(originalData.value, 'onFetch');
    if ($props.observeFormChanges) {
        hasChanges.value = false;
        isResetting.value = true;
@ -223,17 +234,15 @@ function filter(value, update, filterOptions) {
    );
 }

-watch(formUrl, async () => {
-    originalData.value = null;
-    reset();
-    fetch();
-});
+function updateAndEmit(val, evt) {
+    state.set($props.model, val);
+    originalData.value = val && JSON.parse(JSON.stringify(val));
+    if (!$props.url) arrayData.store.data = val;

-defineExpose({
-    save,
-    isLoading,
-    hasChanges,
-});
+    emit(evt, state.get($props.model));
+}
+
+defineExpose({ save, isLoading, hasChanges });
 </script>
 <template>
    <div class="column items-center full-width">
@ -270,10 +279,42 @@ defineExpose({
                    :disable="!hasChanges"
                    :title="t(defaultButtons.reset.label)"
                />
+                <QBtnDropdown
+                    v-if="$props.goTo"
+                    @click="saveAndGo"
+                    :label="tMobile('globals.saveAndContinue')"
+                    :title="t('globals.saveAndContinue')"
+                    :disable="!hasChanges"
+                    color="primary"
+                    icon="save"
+                    split
+                >
+                    <QList>
+                        <QItem
+                            clickable
+                            v-close-popup
+                            @click="save"
+                            :title="t('globals.save')"
+                        >
+                            <QItemSection>
+                                <QItemLabel>
+                                    <QIcon
+                                        name="save"
+                                        color="white"
+                                        class="q-mr-sm"
+                                        size="sm"
+                                    />
+                                    {{ t('globals.save').toUpperCase() }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QList>
+                </QBtnDropdown>
                <QBtn
-                    :label="tMobile(defaultButtons.save.label)"
-                    :color="defaultButtons.save.color"
-                    :icon="defaultButtons.save.icon"
+                    v-else
+                    :label="tMobile('globals.save')"
+                    color="primary"
+                    icon="save"
                    @click="save"
                    :disable="!hasChanges"
                    :title="t(defaultButtons.save.label)"
--- 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: '',
--- 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: '',
--- 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>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
                <div class="col">
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@ -83,7 +83,6 @@ const transferInvoice = async () => {
    >
        <template #form-inputs>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <VnSelect
                    :label="t('Client')"
                    :options="clientsOptions"
@ -104,8 +103,6 @@ const transferInvoice = async () => {
                        </QItem>
                    </template>
                </VnSelect>
-                </div>
-                <div class="col">
                <VnSelect
                    :label="t('Rectificative type')"
                    :options="rectificativeTypeOptions"
@ -115,10 +112,8 @@ const transferInvoice = async () => {
                    v-model="transferInvoiceParams.cplusRectificationTypeFk"
                    :required="true"
                />
-                </div>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <VnSelect
                    :label="t('Class')"
                    :options="siiTypeInvoiceOutsOptions"
@ -139,8 +134,6 @@ const transferInvoice = async () => {
                        </QItem>
                    </template>
                </VnSelect>
-                </div>
-                <div class="col">
                <VnSelect
                    :label="t('Type')"
                    :options="invoiceCorrectionTypesOptions"
@ -150,7 +143,6 @@ const transferInvoice = async () => {
                    v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
                    :required="true"
                />
-                </div>
            </VnRow>
        </template>
    </FormPopup>
--- 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>
--- a/src/components/common/RightMenu.vue
+++ 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>
--- 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;
--- 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,15 @@ 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: '' },
+    searchCustomRouteRedirect: { type: String, default: undefined },
+    searchRedirect: { type: Boolean, default: true },
 });

-const { t } = useI18n();
 const stateStore = useStateStore();
 const route = useRoute();
 const url = computed(() => {
@ -42,24 +44,32 @@ onBeforeMount(async () => {
 if (props.baseUrl) {
    onBeforeRouteUpdate(async (to, from) => {
        if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${route.params.id}`;
+            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
            await arrayData.fetch({ append: false });
        }
    });
 }
+
+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"
-    >
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar" v-if="props.searchDataKey">
+            <slot name="searchbar">
                <VnSearchbar
-            :data-key="props.searchbarDataKey"
-            :url="props.searchbarUrl"
-            :label="t(props.searchbarLabel)"
-            :info="t(props.searchbarInfo)"
+                    :data-key="props.searchDataKey"
+                    :url="props.searchUrl"
+                    :label="props.searchbarLabel"
+                    :info="props.searchbarInfo"
+                    :custom-route-redirect-name="searchCustomRouteRedirect"
+                    :redirect="searchRedirect"
                />
+            </slot>
        </Teleport>
+        <slot v-else name="searchbar" />
        <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
            <QScrollArea class="fit">
                <component :is="descriptor" />
@ -67,6 +77,12 @@ if (props.baseUrl) {
                <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 />
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@ -78,6 +78,7 @@ async function save() {
    const body = mapperDms(dms.value);
    const response = await axios.post(getUrl(), body[0], body[1]);
    emit('onDataSaved', body[1].params, response);
+    return response;
 }

 function defaultData() {
--- 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,
--- 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();
 };
@ -53,10 +45,12 @@ defineExpose({
    focus,
 });

-const inputRules = (val) => {
+const inputRules = [
+    (val) => {
        const { min } = vnInputRef.value.$attrs;
        if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
-};
+    },
+];
 </script>

 <template>
@ -71,22 +65,23 @@ const inputRules = (val) => {
            v-bind="{ ...$attrs, ...styleAttrs }"
            :type="$attrs.type"
            :class="{ required: $attrs.required }"
-            @keyup.enter="onEnterPress()"
+            @keyup.enter="emit('keyup.enter')"
            :clearable="false"
-            :rules="[inputRules]"
+            :rules="inputRules"
            :lazy-rules="true"
+            hide-bottom-space
        >
            <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>
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@ -2,6 +2,7 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import isValidDate from 'filters/isValidDate';
+import VnInput from 'components/common/VnInput.vue';

 const props = defineProps({
    modelValue: {
@ -74,7 +75,7 @@ const styleAttrs = computed(() => {
        @click="isPopupOpen = true"
    >
        <template #append>
-            <QIcon name="schedule" class="cursor-pointer">
+            <QIcon name="Schedule" class="cursor-pointer">
                <QPopupProxy
                    v-model="isPopupOpen"
                    cover
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@ -622,21 +622,6 @@ setLogTree();
            </QList>
        </div>
    </div>
-    <Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">
-        <div class="row q-gutter-x-sm">
-            <QBtn
-                flat
-                @click.stop="stateStore.toggleRightDrawer()"
-                round
-                dense
-                icon="menu"
-            >
-                <QTooltip bottom anchor="bottom right">
-                    {{ t('globals.collapseMenu') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-    </Teleport>
    <QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
        <QScrollArea class="fit text-grey-8">
            <QList dense>
--- 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: '',
@ -57,9 +61,9 @@ const $props = defineProps({
 });

 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+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 });
 }

@ -167,6 +171,7 @@ watch(modelValue, (newValue) => {
        hide-selected
        fill-input
        ref="vnSelectRef"
+        lazy-rules
        :class="{ required: $attrs.required }"
        :rules="$attrs.required ? [requiredFieldRule] : null"
        virtual-scroll-slice-size="options.length"
--- a/src/components/common/VnTitle.vue
+++ b/src/components/common/VnTitle.vue
@ -1,16 +1,16 @@
 <script setup>
-const $props = defineProps({
+defineProps({
    url: { type: String, default: null },
    text: { type: String, default: null },
    icon: { type: String, default: 'open_in_new' },
 });
 </script>
 <template>
-    <div class="titleBox">
+    <div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
        <div class="header-link">
-            <a :href="$props.url" :class="$props.url ? 'link' : 'color-vn-text'">
-                {{ $props.text }}
-                <QIcon v-if="url" :name="$props.icon" />
+            <a :href="url" :class="url ? 'link' : 'color-vn-text'">
+                {{ text }}
+                <QIcon v-if="url" :name="icon" />
            </a>
        </div>
    </div>
@ -19,7 +19,4 @@ const $props = defineProps({
 a {
    font-size: large;
 }
-.titleBox {
-    padding-bottom: 2%;
-}
 </style>
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@ -5,6 +5,7 @@ import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
+import { useRoute } from 'vue-router';

 const $props = defineProps({
    url: {
@ -15,21 +16,21 @@ const $props = defineProps({
        type: Object,
        default: null,
    },
-    module: {
-        type: String,
-        required: true,
-    },
    title: {
        type: String,
        default: '',
    },
    subtitle: {
        type: Number,
-        default: 0,
+        default: null,
    },
    dataKey: {
        type: String,
-        default: '',
+        default: null,
+    },
+    module: {
+        type: String,
+        default: null,
    },
    summary: {
        type: Object,
@ -40,21 +41,27 @@ const $props = defineProps({
 const state = useState();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const arrayData = useArrayData($props.dataKey || $props.module, {
+let arrayData;
+let store;
+let entity;
+const isLoading = ref(false);
+
+defineExpose({ getData });
+
+onBeforeMount(async () => {
+    arrayData = useArrayData($props.dataKey, {
        url: $props.url,
        filter: $props.filter,
        skip: 0,
-});
-const { store } = arrayData;
-const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
-const isLoading = ref(false);
-
-defineExpose({
-    getData,
-});
-onBeforeMount(async () => {
-    await getData();
-    watch($props, async () => await getData());
+    });
+    store = arrayData.store;
+    entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+    // It enables to load data only once if the module is the same as the dataKey
+    if ($props.dataKey !== useRoute().meta.moduleName) await getData();
+    watch(
+        () => [$props.url, $props.filter],
+        async () => await getData()
+    );
 });

 async function getData() {
@ -132,7 +139,7 @@ const emit = defineEmits(['onFetch']);
                    <QItemLabel header class="ellipsis text-h5" :lines="1">
                        <div class="title">
                            <span v-if="$props.title" :title="$props.title">
-                                {{ $props.title }}
+                                {{ entity[title] ?? $props.title }}
                            </span>
                            <slot v-else name="description" :entity="entity">
                                <span :title="entity.name">
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@ -54,6 +54,22 @@ async function fetch() {
    emit('onFetch', Array.isArray(data) ? data[0] : data);
    isLoading.value = false;
 }
+
+const showRedirectToSummaryIcon = computed(() => {
+    const exist = existSummary(route.matched);
+    return !isSummary.value && route.meta.moduleName && exist;
+});
+
+function existSummary(routes) {
+    const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`);
+    if (hasSummary) return hasSummary;
+    for (const current of routes) {
+        if (current.path != '/' && current.children) {
+            const exist = existSummary(current.children);
+            if (exist) return exist;
+        }
+    }
+}
 </script>

 <template>
@ -64,7 +80,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 +151,9 @@ async function fetch() {
            box-shadow: none;

            .vn-label-value {
+                &.negative > .value span {
+                    color: $alert;
+                }
                display: flex;
                flex-direction: row;
                margin-top: 2px;
--- a/src/components/ui/FetchedTags.vue
+++ b/src/components/ui/FetchedTags.vue
@ -1,5 +1,7 @@
 <script setup>
-defineProps({
+import { computed } from 'vue';
+
+const $props = defineProps({
    maxLength: {
        type: Number,
        required: true,
@ -8,53 +10,40 @@ defineProps({
        type: Object,
        required: true,
    },
+    tag: {
+        type: String,
+        required: false,
+        default: 'tag',
+    },
+    value: {
+        type: String,
+        required: false,
+        default: 'value',
+    },
+});
+const tags = computed(() => {
+    return Object.keys($props.item)
+        .filter((i) => i.startsWith(`${$props.tag}`))
+        .reduce((acc, tag) => {
+            const n = tag.split(`${$props.tag}`)[1];
+            const key = `${$props.tag}${n}`;
+            const value = `${$props.value}${n}`;
+            acc[$props.item[key] ?? key] = $props.item[value] ?? '';
+            return acc;
+        }, {});
 });
 </script>
 <template>
    <div class="fetchedTags">
        <div class="wrap">
            <div
+                v-for="(val, key) in tags"
+                :key="key"
                class="inline-tag"
-                :class="{ empty: !$props.item.value5 }"
-                :title="$props.item.tag5 + ': ' + $props.item.value5"
+                :title="`${key}: ${val}`"
+                :class="{ empty: !val }"
            >
-                {{ $props.item.value5 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.tag6 }"
-                :title="$props.item.tag6 + ': ' + $props.item.value6"
-            >
-                {{ $props.item.value6 }}
-            </div>
-
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value7 }"
-                :title="$props.item.tag7 + ': ' + $props.item.value7"
-            >
-                {{ $props.item.value7 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value8 }"
-                :title="$props.item.tag8 + ': ' + $props.item.value8"
-            >
-                {{ $props.item.value8 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value9 }"
-                :title="$props.item.tag9 + ': ' + $props.item.value9"
-            >
-                {{ $props.item.value9 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value10 }"
-                :title="$props.item.tag10 + ': ' + $props.item.value10"
-            >
-                {{ $props.item.value10 }}
+                {{ val }}
            </div>
        </div>
    </div>
@ -72,7 +61,7 @@ defineProps({
    .inline-tag {
        height: 1rem;
        margin: 0.05rem;
-        color: $secondary;
+        color: $color-font-secondary;
        text-align: center;
        font-size: smaller;
        padding: 1px;
@ -83,9 +72,8 @@ defineProps({
        min-width: 4rem;
        max-width: 4rem;
    }
-
    .empty {
-        border: 1px solid $color-spacer-light;
+        border: 1px solid #2b2b2b;
    }
 }
 </style>
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@ -59,12 +59,10 @@ const containerClasses = computed(() => {
 // Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
 .q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
    background-color: $primary !important;
-    color: white !important;
 }

 .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
    background-color: $primary !important;
-    color: white !important;
 }

 .q-calendar-month__head--weekday {
@ -108,11 +106,10 @@ const containerClasses = computed(() => {
        font-size: 13px;

        &:hover {
-            background-color: var(--vn-accent-color);
+            background-color: var(--vn-label-color);
            cursor: pointer;
        }
    }
-
    .q-calendar-month__week--days > div:nth-child(6),
    .q-calendar-month__week--days > div:nth-child(7) {
        // Cambia el color de los días sábado y domingo
@ -150,7 +147,7 @@ const containerClasses = computed(() => {
    .q-calendar-month__head--workweek,
    .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
        text-transform: capitalize;
-        color: #777;
+        color: var(---color-font-secondary);
        font-weight: bold;
        font-size: 0.8rem;
        text-align: center;
--- a/src/components/ui/SkeletonForm.vue
+++ b/src/components/ui/SkeletonForm.vue
@ -1,29 +1,17 @@
 <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>
-        </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>
-        </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>
-        </div>
        <div class="row q-gutter-md">
            <QSkeleton type="QBtn" />
            <QSkeleton type="QBtn" />
--- a/src/components/ui/SkeletonSummary.vue
+++ b/src/components/ui/SkeletonSummary.vue
@ -3,39 +3,30 @@
        <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 />
@ -43,7 +34,6 @@
        <QSkeleton type="text" square />
        <QSkeleton type="text" square />
    </div>
-    </div>
 </template>

 <style lang="scss" scoped>
--- a/src/components/ui/SkeletonTable.vue
+++ b/src/components/ui/SkeletonTable.vue
@ -1,47 +1,22 @@
 <template>
    <div class="q-pa-md w">
        <div class="row q-gutter-md q-mb-md">
-            <div class="col-1">
+            <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="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>
    </div>
-    </div>
 </template>
 <style lang="scss" scoped>
 .w {
--- 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);
 }

--- 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>
--- 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;

--- 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 { onMounted, ref, watch } from 'vue';
 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,18 @@ const props = defineProps({
    },
 });

-const router = useRouter();
-const arrayData = useArrayData(props.dataKey, { ...props });
-const { store } = arrayData;
+let arrayData = useArrayData(props.dataKey, { ...props });
+let store = arrayData.store;
 const searchText = ref('');
+const { navigate } = useRedirect();
+
+watch(
+    () => props.dataKey,
+    (val) => {
+        arrayData = useArrayData(val, { ...props });
+        store = arrayData.store;
+    }
+);

 onMounted(() => {
    const params = store.userParams;
@ -81,37 +91,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 },
+    navigate(store.data, {
+        customRouteRedirectName: props.customRouteRedirectName,
+        searchText: 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 });
 }
 </script>

@ -120,7 +113,7 @@ async function search() {
        <VnInput
            id="searchbar"
            v-model="searchText"
-            :placeholder="props.label"
+            :placeholder="t(props.label)"
            dense
            standout
            autofocus
@ -139,7 +132,7 @@ async function search() {
                    name="info"
                    class="cursor-info"
                >
-                    <QTooltip>{{ props.info }}</QTooltip>
+                    <QTooltip>{{ t(props.info) }}</QTooltip>
                </QIcon>
            </template>
        </VnInput>
--- 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 }) {
--- a/src/composables/useRedirect.js
+++ 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 };
+}
--- 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() {
--- a/src/css/app.scss
+++ b/src/css/app.scss
@ -169,6 +169,13 @@ select:-webkit-autofill {

 /* q-notification row items-stretch q-notification--standard bg-negative text-white */

+.q-card,
+.q-table,
+.q-table__bottom,
+.q-drawer {
+    background-color: var(--vn-section-color);
+}
+
 input[type='number'] {
    -moz-appearance: textfield;
 }
--- a/src/css/fonts/icon.eot
+++ b/src/css/fonts/icon.eot
--- a/src/css/fonts/icon.svg
+++ b/src/css/fonts/icon.svg
--- a/src/css/fonts/icon.ttf
+++ b/src/css/fonts/icon.ttf
--- a/src/css/fonts/icon.woff
+++ b/src/css/fonts/icon.woff
--- a/src/css/fonts/selection.json
+++ b/src/css/fonts/selection.json
--- a/src/css/icons.scss
+++ b/src/css/icons.scss
@ -1,10 +1,10 @@
@font-face {
    font-family: 'icon';
-    src: url('fonts/icon.eot?2omjsr');
-    src: url('fonts/icon.eot?2omjsr#iefix') format('embedded-opentype'),
-        url('fonts/icon.ttf?2omjsr') format('truetype'),
-        url('fonts/icon.woff?2omjsr') format('woff'),
-        url('fonts/icon.svg?2omjsr#icon') format('svg');
+    src: url('fonts/icon.eot?1om04h');
+    src: url('fonts/icon.eot?1om04h#iefix') format('embedded-opentype'),
+        url('fonts/icon.ttf?1om04h') format('truetype'),
+        url('fonts/icon.woff?1om04h') format('woff'),
+        url('fonts/icon.svg?1om04h#icon') format('svg');
    font-weight: normal;
    font-style: normal;
    font-display: block;
@ -27,392 +27,410 @@
 }

 .icon-100:before {
-    content: '\e926';
+    content: '\e901';
 }
 .icon-Client_unpaid:before {
-    content: '\e925';
-}
-.icon-Client_unpaid:before {
-    content: '\e925';
+    content: '\e98c';
 }
 .icon-History:before {
-    content: '\e964';
+    content: '\e902';
 }
 .icon-Person:before {
-    content: '\e984';
+    content: '\e903';
 }
 .icon-accessory:before {
-    content: '\e948';
+    content: '\e904';
 }
 .icon-account:before {
-    content: '\e927';
+    content: '\e905';
 }
 .icon-actions:before {
-    content: '\e928';
+    content: '\e907';
 }
 .icon-addperson:before {
-    content: '\e929';
-}
-.icon-agency:before {
-    content: '\e92a';
+    content: '\e908';
 }
 .icon-agency:before {
    content: '\e92a';
 }
 .icon-agency-term:before {
-    content: '\e92b';
-}
-.icon-albaran:before {
-    content: '\e92c';
+    content: '\e909';
 }
 .icon-albaran:before {
    content: '\e92c';
 }
 .icon-anonymous:before {
-    content: '\e92d';
-}
-.icon-apps:before {
-    content: '\e92e';
-}
-.icon-artificial:before {
-    content: '\e92f';
-}
-.icon-attach:before {
-    content: '\e930';
-}
-.icon-barcode:before {
-    content: '\e932';
-}
-.icon-basket:before {
-    content: '\e933';
-}
-.icon-basketadd:before {
-    content: '\e934';
-}
-.icon-bin:before {
-    content: '\e935';
-}
-.icon-botanical:before {
-    content: '\e936';
-}
-.icon-bucket:before {
-    content: '\e937';
-}
-.icon-buscaman:before {
-    content: '\e938';
-}
-.icon-buyrequest:before {
-    content: '\e939';
-}
-.icon-calc_volum:before {
-    content: '\e93a';
-}
-.icon-calendar:before {
-    content: '\e940';
-}
-.icon-catalog:before {
-    content: '\e941';
-}
-.icon-claims:before {
-    content: '\e942';
-}
-.icon-client:before {
-    content: '\e943';
-}
-.icon-clone:before {
-    content: '\e945';
-}
-.icon-columnadd:before {
-    content: '\e946';
-}
-.icon-columndelete:before {
-    content: '\e947';
-}
-.icon-components:before {
-    content: '\e949';
-}
-.icon-consignatarios:before {
-    content: '\e94b';
-}
-.icon-control:before {
-    content: '\e94c';
-}
-.icon-credit:before {
-    content: '\e94d';
-}
-.icon-defaulter:before {
-    content: '\e94e';
-}
-.icon-deletedTicket:before {
-    content: '\e94f';
-}
-.icon-deleteline:before {
-    content: '\e950';
-}
-.icon-delivery:before {
-    content: '\e951';
-}
-.icon-deliveryprices:before {
-    content: '\e952';
-}
-.icon-details:before {
-    content: '\e954';
-}
-.icon-dfiscales:before {
-    content: '\e955';
-}
-.icon-disabled:before {
-    content: '\e965';
-}
-.icon-doc:before {
-    content: '\e956';
-}
-.icon-entry:before {
-    content: '\e958';
-}
-.icon-exit:before {
-    content: '\e959';
-}
-.icon-eye:before {
-    content: '\e95a';
-}
-.icon-fixedPrice:before {
-    content: '\e95b';
-}
-.icon-flower:before {
-    content: '\e95c';
-}
-.icon-frozen:before {
-    content: '\e95d';
-}
-.icon-fruit:before {
-    content: '\e95e';
-}
-.icon-funeral:before {
-    content: '\e95f';
-}
-.icon-grafana:before {
-    content: '\e931';
-}
-.icon-grafana:before {
-    content: '\e931';
-}
-.icon-greenery:before {
-    content: '\e91e';
-}
-.icon-greuge:before {
-    content: '\e960';
-}
-.icon-grid:before {
-    content: '\e961';
-}
-.icon-handmade:before {
-    content: '\e94a';
-}
-.icon-handmadeArtificial:before {
-    content: '\e962';
-}
-.icon-headercol:before {
-    content: '\e963';
-}
-.icon-info:before {
-    content: '\e966';
-}
-.icon-inventory:before {
-    content: '\e967';
-}
-.icon-invoice:before {
-    content: '\e969';
-}
-.icon-invoice-in:before {
-    content: '\e96a';
-}
-.icon-invoice-in-create:before {
-    content: '\e96b';
-}
-.icon-invoice-out:before {
-    content: '\e96c';
-}
-.icon-isTooLittle:before {
-    content: '\e96e';
-}
-.icon-item:before {
-    content: '\e96f';
-}
-.icon-languaje:before {
-    content: '\e912';
-}
-.icon-lines:before {
-    content: '\e971';
-}
-.icon-linesprepaired:before {
-    content: '\e972';
-}
-.icon-link-to-corrected:before {
-    content: '\e900';
-}
-.icon-link-to-correcting:before {
-    content: '\e906';
-}
-.icon-logout:before {
-    content: '\e90a';
-}
-.icon-mana:before {
-    content: '\e974';
-}
-.icon-mandatory:before {
-    content: '\e975';
-}
-.icon-net:before {
-    content: '\e976';
-}
-.icon-newalbaran:before {
-    content: '\e977';
-}
-.icon-niche:before {
-    content: '\e979';
-}
-.icon-no036:before {
-    content: '\e97a';
-}
-.icon-noPayMethod:before {
-    content: '\e97b';
-}
-.icon-notes:before {
-    content: '\e97c';
-}
-.icon-noweb:before {
-    content: '\e97e';
-}
-.icon-onlinepayment:before {
-    content: '\e97f';
-}
-.icon-package:before {
-    content: '\e980';
-}
-.icon-payment:before {
-    content: '\e982';
-}
-.icon-pbx:before {
-    content: '\e983';
-}
-.icon-pets:before {
-    content: '\e985';
-}
-.icon-photo:before {
-    content: '\e986';
-}
-.icon-plant:before {
-    content: '\e987';
-}
-.icon-polizon:before {
-    content: '\e989';
-}
-.icon-preserved:before {
-    content: '\e98a';
-}
-.icon-recovery:before {
-    content: '\e98b';
-}
-.icon-regentry:before {
-    content: '\e901';
-}
-.icon-reserva:before {
-    content: '\e902';
-}
-.icon-revision:before {
-    content: '\e903';
-}
-.icon-risk:before {
-    content: '\e904';
-}
-.icon-services:before {
-    content: '\e905';
-}
-.icon-settings:before {
-    content: '\e907';
-}
-.icon-shipment:before {
-    content: '\e908';
-}
-.icon-sign:before {
-    content: '\e909';
-}
-.icon-sms:before {
    content: '\e90b';
 }
-.icon-solclaim:before {
+.icon-apps:before {
    content: '\e90c';
 }
-.icon-solunion:before {
+.icon-artificial:before {
    content: '\e90d';
 }
-.icon-splitline:before {
+.icon-attach:before {
    content: '\e90e';
 }
-.icon-splur:before {
+.icon-barcode:before {
    content: '\e90f';
 }
-.icon-stowaway:before {
+.icon-basket:before {
    content: '\e910';
 }
-.icon-supplier:before {
+.icon-basketadd:before {
    content: '\e911';
 }
-.icon-supplierfalse:before {
+.icon-bin:before {
    content: '\e913';
 }
-.icon-tags:before {
+.icon-botanical:before {
    content: '\e914';
 }
-.icon-tax:before {
+.icon-bucket:before {
    content: '\e915';
 }
-.icon-thermometer:before {
+.icon-buscaman:before {
    content: '\e916';
 }
-.icon-ticket:before {
+.icon-buyrequest:before {
    content: '\e917';
 }
-.icon-ticketAdd:before {
+.icon-calc_volum .path1:before {
    content: '\e918';
+    color: rgb(0, 0, 0);
 }
-.icon-traceability:before {
+.icon-calc_volum .path2:before {
    content: '\e919';
+    margin-left: -1em;
+    color: rgb(0, 0, 0);
 }
-.icon-transaction:before {
-    content: '\e93b';
-}
-.icon-transaction:before {
-    content: '\e93b';
-}
-.icon-treatments:before {
+.icon-calc_volum .path3:before {
    content: '\e91c';
+    margin-left: -1em;
+    color: rgb(0, 0, 0);
 }
-.icon-trolley:before {
-    content: '\e91a';
-}
-.icon-troncales:before {
-    content: '\e91b';
-}
-.icon-unavailable:before {
+.icon-calc_volum .path4:before {
    content: '\e91d';
+    margin-left: -1em;
+    color: rgb(0, 0, 0);
 }
-.icon-volume:before {
+.icon-calc_volum .path5:before {
+    content: '\e91e';
+    margin-left: -1em;
+    color: rgb(0, 0, 0);
+}
+.icon-calc_volum .path6:before {
    content: '\e91f';
+    margin-left: -1em;
+    color: rgb(255, 255, 255);
 }
-.icon-wand:before {
+.icon-calendar:before {
    content: '\e920';
 }
-.icon-web:before {
+.icon-catalog:before {
    content: '\e921';
 }
-.icon-wiki:before {
+.icon-claims:before {
    content: '\e922';
 }
-.icon-worker:before {
+.icon-client:before {
    content: '\e923';
 }
-.icon-zone:before {
+.icon-clone:before {
    content: '\e924';
 }
+.icon-columnadd:before {
+    content: '\e925';
+}
+.icon-columndelete:before {
+    content: '\e926';
+}
+.icon-components:before {
+    content: '\e927';
+}
+.icon-consignatarios:before {
+    content: '\e928';
+}
+.icon-control:before {
+    content: '\e929';
+}
+.icon-credit:before {
+    content: '\e92b';
+}
+.icon-defaulter:before {
+    content: '\e92d';
+}
+.icon-deletedTicket:before {
+    content: '\e92e';
+}
+.icon-deleteline:before {
+    content: '\e92f';
+}
+.icon-delivery:before {
+    content: '\e930';
+}
+.icon-deliveryprices:before {
+    content: '\e932';
+}
+.icon-details:before {
+    content: '\e933';
+}
+.icon-dfiscales:before {
+    content: '\e934';
+}
+.icon-disabled:before {
+    content: '\e935';
+}
+.icon-doc:before {
+    content: '\e936';
+}
+.icon-entry:before {
+    content: '\e937';
+}
+.icon-exit:before {
+    content: '\e938';
+}
+.icon-eye:before {
+    content: '\e939';
+}
+.icon-fixedPrice:before {
+    content: '\e93a';
+}
+.icon-flower:before {
+    content: '\e93b';
+}
+.icon-frozen:before {
+    content: '\e93c';
+}
+.icon-fruit:before {
+    content: '\e93d';
+}
+.icon-funeral:before {
+    content: '\e93e';
+}
+.icon-grafana:before {
+    content: '\e906';
+}
+.icon-greenery:before {
+    content: '\e93f';
+}
+.icon-greuge:before {
+    content: '\e940';
+}
+.icon-grid:before {
+    content: '\e941';
+}
+.icon-handmade:before {
+    content: '\e942';
+}
+.icon-handmadeArtificial:before {
+    content: '\e943';
+}
+.icon-headercol:before {
+    content: '\e945';
+}
+.icon-info:before {
+    content: '\e946';
+}
+.icon-inventory:before {
+    content: '\e947';
+}
+.icon-invoice:before {
+    content: '\e968';
+    color: #5f5f5f;
+}
+.icon-invoice-in:before {
+    content: '\e949';
+}
+.icon-invoice-in-create:before {
+    content: '\e94a';
+}
+.icon-invoice-out:before {
+    content: '\e94b';
+}
+.icon-isTooLittle:before {
+    content: '\e94c';
+}
+.icon-item:before {
+    content: '\e94d';
+}
+.icon-languaje:before {
+    content: '\e970';
+}
+.icon-lines:before {
+    content: '\e94e';
+}
+.icon-linesprepaired:before {
+    content: '\e94f';
+}
+.icon-link-to-corrected:before {
+    content: '\e931';
+}
+.icon-link-to-correcting:before {
+    content: '\e944';
+}
+.icon-logout:before {
+    content: '\e973';
+}
+.icon-mana:before {
+    content: '\e950';
+}
+.icon-mandatory:before {
+    content: '\e951';
+}
+.icon-net:before {
+    content: '\e952';
+}
+.icon-newalbaran:before {
+    content: '\e954';
+}
+.icon-niche:before {
+    content: '\e955';
+}
+.icon-no036:before {
+    content: '\e956';
+}
+.icon-noPayMethod:before {
+    content: '\e958';
+}
+.icon-notes:before {
+    content: '\e959';
+}
+.icon-noweb:before {
+    content: '\e95a';
+}
+.icon-onlinepayment:before {
+    content: '\e95b';
+}
+.icon-package:before {
+    content: '\e95c';
+}
+.icon-payment:before {
+    content: '\e95d';
+}
+.icon-pbx:before {
+    content: '\e95e';
+}
+.icon-pets:before {
+    content: '\e95f';
+}
+.icon-photo:before {
+    content: '\e960';
+}
+.icon-plant:before {
+    content: '\e961';
+}
+.icon-polizon:before {
+    content: '\e962';
+}
+.icon-preserved:before {
+    content: '\e963';
+}
+.icon-recovery:before {
+    content: '\e964';
+}
+.icon-regentry:before {
+    content: '\e965';
+}
+.icon-reserva:before {
+    content: '\e966';
+}
+.icon-revision:before {
+    content: '\e967';
+}
+.icon-risk:before {
+    content: '\e969';
+}
+.icon-saysimple:before {
+    content: '\e912';
+}
+.icon-services:before {
+    content: '\e96a';
+}
+.icon-settings:before {
+    content: '\e96b';
+}
+.icon-shipment:before {
+    content: '\e96c';
+}
+.icon-sign:before {
+    content: '\e90a';
+}
+.icon-sms:before {
+    content: '\e96e';
+}
+.icon-solclaim:before {
+    content: '\e96f';
+}
+.icon-solunion:before {
+    content: '\e971';
+}
+.icon-splitline:before {
+    content: '\e972';
+}
+.icon-splur:before {
+    content: '\e974';
+}
+.icon-stowaway:before {
+    content: '\e975';
+}
+.icon-supplier:before {
+    content: '\e976';
+}
+.icon-supplierfalse:before {
+    content: '\e977';
+}
+.icon-tags:before {
+    content: '\e979';
+}
+.icon-tax:before {
+    content: '\e97a';
+}
+.icon-thermometer:before {
+    content: '\e97b';
+}
+.icon-ticket:before {
+    content: '\e97c';
+}
+.icon-ticketAdd:before {
+    content: '\e97e';
+}
+.icon-traceability:before {
+    content: '\e97f';
+}
+.icon-transaction:before {
+    content: '\e91b';
+}
+.icon-treatments:before {
+    content: '\e980';
+}
+.icon-trolley:before {
+    content: '\e900';
+}
+.icon-troncales:before {
+    content: '\e982';
+}
+.icon-unavailable:before {
+    content: '\e983';
+}
+.icon-visible_columns_Icono:before {
+    content: '\e984';
+}
+.icon-volume:before {
+    content: '\e985';
+}
+.icon-wand:before {
+    content: '\e986';
+}
+.icon-web:before {
+    content: '\e987';
+}
+.icon-wiki:before {
+    content: '\e989';
+}
+.icon-worker:before {
+    content: '\e98a';
+}
+.icon-zone:before {
+    content: '\e98b';
+}
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@ -32,7 +32,7 @@ $primary-light: lighten($primary, 35%);
 $dark-shadow-color: black;
 $layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
 $spacing-md: 16px;
-
+$color-font-secondary: #777;
 .bg-success {
    background-color: $positive;
 }
--- a/src/filters/dateRange.js
+++ b/src/filters/dateRange.js
@ -1,7 +1,7 @@
 export default function dateRange(value) {
    const minHour = new Date(value);
    minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date(value);
+    const maxHour = new Date();
    maxHour.setHours(23, 59, 59, 59);

    return [minHour, maxHour];
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -24,6 +24,7 @@ globals:
    create: Create
    edit: Edit
    save: Save
+    saveAndContinue: Save and continue
    remove: Remove
    reset: Reset
    close: Close
@ -32,6 +33,7 @@ globals:
    confirm: Confirm
    assign: Assign
    back: Back
+    downloadPdf: Download PDF
    yes: 'Yes'
    no: 'No'
    noChanges: No changes to save
@ -95,11 +97,16 @@ globals:
        agency: Agency
        workCenters: Work centers
        modes: Modes
+        zones: Zones
+        zonesList: Zones
+        deliveryList: Delivery days
+        upcomingList: Upcoming deliveries
    created: Created
    worker: Worker
    now: Now
    name: Name
    new: New
+    comment: Comment
 errors:
    statusUnauthorized: Access denied
    statusInternalServerError: An internal server error has ocurred
@ -267,6 +274,7 @@ customer:
        tableVisibleColumns:
            id: Identifier
            name: Name
+            socialName: Social name
            fi: Tax number
            salesPersonFk: Salesperson
            credit: Credit
@ -426,6 +434,7 @@ ticket:
        boxing: Boxing
        sms: Sms
        notes: Notes
+        sale: Sale
    list:
        nickname: Nickname
        state: State
@ -822,6 +831,8 @@ worker:
        log: Log
        calendar: Calendar
        timeControl: Time control
+        locker: Locker
+
    list:
        name: Name
        email: Email
@ -853,6 +864,15 @@ worker:
        role: Role
        sipExtension: Extension
        locker: Locker
+        fiDueDate: Fecha de caducidad del DNI
+        sex: Sexo
+        seniority: Antigüedad
+        fi: DNI/NIE/NIF
+        birth: Fecha de nacimiento
+        isFreelance: Autónomo
+        isSsDiscounted: Bonificación SS
+        hasMachineryAuthorized: Autorizado para llevar maquinaria
+        isDisable: Trabajador desactivado
    notificationsManager:
        activeNotifications: Active notifications
        availableNotifications: Available notifications
@ -1230,12 +1250,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:
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -24,6 +24,7 @@ globals:
    create: Crear
    edit: Modificar
    save: Guardar
+    saveAndContinue: Guardar y continuar
    remove: Eliminar
    reset: Restaurar
    close: Cerrar
@ -59,6 +60,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
@ -95,11 +97,16 @@ globals:
        agency: Agencia
        workCenters: Centros de trabajo
        modes: Modos
+        zones: Zonas
+        zonesList: Zonas
+        deliveryList: Días de entrega
+        upcomingList: Próximos repartos
    created: Fecha creación
    worker: Trabajador
    now: Ahora
    name: Nombre
    new: Nuevo
+    comment: Comentario
 errors:
    statusUnauthorized: Acceso denegado
    statusInternalServerError: Ha ocurrido un error interno del servidor
@ -265,6 +272,7 @@ customer:
        tableVisibleColumns:
            id: Identificador
            name: Nombre
+            socialName: Razón social
            fi: NIF / CIF
            salesPersonFk: Comercial
            credit: Crédito
@ -424,6 +432,7 @@ ticket:
        boxing: Encajado
        sms: Sms
        notes: Notas
+        sale: Lineas del pedido
    list:
        nickname: Alias
        state: Estado
@ -820,6 +829,7 @@ worker:
        log: Historial
        calendar: Calendario
        timeControl: Control de horario
+        locker: Taquilla
    list:
        name: Nombre
        email: Email
@ -1235,6 +1245,10 @@ zone:
        zonesList: Zonas
        deliveryList: Días de entrega
        upcomingList: Próximos repartos
+monitor:
+    pageTitles:
+        monitors: Monitores
+        list: Listado
 components:
    topbar: {}
    itemsFilterPanel:
--- 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"
    />
--- 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>
--- 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>
--- 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"
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@ -95,22 +95,17 @@ 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>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <VnSelect
                    :label="t('claim.basicData.assignedTo')"
                    v-model="data.workerFk"
@ -131,8 +126,6 @@ const statesFilter = {
                        </QAvatar>
                    </template>
                </VnSelect>
-                </div>
-                <div class="col">
                <QSelect
                    v-model="data.claimStateFk"
                    :options="claimStates"
@ -147,18 +140,14 @@ const statesFilter = {
                    :input-debounce="0"
                >
                </QSelect>
-                </div>
            </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="number"
                />
-                </div>
-                <div class="col">
                <QSelect
                    v-model="data.pickup"
                    :options="optionsList"
@ -171,7 +160,6 @@ const statesFilter = {
                    :input-debounce="0"
                >
                </QSelect>
-                </div>
            </VnRow>
        </template>
    </FormModel>
--- 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"
    />
--- 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();
--- 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 }}:
--- 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">
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@ -70,7 +70,6 @@ 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')"
@ -78,8 +77,7 @@ const filterOptions = {
                    clearable
                    v-model="data.name"
                />
-                </div>
-                <div class="col">
+
                <QSelect
                    :input-debounce="0"
                    :label="t('customer.basicData.businessType')"
@ -91,18 +89,14 @@ const filterOptions = {
                    option-value="code"
                    v-model="data.businessTypeFk"
                />
-                </div>
            </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')"
@ -118,28 +112,22 @@ const filterOptions = {
                        </QIcon>
                    </template>
                </VnInput>
-                </div>
            </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>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <QSelect
                    :input-debounce="0"
                    :label="t('customer.basicData.salesPerson')"
@ -163,23 +151,19 @@ const filterOptions = {
                        </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"
+                    :options="contactChannels"
+                    option-value="id"
+                    option-label="name"
+                    emit-value
+                    :label="t('customer.basicData.contactChannel')"
+                    map-options
+                    :rules="validate('client.contactChannelFk')"
+                    :input-debounce="0"
                />
-                </div>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <QSelect
                    :input-debounce="0"
                    :label="t('customer.basicData.previousClient')"
@ -201,7 +185,6 @@ const filterOptions = {
                        </QIcon>
                    </template>
                </QSelect>
-                </div>
            </VnRow>
        </template>
    </FormModel>
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@ -48,7 +48,6 @@ 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"
@ -57,14 +56,10 @@ const getBankEntities = (data, formData) => {
                    option-value="id"
                    v-model="data.payMethod"
                />
-                </div>
-                <div class="col">
                <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
-                </div>
            </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">
@ -72,8 +67,6 @@ const getBankEntities = (data, formData) => {
                        </QIcon>
                    </template>
                </VnInput>
-                </div>
-                <div class="col">
                <VnSelectDialog
                    :label="t('Swift / BIC')"
                    :options="bankEntitiesOptions"
@ -93,29 +86,18 @@ const getBankEntities = (data, formData) => {
                        <QItem v-bind="scope.itemProps">
                            <QItemSection v-if="scope.opt">
                                <QItemLabel
-                                        >{{ scope.opt.bic }}
-                                        {{ scope.opt.name }}</QItemLabel
+                                    >{{ scope.opt.bic }} {{ scope.opt.name }}</QItemLabel
                                >
                            </QItemSection>
                        </QItem>
                    </template>
                </VnSelectDialog>
-                </div>
            </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 core received')" v-model="data.hasCoreVnl" />
                <QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />
-                </div>
            </VnRow>
        </template>
    </FormModel>
--- 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"
    />
--- 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>
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@ -41,7 +41,6 @@ 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"
@ -55,20 +54,14 @@ function handleLocation(data, location) {
                        </QIcon>
                    </template>
                </VnInput>
-                </div>
-                <div class="col">
                <VnInput :label="t('Tax number')" clearable v-model="data.fi" />
-                </div>
            </VnRow>

            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <VnInput :label="t('Street')" clearable v-model="data.street" />
-                </div>
            </VnRow>

            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <VnSelect
                    :label="t('Sage tax type')"
                    :options="typesTaxes"
@ -77,8 +70,6 @@ function handleLocation(data, location) {
                    option-value="id"
                    v-model="data.sageTaxTypeFk"
                />
-                </div>
-                <div class="col">
                <VnSelect
                    :label="t('Sage transaction type')"
                    :options="typesTransactions"
@ -98,11 +89,9 @@ function handleLocation(data, location) {
                        </QItem>
                    </template>
                </VnSelect>
-                </div>
            </VnRow>

            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <VnLocation
                    :rules="validate('Worker.postcode')"
                    :roles-allowed-to-create="['deliveryAssistant']"
@ -111,23 +100,16 @@ function handleLocation(data, location) {
                    @update:model-value="(location) => handleLocation(data, location)"
                >
                </VnLocation>
-                </div>
            </VnRow>

-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+            <VnRow>
                <QCheckbox :label="t('Active')" v-model="data.isActive" />
-                </div>
-                <div class="col">
                <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
-                </div>
            </VnRow>

-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
+            <VnRow>
                <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
-                </div>
-                <div class="col">
+                <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">
+            <VnRow>
+                <QCheckbox :label="t('Notify by email')" v-model="data.isToBeMailed" />
                <QCheckbox
                    :label="t('Invoice by address')"
                    v-model="data.hasToInvoiceByAddress"
                />
-                </div>
            </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">
+            <VnRow>
                <QCheckbox
                    :label="t('Incoterms authorization')"
                    v-model="data.hasIncoterms"
                />
-                </div>
-                <div class="col">
                <QCheckbox
                    :label="t('Electronic invoice')"
                    v-model="data.hasElectronicInvoice"
                />
-                </div>
            </VnRow>
        </template>
    </FormModel>
--- 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" />
-
-    <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">
+    <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="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>
--- 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';

--- 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';

--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@ -49,10 +49,7 @@ 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"
@ -61,10 +58,8 @@ function handleLocation(data, location) {
                        option-value="id"
                        v-model="data.salesPersonFk"
                    />
-                    </div>
                </VnRow>
                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
                    <VnSelect
                        :label="t('Business type')"
                        :options="businessTypesOptions"
@ -73,49 +68,35 @@ function handleLocation(data, location) {
                        option-value="code"
                        v-model="data.businessTypeFk"
                    />
-                    </div>
-                    <div class="col">
                    <QInput v-model="data.fi" :label="t('Tax number')" />
-                    </div>
                </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>
                </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>
                </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)
-                            "
+                        @update:model-value="(location) => handleLocation(data, location)"
                    >
                    </VnLocation>
-                    </div>
                </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')"
@ -131,7 +112,6 @@ function handleLocation(data, location) {
                            </QIcon>
                        </template>
                    </QInput>
-                    </div>
                </VnRow>
                <QCheckbox
                    :label="t('Is equalizated')"
--- a/src/pages/Customer/CustomerMain.vue
+++ b/src/pages/Customer/CustomerMain.vue
@ -15,10 +15,3 @@ const stateStore = useStateStore();
        <RouterView></RouterView>
    </QPageContainer>
 </template>
-
-<style lang="scss">
-#searchbar,
-.search-panel {
-    width: 400px;
-}
-</style>
--- 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,18 +14,20 @@ 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';
+import axios from 'axios';
+const stateStore = useStateStore();

 const { t } = useI18n();
 const quasar = useQuasar();
+const dataRef = ref(null);

 const balanceDueTotal = ref(0);
 const selected = ref([]);
-const rows = ref([]);

 const tableColumnComponents = {
    client: {
        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
        event: () => {},
    },
    isWorker: {
@ -38,7 +40,12 @@ const tableColumnComponents = {
    },
    salesPerson: {
        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
+        event: () => {},
+    },
+    department: {
+        component: 'span',
+        props: () => {},
        event: () => {},
    },
    country: {
@ -58,7 +65,7 @@ const tableColumnComponents = {
    },
    author: {
        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
        event: () => {},
    },
    lastObservation: {
@ -81,6 +88,16 @@ const tableColumnComponents = {
        props: () => {},
        event: () => {},
    },
+    finished: {
+        component: QCheckbox,
+
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.value,
+            class: 'disabled-checkbox',
+        }),
+        event: () => {},
+    },
 };

 const columns = computed(() => [
@ -104,6 +121,13 @@ const columns = computed(() => [
        name: 'salesPerson',
        sortable: true,
    },
+    {
+        align: 'left',
+        field: 'departmentName',
+        label: t('Department'),
+        name: 'department',
+        sortable: true,
+    },
    {
        align: 'left',
        field: 'country',
@ -165,41 +189,102 @@ const columns = computed(() => [
        name: 'from',
        sortable: true,
    },
+    {
+        align: 'left',
+        field: 'finished',
+        label: t('Has recover'),
+        name: 'finished',
+    },
 ]);

-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 departments = ref(new Map());
+
+const onFetch = async (data) => {
+    const salesPersonFks = data.map((item) => item.salesPersonFk);
+    const departmentNames = salesPersonFks.map(async (salesPersonFk) => {
+        try {
+            const { data: workerDepartment } = await axios.get(
+                `WorkerDepartments/${salesPersonFk}`
+            );
+            const { data: department } = await axios.get(
+                `Departments/${workerDepartment.departmentFk}`
+            );
+            departments.value.set(salesPersonFk, department.name);
+        } catch (error) {
+            console.error('Err: ', error);
+        }
+    });
+    const recoveryData = await axios.get('Recoveries');
+
+    const recoveries = recoveryData.data.map(({ clientFk, finished }) => ({
+        clientFk,
+        finished,
+    }));
+
+    await Promise.all(departmentNames);
+
+    data.forEach((item) => {
+        item.departmentName = departments.value.get(item.salesPersonFk);
+        item.isWorker = item.businessTypeFk === 'worker';
+        const recovery = recoveries.find(({ clientFk }) => clientFk === item.clientFk);
+        item.finished = recovery?.finished === null;
+    });
+
+    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 'departmentFk':
+        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,28 +299,46 @@ 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">
+        <VnPaginate
+            ref="dataRef"
+            @on-fetch="onFetch"
+            data-key="CustomerDefaulter"
+            :filter="filter"
+            :expr-builder="exprBuilder"
+            auto-load
+            url="Defaulters/filter"
+        >
+            <template #body="{ rows }">
+                <div class="q-pa-md">
                    <QTable
                        :columns="columns"
                        :rows="rows"
-            class="full-width q-mt-md"
+                        class="full-width"
                        row-key="clientFk"
                        selection="multiple"
                        v-model:selected="selected"
                    >
                        <template #header="props">
-                <QTr :props="props" class="bg">
+                            <QTr :props="props" class="bg" style="min-height: 200px">
                                <QTh>
                                    <QCheckbox v-model="props.selected" />
                                </QTh>
-                    <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                <QTh
+                                    v-for="col in props.cols"
+                                    :key="col.name"
+                                    :props="props"
+                                >
                                    {{ t(col.label) }}
-                        <QTooltip v-if="col.tooltip">{{ col.tooltip }}</QTooltip>
+                                    <QTooltip v-if="col.tooltip">{{
+                                        col.tooltip
+                                    }}</QTooltip>
                                </QTh>
                            </QTr>
                        </template>
@ -244,17 +347,34 @@ const onFetch = (data) => {
                            <QTd :props="props">
                                <QTr :props="props" class="cursor-pointer">
                                    <component
-                            :is="tableColumnComponents[props.col.name].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)"
+                                        v-bind="
+                                            tableColumnComponents[props.col.name].props(
+                                                props
+                                            )
+                                        "
+                                        @click="
+                                            tableColumnComponents[props.col.name].event(
+                                                props
+                                            )
+                                        "
+                                    >
+                                        <template v-if="typeof props.value !== 'boolean'">
+                                            <div
+                                                v-if="
+                                                    props.col.name === 'lastObservation'
+                                                "
                                            >
-                            <template v-if="props.col.name !== 'isWorker'">
-                                <div v-if="props.col.name === 'lastObservation'">
                                                <VnInput
                                                    type="textarea"
                                                    v-model="props.value"
-                                        autogrow
+                                                    readonly
+                                                    dense
+                                                    rows="2"
                                                />
                                            </div>
                                            <div v-else>{{ props.value }}</div>
@ -277,6 +397,9 @@ const onFetch = (data) => {
                            </QTd>
                        </template>
                    </QTable>
+                </div>
+            </template>
+        </VnPaginate>
    </QPage>
 </template>

@ -289,9 +412,11 @@ const onFetch = (data) => {

 <i18n>
 es:
+    Add observation:  Añadir observación
    Client: Cliente
    Is worker: Es trabajador
    Salesperson: Comercial
+    Department: Departamento
    Country: País
    P. Method: F. Pago
    Pay method: Forma de pago
--- 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>
                    </VnRow>
                    <div class="q-mt-lg row justify-end">
                        <QBtn
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@ -45,11 +45,10 @@ const authors = ref();
            </div>
        </template>

-        <template #body="{ params }">
-            <QItem class="q-mb-sm q-mt-sm">
+        <template #body="{ params, searchFn }">
+            <QItem class="q-mb-sm">
                <QItemSection v-if="clients">
                    <VnSelect
-                        :input-debounce="0"
                        :label="t('Client')"
                        :options="clients"
                        dense
@ -57,11 +56,13 @@ const authors = ref();
                        hide-selected
                        map-options
                        option-label="name"
-                        option-value="clientTypeFk"
+                        option-value="id"
                        outlined
                        rounded
                        use-input
                        v-model="params.clientFk"
+                        @update:model-value="searchFn()"
+                        auto-load
                    />
                </QItemSection>
                <QItemSection v-else>
@ -85,6 +86,7 @@ const authors = ref();
                        rounded
                        use-input
                        v-model="params.salesPersonFk"
+                        @update:model-value="searchFn()"
                    />
                </QItemSection>
                <QItemSection v-else>
@ -108,6 +110,7 @@ const authors = ref();
                        rounded
                        use-input
                        v-model="params.countryFk"
+                        @update:model-value="searchFn()"
                    />
                </QItemSection>
                <QItemSection v-else>
@ -153,6 +156,7 @@ const authors = ref();
                        rounded
                        use-input
                        v-model="params.workerFk"
+                        @update:model-value="searchFn()"
                    />
                </QItemSection>
                <QItemSection v-else>
@ -162,7 +166,7 @@ const authors = ref();

            <QItem class="q-mb-sm">
                <QItemSection>
-                    <VnInput
+                    <VnInputDate
                        :label="t('L. O. Date')"
                        clearable
                        is-outlined
--- 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,6 +534,13 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
    </VnSubToolbar>

    <QPage class="column items-center q-pa-md">
+        <VnPaginate
+            data-key="CustomerExtendedList"
+            url="Clients/extendedListFilter"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <div class="q-pa-md">
                    <QTable
                        :columns="columns"
                        :rows="rows"
@ -521,13 +554,32 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
                                {{ 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)"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
                                >
                                    <CustomerDescriptorProxy :id="props.row.id" />
                                    {{ props.row.id }}
@ -540,10 +592,16 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
                                    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)"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
                                >
-                        <WorkerDescriptorProxy :id="props.row.salesPersonFk" />
+                                    <WorkerDescriptorProxy
+                                        :id="props.row.salesPersonFk"
+                                    />
                                    {{ props.row.salesPerson }}
                                </component>
                                <span class="col-content" v-else>-</span>
@ -554,12 +612,19 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
                                <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)"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
                                />
                            </QTd>
                        </template>
                    </QTable>
+                </div>
+            </template>
+        </VnPaginate>
    </QPage>
 </template>

--- 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,22 +81,42 @@ 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">
+        <VnPaginate data-key="CustomerNotifications" url="Clients" auto-load>
+            <template #body="{ rows }">
+                <div class="q-pa-md">
                    <QTable
                        :columns="columns"
                        :rows="rows"
@ -110,18 +129,34 @@ const selectCustomerId = (id) => {
                            <QTd :props="props">
                                <QTr :props="props" class="cursor-pointer">
                                    <component
-                            :is="tableColumnComponents[props.col.name].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)"
+                                        v-bind="
+                                            tableColumnComponents[props.col.name].props(
+                                                props
+                                            )
+                                        "
+                                        @click="
+                                            tableColumnComponents[props.col.name].event(
+                                                props
+                                            )
+                                        "
                                    >
                                        {{ props.value }}
-                            <CustomerDescriptorProxy :id="selectedCustomerId" />
+                                        <CustomerDescriptorProxy
+                                            :id="selectedCustomerId"
+                                        />
                                    </component>
                                </QTr>
                            </QTd>
                        </template>
                    </QTable>
+                </div>
+            </template>
+        </VnPaginate>
    </QPage>
 </template>

@ -140,4 +175,5 @@ es:
    Phone: Teléfono
    City: Población
    Email: Email
+    Campaign consumption: Consumo campaña
 </i18n>
--- a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
+++ 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>
--- 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>
--- 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();
--- 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();
--- a/src/pages/Customer/components/CustomerGreugeCreate.vue
+++ b/src/pages/Customer/components/CustomerGreugeCreate.vue
@ -56,24 +56,17 @@ 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>
            </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"
@ -82,7 +75,6 @@ const toCustomerGreuges = () => {
                    option-value="id"
                    v-model="data.greugeTypeFk"
                />
-                </div>
            </VnRow>
        </template>
    </FormModel>
--- 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>
            </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>
            </VnRow>
        </template>
    </FormModelPopup>
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@ -135,14 +135,11 @@ 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"
@ -153,11 +150,9 @@ const onDataSaved = async () => {
                        option-value="id"
                        v-model="data.companyFk"
                    />
-                    </div>
                </VnRow>

                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
                    <VnSelect
                        :label="t('Bank')"
                        :options="bankOptions"
@ -178,8 +173,6 @@ const onDataSaved = async () => {
                            </QItem>
                        </template>
                    </VnSelect>
-                    </div>
-                    <div class="col">
                    <VnInput
                        :label="t('Amount')"
                        :required="true"
@ -188,7 +181,6 @@ const onDataSaved = async () => {
                        type="number"
                        v-model.number="data.amountPaid"
                    />
-                    </div>
                </VnRow>

                <div class="text-h6" v-if="data.bankFk === 3 || data.bankFk === 3117">
@ -203,21 +195,18 @@ const onDataSaved = async () => {
                            v-model="data.compensationAccount"
                        />
                    </div>
-                    <div class="col">
                    <VnInput
                        :label="t('Reference')"
                        :required="true"
                        clearable
                        v-model="data.description"
                    />
-                    </div>
                </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)"
@ -225,8 +214,6 @@ const onDataSaved = async () => {
                            type="number"
                            v-model="deliveredAmount"
                        />
-                        </div>
-                        <div class="col">
                        <VnInput
                            :label="t('Amount to return')"
                            clearable
@ -234,16 +221,11 @@ const onDataSaved = async () => {
                            type="number"
                            v-model="amountToReturn"
                        />
-                        </div>
                    </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>
                    </VnRow>
                </div>

--- 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>
            </VnRow>
        </template>
    </FormModel>
--- 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>
            </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>
            </VnRow>
        </template>
    </FormModel>
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@ -30,7 +30,6 @@ 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"
@ -38,36 +37,28 @@ const clientsOptions = ref([]);
                    clearable
                    autofocus
                />
-                </div>
-                <div class="col">
                <VnInput
                    v-model="data.code"
                    :label="t('department.code')"
                    :rules="validate('department.code')"
                    clearable
                />
-                </div>
            </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>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <VnSelect
                    :label="t('department.bossDepartment')"
                    v-model="data.workerFk"
@ -78,8 +69,6 @@ const clientsOptions = ref([]);
                    map-options
                    :rules="validate('department.workerFk')"
                />
-                </div>
-                <div class="col">
                <VnSelect
                    :label="t('department.selfConsumptionCustomer')"
                    v-model="data.clientFk"
@ -90,45 +79,34 @@ const clientsOptions = ref([]);
                    map-options
                    :rules="validate('department.clientFk')"
                />
-                </div>
            </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>
            </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>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <QCheckbox
                    :label="t('department.hasToSendMail')"
                    v-model="data.hasToSendMail"
                />
-                </div>
            </VnRow>
        </template>
    </FormModel>
--- 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 () => {
+const removeDepartment = async () => {
    try {
-                await axios.post(
-                    `/Departments/${entityId.value}/removeChild`,
-                    entityId.value
-                );
+        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>
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@ -68,7 +68,6 @@ 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"
@ -90,8 +89,6 @@ const onFilterTravelSelected = (formData, id) => {
                        </QItem>
                    </template>
                </VnSelect>
-                </div>
-                <div class="col">
                <VnSelectDialog
                    :label="t('entry.basicData.travel')"
                    v-model="data.travelFk"
@ -123,24 +120,18 @@ const onFilterTravelSelected = (formData, id) => {
                        </QItem>
                    </template>
                </VnSelectDialog>
-                </div>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <VnInput
                    v-model="data.reference"
                    :label="t('entry.basicData.reference')"
                />
-                </div>
            </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"
@ -151,10 +142,8 @@ const onFilterTravelSelected = (formData, id) => {
                    hide-selected
                    :required="true"
                />
-                </div>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <VnSelect
                    :label="t('entry.basicData.currency')"
                    v-model="data.currencyFk"
@ -162,8 +151,6 @@ const onFilterTravelSelected = (formData, id) => {
                    option-value="id"
                    option-label="code"
                />
-                </div>
-                <div class="col">
                <QInput
                    :label="t('entry.basicData.commission')"
                    v-model="data.commission"
@ -171,10 +158,8 @@ const onFilterTravelSelected = (formData, id) => {
                    autofocus
                    min="0"
                />
-                </div>
            </VnRow>
            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
                <QInput
                    :label="t('entry.basicData.observation')"
                    type="textarea"
@ -183,37 +168,26 @@ const onFilterTravelSelected = (formData, id) => {
                    counter
                    fill-input
                />
-                </div>
            </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>
            </VnRow>
        </template>
    </FormModel>
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@ -410,7 +410,7 @@ const lockIconType = (groupingMode, mode) => {
                            <span v-if="props.row.item.subName" class="subName">
                                {{ props.row.item.subName }}
                            </span>
-                            <fetched-tags :item="props.row.item" :max-length="5" />
+                            <FetchedTags :item="props.row.item" :max-length="5" />
                        </QTd>
                    </QTr>
                    <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@ -198,7 +198,6 @@ 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')"
@ -218,24 +217,19 @@ const redirectToBuysView = () => {
                        </QIcon>
                    </template>
                </QFile>
-                </div>
            </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>
                </VnRow>
                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
                    <VnInput
                        :label="t('entry.buys.observations')"
                        v-model="importData.observation"
                    />
-                    </div>
                </VnRow>
                <VnRow>
                    <QTable :columns="columns" :rows="importData.buys">
--- 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"
    />
--- 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';
@ -339,7 +338,7 @@ const fetchEntryBuys = async () => {
                                <span v-if="row.item.subName" class="subName">
                                    {{ row.item.subName }}
                                </span>
-                                <fetched-tags :item="row.item" :max-length="5" />
+                                <FetchedTags :item="row.item" :max-length="5" />
                            </QTd>
                        </QTr>
                        <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@ -79,7 +79,6 @@ 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"
@ -102,10 +101,8 @@ const redirectToEntryBasicData = (_, { id }) => {
                            </QItem>
                        </template>
                    </VnSelect>
-                    </div>
                </VnRow>
                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
                    <VnSelect
                        :label="t('Travel')"
                        class="full-width"
@ -125,8 +122,7 @@ const redirectToEntryBasicData = (_, { id }) => {
                                        >{{ scope.opt?.agencyModeName }} -
                                        {{ scope.opt?.warehouseInName }} ({{
                                            toDate(scope.opt?.shipped)
-                                            }}) &#x2192;
-                                            {{ scope.opt?.warehouseOutName }} ({{
+                                        }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
                                            toDate(scope.opt?.landed)
                                        }})</QItemLabel
                                    >
@ -134,10 +130,8 @@ const redirectToEntryBasicData = (_, { id }) => {
                            </QItem>
                        </template>
                    </VnSelect>
-                    </div>
                </VnRow>
                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
                    <VnSelect
                        :label="t('Company')"
                        class="full-width"
@ -150,7 +144,6 @@ const redirectToEntryBasicData = (_, { id }) => {
                        :required="true"
                        :rules="validate('entry.companyFk')"
                    />
-                    </div>
                </VnRow>
            </template>
        </FormModel>
--- 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" />
@ -706,7 +707,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
            </template>
            <template #body-cell-tags="{ row }">
                <QTd>
-                    <fetched-tags :item="row" :max-length="6" />
+                    <FetchedTags :item="row" :max-length="6" />
                </QTd>
            </template>
            <template #body-cell-entryFk="{ row }">
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@ -3,25 +3,27 @@ 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 'components/ui/VnRow.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'src/components/common/VnInput.vue';

 const quasar = useQuasar();
-const route = useRoute();
 const { t } = useI18n();

 const dms = ref({});
+const route = useRoute();
 const editDownloadDisabled = ref(false);
-const arrayData = useArrayData('InvoiceIn');
-const invoiceIn = computed(() => arrayData.store.data);
+const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
 const userConfig = ref(null);
+const invoiceId = computed(() => +route.params.id);

+const expenses = ref([]);
 const currencies = ref([]);
 const currenciesRef = ref();
 const companies = ref([]);
@ -32,14 +34,11 @@ const warehouses = ref([]);
 const warehousesRef = ref();
 const allowTypesRef = ref();
 const allowedContentTypes = ref([]);
+const sageWithholdings = ref([]);
 const inputFileRef = ref();
 const editDmsRef = ref();
 const createDmsRef = ref();

-const requiredFieldRule = (val) => val || t('globals.requiredField');
-const dateMask = '####-##-##';
-const fillMask = '_';
-
 async function checkFileExists(dmsId) {
    if (!dmsId) return;
    try {
@ -174,15 +173,20 @@ async function upsert() {
        @on-fetch="(data) => (userConfig = data)"
        auto-load
    />
+    <FetchData url="Expenses" auto-load @on-fetch="(data) => (expenses = data)" />
+    <FetchData
+        url="SageWithholdings"
+        auto-load
+        @on-fetch="(data) => (sageWithholdings = data)"
+    />
    <FormModel
-        v-if="invoiceIn"
-        :url="`InvoiceIns/${route.params.id}`"
-        model="invoiceIn"
-        :auto-load="true"
+        model="InvoiceIn"
+        :go-to="`/invoice-in/${invoiceId}/vat`"
+        auto-load
+        :url-update="`InvoiceIns/${invoiceId}/updateInvoiceIn`"
    >
        <template #form="{ data }">
-            <div class="row q-gutter-md q-mb-md">
-                <div class="col">
+            <VnRow>
                <VnSelect
                    :label="t('supplierFk')"
                    v-model="data.supplierFk"
@ -203,91 +207,37 @@ async function upsert() {
                        </QItem>
                    </template>
                </VnSelect>
-                </div>
-                <div class="col">
-                    <QInput
+                <VnInput
                    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"
-                            >
-                                <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
+            </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('Expedition date')" v-model="data.issued" />
+                <VnInputDate
                    :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" :mask="dateMask">
-                                        <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">
-                    <QInput
+            </VnRow>
+            <VnRow>
+                <VnSelect
                    :label="t('Undeductible VAT')"
                    v-model="data.deductibleExpenseFk"
-                        clearable
-                        clear-icon="close"
-                    />
-                </div>
-                <div class="col">
-                    <QInput
+                    :options="expenses"
+                    option-value="id"
+                    option-label="id"
+                    :filter-options="['id', 'name']"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInput
                    :label="t('Document')"
                    v-model="data.dmsFk"
                    clearable
@ -332,75 +282,13 @@ async function upsert() {
                            <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" :mask="dateMask">
-                                        <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('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">
+                </VnInput>
+            </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('Entry date')" v-model="data.bookEntried" />
+                <VnInputDate :label="t('Accounted date')" v-model="data.booked" />
+            </VnRow>
+            <VnRow>
                <VnSelect
                    :label="t('Currency')"
                    v-model="data.currencyFk"
@ -408,8 +296,7 @@ async function upsert() {
                    option-value="id"
                    option-label="code"
                />
-                </div>
-                <div class="col">
+
                <VnSelect
                    v-if="companiesRef"
                    :label="t('Company')"
@ -418,17 +305,16 @@ async function upsert() {
                    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"
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    :label="t('invoiceIn.summary.sage')"
+                    v-model="data.withholdingSageFk"
+                    :options="sageWithholdings"
+                    option-value="id"
+                    option-label="withholding"
                />
-                </div>
-                <div class="col"></div>
-            </div>
+            </VnRow>
        </template>
    </FormModel>
    <QDialog ref="editDmsRef">
@ -444,7 +330,7 @@ async function upsert() {
            </QCardSection>
            <QCardSection class="q-py-none">
                <QItem>
-                    <QInput
+                    <VnInput
                        class="full-width q-pa-xs"
                        :label="t('Reference')"
                        v-model="dms.reference"
@ -453,45 +339,45 @@ async function upsert() {
                    />
                    <VnSelect
                        class="full-width q-pa-xs"
-                        :label="`${t('Company')}*`"
+                        :label="t('Company')"
                        v-model="dms.companyId"
                        :options="companies"
                        option-value="id"
                        option-label="code"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                    />
                </QItem>
                <QItem>
                    <VnSelect
                        class="full-width q-pa-xs"
-                        :label="`${t('Warehouse')}*`"
+                        :label="t('Warehouse')"
                        v-model="dms.warehouseId"
                        :options="warehouses"
                        option-value="id"
                        option-label="name"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                    />
                    <VnSelect
                        class="full-width q-pa-xs"
-                        :label="`${t('Type')}*`"
+                        :label="t('Type')"
                        v-model="dms.dmsTypeId"
                        :options="dmsTypes"
                        option-value="id"
                        option-label="name"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                    />
                </QItem>
                <QItem>
-                    <QInput
-                        class="full-width q-pa-xs"
+                    <VnInput
+                        :label="t('Description')"
+                        v-model="dms.description"
+                        :required="true"
                        type="textarea"
+                        class="full-width q-pa-xs"
                        size="lg"
                        autogrow
-                        :label="`${t('Description')}*`"
-                        v-model="dms.description"
                        clearable
                        clear-icon="close"
-                        :rules="[(val) => val.length || t('Required field')]"
                    />
                </QItem>
                <QItem>
@ -555,7 +441,7 @@ async function upsert() {
            </QCardSection>
            <QCardSection class="q-pb-none">
                <QItem>
-                    <QInput
+                    <VnInput
                        class="full-width q-pa-xs"
                        :label="t('Reference')"
                        v-model="dms.reference"
@ -567,7 +453,7 @@ async function upsert() {
                        :options="companies"
                        option-value="id"
                        option-label="code"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                    />
                </QItem>
                <QItem>
@ -578,7 +464,7 @@ async function upsert() {
                        :options="warehouses"
                        option-value="id"
                        option-label="name"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                    />
                    <VnSelect
                        class="full-width q-pa-xs"
@ -587,11 +473,11 @@ async function upsert() {
                        :options="dmsTypes"
                        option-value="id"
                        option-label="name"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                    />
                </QItem>
                <QItem>
-                    <QInput
+                    <VnInput
                        class="full-width q-pa-xs"
                        type="textarea"
                        size="lg"
--- a/Show More
+++ b/Show More