diff --git a/package.json b/package.json
index c4f5b828a..1d729b82f 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,7 @@
         "validator": "^13.9.0",
         "vue": "^3.3.4",
         "vue-i18n": "^9.2.2",
-        "vue-router": "^4.2.1",
-        "vue-router-mock": "^0.2.0"
+        "vue-router": "^4.2.1"
     },
     "devDependencies": {
         "@intlify/unplugin-vue-i18n": "^0.8.1",
diff --git a/src/App.vue b/src/App.vue
index 8e9bea2e4..d0d8c9358 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,10 +1,11 @@
 <script setup>
 import { onMounted } from 'vue';
-import { useQuasar } from 'quasar';
+import { useQuasar, Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
 
 const quasar = useQuasar();
 const { availableLocales, locale, fallbackLocale } = useI18n();
+Dark.set(true);
 
 onMounted(() => {
     let userLang = window.navigator.language;
diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
new file mode 100644
index 000000000..f4f5fef7d
--- /dev/null
+++ b/src/components/CreateBankEntityForm.vue
@@ -0,0 +1,99 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+
+const bankEntityFormData = reactive({
+    name: null,
+    bic: null,
+    countryFk: null,
+    id: null,
+});
+
+const countriesFilter = {
+    fields: ['id', 'country', 'code'],
+};
+
+const countriesOptions = ref([]);
+
+const onDataSaved = (data) => {
+    emit('onDataSaved', data);
+};
+</script>
+
+<template>
+    <FetchData
+        url="Countries"
+        :filter="countriesFilter"
+        auto-load
+        @on-fetch="(data) => (countriesOptions = data)"
+    />
+    <FormModelPopup
+        url-create="bankEntities"
+        model="bankEntity"
+        :title="t('title')"
+        :subtitle="t('subtitle')"
+        :form-initial-data="bankEntityFormData"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <template #form-inputs="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QInput
+                        :label="t('name')"
+                        v-model="data.name"
+                        :rules="validate('bankEntity.name')"
+                    />
+                </div>
+                <div class="col">
+                    <QInput
+                        :label="t('swift')"
+                        v-model="data.bic"
+                        :rules="validate('bankEntity.bic')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('country')"
+                        v-model="data.countryFk"
+                        :options="countriesOptions"
+                        option-value="id"
+                        option-label="country"
+                        hide-selected
+                        :rules="validate('bankEntity.countryFk')"
+                    />
+                </div>
+                <div class="col">
+                    <QInput :label="t('id')" v-model="data.id" />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+en:
+    title: New bank entity
+    subtitle: Please, ensure you put the correct data!
+    name: Name *
+    swift: Swift *
+    country: Country
+    id: Entity code
+es:
+    title: Nueva entidad bancaria
+    subtitle: ¡Por favor, asegúrate de poner los datos correctos!
+    name: Nombre *
+    swift: Swift *
+    country: País
+    id: Código de la entidad
+</i18n>
diff --git a/src/components/CreateDepartmentChild.vue b/src/components/CreateDepartmentChild.vue
new file mode 100644
index 000000000..8f5b4b874
--- /dev/null
+++ b/src/components/CreateDepartmentChild.vue
@@ -0,0 +1,100 @@
+<script setup>
+import { onMounted, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModel from 'components/FormModel.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const $props = defineProps({
+    parentId: {
+        type: Number,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+
+const departmentChildData = reactive({
+    name: null,
+});
+
+const closeButton = ref(null);
+const isLoading = ref(false);
+
+const onDataSaved = () => {
+    emit('onDataSaved');
+    closeForm();
+};
+
+const closeForm = () => {
+    if (closeButton.value) closeButton.value.click();
+};
+
+onMounted(() => {
+    if ($props.parentId) departmentChildData.parentId = $props.parentId;
+});
+</script>
+
+<template>
+    <FormModel
+        :form-initial-data="departmentChildData"
+        :observe-form-changes="false"
+        :default-actions="false"
+        url-create="departments/createChild"
+        @on-data-saved="onDataSaved()"
+    >
+        <template #form="{ data }">
+            <span ref="closeButton" class="close-icon" v-close-popup>
+                <QIcon name="close" size="sm" />
+            </span>
+            <h1 class="title">{{ t('New department') }}</h1>
+            <VnRow class="row q-gutter-md q-mb-md" style="min-width: 250px">
+                <div class="col">
+                    <VnInput :label="t('Name')" v-model="data.name" />
+                </div>
+            </VnRow>
+            <div class="q-mt-lg row justify-end">
+                <QBtn
+                    :label="t('globals.cancel')"
+                    type="reset"
+                    color="primary"
+                    flat
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                    v-close-popup
+                />
+                <QBtn
+                    :label="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
+            </div>
+        </template>
+    </FormModel>
+</template>
+
+<style lang="scss" scoped>
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
+.title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+</style>
+
+<i18n>
+es:
+    Name: Nombre
+    New department: Nuevo departamento
+</i18n>
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
new file mode 100644
index 000000000..ee842e86f
--- /dev/null
+++ b/src/components/CreateNewCityForm.vue
@@ -0,0 +1,72 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+
+const cityFormData = reactive({
+    name: null,
+    provinceFk: null,
+});
+
+const provincesOptions = ref([]);
+
+const onDataSaved = () => {
+    emit('onDataSaved');
+};
+</script>
+
+<template>
+    <FetchData
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+        url="Provinces"
+    />
+    <FormModelPopup
+        :title="t('New city')"
+        :subtitle="t('Please, ensure you put the correct data!')"
+        :form-initial-data="cityFormData"
+        url-create="towns"
+        model="city"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <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">
+                    <VnSelectFilter
+                        :label="t('Province')"
+                        :options="provincesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.provinceFk"
+                        :rules="validate('city.provinceFk')"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New city: Nueva ciudad
+    Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
+    Name: Nombre
+    Province: Provincia
+</i18n>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
new file mode 100644
index 000000000..3504445f8
--- /dev/null
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -0,0 +1,138 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import CreateNewCityForm from './CreateNewCityForm.vue';
+import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
+import VnSelectCreate from 'components/common/VnSelectCreate.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+
+const postcodeFormData = reactive({
+    code: null,
+    countryFk: null,
+    provinceFk: null,
+    townFk: null,
+});
+
+const townsFetchDataRef = ref(null);
+const provincesFetchDataRef = ref(null);
+const countriesOptions = ref([]);
+const provincesOptions = ref([]);
+const townsLocationOptions = ref([]);
+
+const onDataSaved = () => {
+    emit('onDataSaved');
+};
+
+const onCityCreated = async () => {
+    await townsFetchDataRef.value.fetch();
+};
+
+const onProvinceCreated = async () => {
+    await provincesFetchDataRef.value.fetch();
+};
+</script>
+
+<template>
+    <FetchData
+        ref="townsFetchDataRef"
+        @on-fetch="(data) => (townsLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData
+        ref="provincesFetchDataRef"
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+        url="Provinces"
+    />
+    <FetchData
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+        url="Countries"
+    />
+    <FormModelPopup
+        url-create="postcodes"
+        model="postcode"
+        :title="t('New postcode')"
+        :subtitle="t('Please, ensure you put the correct data!')"
+        :form-initial-data="postcodeFormData"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <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">
+                    <VnSelectCreate
+                        :label="t('City')"
+                        :options="townsLocationOptions"
+                        v-model="data.townFk"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        :rules="validate('postcode.city')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                    >
+                        <template #form>
+                            <CreateNewCityForm @on-data-saved="onCityCreated($event)" />
+                        </template>
+                    </VnSelectCreate>
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-xl">
+                <div class="col">
+                    <VnSelectCreate
+                        :label="t('Province')"
+                        :options="provincesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.provinceFk"
+                        :rules="validate('postcode.provinceFk')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                    >
+                        <template #form>
+                            <CreateNewProvinceForm
+                                @on-data-saved="onProvinceCreated($event)"
+                            />
+                        </template>
+                    </VnSelectCreate>
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Country')"
+                        :options="countriesOptions"
+                        hide-selected
+                        option-label="country"
+                        option-value="id"
+                        v-model="data.countryFk"
+                        :rules="validate('postcode.countryFk')"
+                    />
+                </div> </VnRow
+        ></template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New postcode: Nuevo código postal
+    Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
+    City: Ciudad
+    Province: Provincia
+    Country: País
+    Postcode: Código postal
+</i18n>
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
new file mode 100644
index 000000000..0f88952ea
--- /dev/null
+++ b/src/components/CreateNewProvinceForm.vue
@@ -0,0 +1,72 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+
+const provinceFormData = reactive({
+    name: null,
+    autonomyFk: null,
+});
+
+const autonomiesOptions = ref([]);
+
+const onDataSaved = () => {
+    emit('onDataSaved');
+};
+</script>
+
+<template>
+    <FetchData
+        @on-fetch="(data) => (autonomiesOptions = data)"
+        auto-load
+        url="Autonomies"
+    />
+    <FormModelPopup
+        :title="t('New province')"
+        :subtitle="t('Please, ensure you put the correct data!')"
+        url-create="provinces"
+        model="province"
+        :form-initial-data="provinceFormData"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <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">
+                    <VnSelectFilter
+                        :label="t('Autonomy')"
+                        :options="autonomiesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.autonomyFk"
+                        :rules="validate('province.autonomyFk')"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New province: Nueva provincia
+    Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
+    Name: Nombre
+    Autonomy: Autonomía
+</i18n>
diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index f0d908972..137f751db 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -27,6 +27,10 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    params: {
+        type: Object,
+        default: null,
+    },
 });
 
 const emit = defineEmits(['onFetch']);
@@ -38,15 +42,15 @@ onMounted(async () => {
     }
 });
 
-async function fetch() {
+async function fetch(fetchFilter = {}) {
     try {
-        const filter = Object.assign({}, $props.filter); // eslint-disable-line vue/no-dupe-keys
+        const filter = Object.assign(fetchFilter, $props.filter); // eslint-disable-line vue/no-dupe-keys
         if ($props.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;
 
         const { data } = await axios.get($props.url, {
-            params: { filter: JSON.stringify(filter) },
+            params: { filter: JSON.stringify(filter), ...$props.params },
         });
 
         emit('onFetch', data);
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 453b3ffe1..a5560dfc0 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -55,9 +55,13 @@ const $props = defineProps({
         description:
             'Esto se usa principalmente para permitir guardar sin hacer cambios (Útil para la feature de clonar ya que en este caso queremos poder guardar de primeras)',
     },
+    mapper: {
+        type: Function,
+        default: null,
+    },
 });
 
-const emit = defineEmits(['onFetch']);
+const emit = defineEmits(['onFetch', 'onDataSaved']);
 
 defineExpose({
     save,
@@ -83,8 +87,9 @@ onUnmounted(() => {
 
 const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
+const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
-const originalData = ref({...$props.formInitialData});
+const originalData = ref({ ...$props.formInitialData });
 const formData = computed(() => state.get($props.model));
 const formUrl = computed(() => $props.url);
 
@@ -92,7 +97,8 @@ const startFormWatcher = () => {
     watch(
         () => formData.value,
         (val) => {
-            if (val) hasChanges.value = true;
+            hasChanges.value = !isResetting.value && val;
+            isResetting.value = false;
         },
         { deep: true }
     );
@@ -114,25 +120,26 @@ async function fetch() {
 }
 
 async function save() {
-    if (!hasChanges.value) {
+    if ($props.observeFormChanges && !hasChanges.value) {
         notify('globals.noChanges', 'negative');
         return;
     }
     isLoading.value = true;
 
     try {
+        const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
         if ($props.urlCreate) {
-            await axios.post($props.urlCreate, formData.value);
+            await axios.post($props.urlCreate, body);
             notify('globals.dataCreated', 'positive');
         } else {
-            await axios.patch($props.urlUpdate || $props.url, formData.value);
+            await axios.patch($props.urlUpdate || $props.url, body);
         }
+        emit('onDataSaved', formData.value);
+        originalData.value = JSON.parse(JSON.stringify(formData.value));
+        hasChanges.value = false;
     } catch (err) {
         notify('errors.create', 'negative');
     }
-
-    originalData.value = JSON.parse(JSON.stringify(formData.value));
-    hasChanges.value = false;
     isLoading.value = false;
 }
 
@@ -143,6 +150,7 @@ function reset() {
     emit('onFetch', state.get($props.model));
     if ($props.observeFormChanges) {
         hasChanges.value = false;
+        isResetting.value = true;
     }
 }
 
@@ -168,11 +176,14 @@ watch(formUrl, async () => {
 });
 </script>
 <template>
-    <QBanner v-if="$props.observeFormChanges && hasChanges" class="text-white bg-warning">
+    <QBanner
+        v-if="$props.observeFormChanges && hasChanges"
+        class="text-white bg-warning full-width"
+    >
         <QIcon name="warning" size="md" class="q-mr-md" />
         <span>{{ t('globals.changesToSave') }}</span>
     </QBanner>
-    <div class="column items-center">
+    <div class="column items-center full-width">
         <QForm
             v-if="formData"
             @submit="save"
@@ -219,6 +230,7 @@ watch(formUrl, async () => {
         :showing="isLoading"
         :label="t('globals.pleaseWait')"
         color="primary"
+        style="min-width: 100%"
     />
 </template>
 <style lang="scss" scoped>
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
new file mode 100644
index 000000000..c314f6897
--- /dev/null
+++ b/src/components/FormModelPopup.vue
@@ -0,0 +1,107 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const $props = defineProps({
+    title: {
+        type: String,
+        default: '',
+    },
+    subtitle: {
+        type: String,
+        default: '',
+    },
+    url: {
+        type: String,
+        default: '',
+    },
+    model: {
+        type: String,
+        default: '',
+    },
+    filter: {
+        type: Object,
+        default: null,
+    },
+    urlCreate: {
+        type: String,
+        default: null,
+    },
+    formInitialData: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const { t } = useI18n();
+
+const closeButton = ref(null);
+const isLoading = ref(false);
+
+const onDataSaved = () => {
+    emit('onDataSaved');
+    closeForm();
+};
+
+const closeForm = () => {
+    if (closeButton.value) closeButton.value.click();
+};
+</script>
+
+<template>
+    <FormModel
+        :form-initial-data="formInitialData"
+        :observe-form-changes="false"
+        :default-actions="false"
+        :url-create="urlCreate"
+        :model="model"
+        @on-data-saved="onDataSaved()"
+    >
+        <template #form="{ data, validate }">
+            <span ref="closeButton" class="close-icon" v-close-popup>
+                <QIcon name="close" size="sm" />
+            </span>
+            <h1 class="title">{{ title }}</h1>
+            <p>{{ subtitle }}</p>
+            <slot name="form-inputs" :data="data" :validate="validate" />
+            <div class="q-mt-lg row justify-end">
+                <QBtn
+                    :label="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
+                <QBtn
+                    :label="t('globals.cancel')"
+                    type="reset"
+                    color="primary"
+                    flat
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                    v-close-popup
+                />
+            </div>
+        </template>
+    </FormModel>
+</template>
+
+<style lang="scss" scoped>
+.title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
+</style>
diff --git a/src/components/common/SendEmailDialog.vue b/src/components/common/SendEmailDialog.vue
index 0f574a795..501c48a4d 100644
--- a/src/components/common/SendEmailDialog.vue
+++ b/src/components/common/SendEmailDialog.vue
@@ -1,7 +1,9 @@
 <script setup>
 import { ref } from 'vue';
-import { useDialogPluginComponent } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useDialogPluginComponent } from 'quasar';
+
+import VnInput from 'src/components/common/VnInput.vue';
 
 const props = defineProps({
     data: {
@@ -52,7 +54,7 @@ async function confirm() {
                 {{ t('The notification will be sent to the following address') }}
             </QCardSection>
             <QCardSection class="q-pt-none">
-                <QInput dense v-model="address" rounded outlined autofocus />
+                <VnInput v-model="address" is-outlined autofocus />
             </QCardSection>
             <QCardActions align="right">
                 <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
new file mode 100644
index 000000000..d9a1a2004
--- /dev/null
+++ b/src/components/common/TableVisibleColumns.vue
@@ -0,0 +1,192 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, computed, onMounted } from 'vue';
+
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    allColumns: {
+        type: Array,
+        default: () => [],
+    },
+    tableCode: {
+        type: String,
+        default: '',
+    },
+    labelsTraductionsPath: {
+        type: String,
+        default: '',
+    },
+});
+
+const emit = defineEmits(['onConfigSaved']);
+
+const { notify } = useNotify();
+const state = useState();
+const { t } = useI18n();
+const popupProxyRef = ref(null);
+const user = state.getUser();
+const initialUserConfigViewData = ref(null);
+
+const formattedCols = ref([]);
+
+const areAllChecksMarked = computed(() => {
+    return formattedCols.value.every((col) => col.active);
+});
+
+const setUserConfigViewData = (data) => {
+    if (!data) return;
+    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    formattedCols.value = $props.allColumns.map((col) => ({
+        name: col,
+        active: data[col],
+    }));
+    emitSavedConfig();
+};
+
+const toggleMarkAll = (val) => {
+    formattedCols.value.forEach((col) => (col.active = val));
+};
+
+const getConfig = async (url, filter) => {
+    const response = await axios.get(url, {
+        params: { filter: filter },
+    });
+    return response.data && response.data.length > 0 ? response.data[0] : null;
+};
+
+const fetchViewConfigData = async () => {
+    try {
+        const userConfigFilter = {
+            where: { tableCode: $props.tableCode, userFk: user.id },
+        };
+        const userConfig = await getConfig('UserConfigViews', userConfigFilter);
+
+        if (userConfig) {
+            initialUserConfigViewData.value = userConfig;
+            setUserConfigViewData(userConfig.configuration);
+            return;
+        }
+
+        const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
+
+        if (defaultConfig) {
+            setUserConfigViewData(defaultConfig.columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data', err);
+    }
+};
+
+const saveConfig = async () => {
+    try {
+        const params = {};
+        const configuration = {};
+
+        formattedCols.value.forEach((col) => {
+            const { name, active } = col;
+            configuration[name] = active;
+        });
+
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration: configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration: configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
+        emitSavedConfig();
+        notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config', err);
+    }
+};
+
+const emitSavedConfig = () => {
+    const activeColumns = formattedCols.value
+        .filter((col) => col.active)
+        .map((col) => col.name);
+    emit('onConfigSaved', activeColumns);
+};
+
+onMounted(async () => {
+    await fetchViewConfigData();
+});
+</script>
+<template>
+    <QBtn color="primary" icon="view_column">
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <QIcon name="info" size="sm" class="info-icon">
+                    <QTooltip>{{ t('Check the columns you want to see') }}</QTooltip>
+                </QIcon>
+                <span class="text-body1 q-mb-sm">{{ t('Visible columns') }}</span>
+                <QCheckbox
+                    :label="t('Tick all')"
+                    :model-value="areAllChecksMarked"
+                    @update:model-value="toggleMarkAll($event)"
+                    class="q-mb-sm"
+                />
+                <div
+                    v-if="allColumns.length > 0 && formattedCols.length > 0"
+                    class="checks-layout"
+                >
+                    <QCheckbox
+                        v-for="(col, index) in allColumns"
+                        :key="index"
+                        :label="t(`${$props.labelsTraductionsPath + '.' + col}`)"
+                        v-model="formattedCols[index].active"
+                    />
+                </div>
+                <QBtn class="full-width q-mt-md" color="primary" @click="saveConfig()">{{
+                    t('globals.save')
+                }}</QBtn>
+            </QCard>
+        </QPopupProxy>
+        <QTooltip>{{ t('Visible columns') }}</QTooltip>
+    </QBtn>
+</template>
+
+<style lang="scss" scoped>
+.info-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+}
+
+.checks-layout {
+    display: grid;
+    grid-template-columns: repeat(3, 200px);
+}
+</style>
+
+<i18n>
+    es:
+        Check the columns you want to see: Marca las columnas que quieres ver
+        Visible columns: Columnas visibles
+</i18n>
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
new file mode 100644
index 000000000..cdc6dd865
--- /dev/null
+++ b/src/components/common/VnInput.vue
@@ -0,0 +1,52 @@
+<script setup>
+import { computed } from 'vue';
+
+const emit = defineEmits(['update:modelValue', 'update:options']);
+
+const $props = defineProps({
+    modelValue: {
+        type: [String, Number],
+        default: null,
+    },
+    isOutlined: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+const value = computed({
+    get() {
+        return $props.modelValue;
+    },
+    set(value) {
+        emit('update:modelValue', value);
+    },
+});
+
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
+</script>
+
+<template>
+    <QInput
+        ref="vnInputRef"
+        v-model="value"
+        v-bind="{ ...$attrs, ...styleAttrs }"
+        type="text"
+        :class="{ required: $attrs.required }"
+    >
+        <template v-if="$slots.prepend" #prepend>
+            <slot name="prepend" />
+        </template>
+        <template v-if="$slots.append" #append>
+            <slot name="append" />
+        </template>
+    </QInput>
+</template>
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index a8e0d4a43..8e0ef2890 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -10,7 +10,11 @@ const props = defineProps({
     readonly: {
         type: Boolean,
         default: false,
-    }
+    },
+    isOutlined: {
+        type: Boolean,
+        default: false,
+    },
 });
 const emit = defineEmits(['update:modelValue']);
 const value = computed({
@@ -36,6 +40,16 @@ const formatDate = (dateString) => {
         date.getDate()
     )}`;
 };
+
+const styleAttrs = computed(() => {
+    return props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
 </script>
 
 <template>
@@ -44,7 +58,7 @@ const formatDate = (dateString) => {
         rounded
         readonly
         :model-value="toDate(value)"
-        v-bind="$attrs"
+        v-bind="{ ...$attrs, ...styleAttrs }"
     >
         <template #append>
             <QIcon name="event" class="cursor-pointer">
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 0949fb5cb..c93399e58 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -12,8 +12,8 @@ import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
 import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnSelectFilter from './VnSelectFilter.vue';
+import VnUserLink from '../ui/VnUserLink.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -168,17 +168,17 @@ function getLogTree(data) {
     let originLog = null;
     let userLog = null;
     let modelLog = null;
-    let prevLog;
     let nLogs;
 
-    data.forEach((log) => {
+    for (let i = 0; i < data.length; i++) {
+        let log = data[i];
+        let prevLog = i > 0 ? data[i - 1] : null;
         const locale = validations[log.changedModel]?.locale || {};
 
         // Origin
         const originChanged = !prevLog || log.originFk != prevLog.originFk;
         if (originChanged) {
             logs.push((originLog = { originFk: log.originFk, logs: [] }));
-            prevLog = log;
         }
         // User
         const userChanged = originChanged || log.userFk != prevLog.userFk;
@@ -197,6 +197,7 @@ function getLogTree(data) {
             log.changedModel != prevLog.changedModel ||
             log.changedModelId != prevLog.changedModelId ||
             nLogs >= 6;
+
         if (modelChanged) {
             userLog.logs.push(
                 (modelLog = {
@@ -221,7 +222,7 @@ function getLogTree(data) {
         propNames = [...new Set(propNames)];
 
         log.props = parseProps(propNames, locale, vals, olds);
-    });
+    }
     return logs;
 }
 
@@ -320,7 +321,6 @@ function selectFilter(type, dateType) {
     }
     if (type === 'action' && selectedFilters.value.changedModel === null) {
         selectedFilters.value.changedModel = undefined;
-        reload = false;
     }
     if (type === 'userRadio') {
         selectedFilters.value.userFk = userRadio.value;
@@ -415,21 +415,22 @@ setLogTree();
             <div class="line bg-grey"></div>
         </QItem>
         <div
-            class="user-log q-mb-sm row"
+            class="user-log q-mb-sm"
             v-for="(userLog, userIndex) in originLog.logs"
             :key="userIndex"
         >
             <div class="timeline">
                 <div class="user-avatar">
-                    <VnAvatar
-                        class="cursor-pointer"
-                        :worker="userLog.user.id"
-                        :title="userLog.user.nickname"
-                    />
-                    <WorkerDescriptorProxy
-                        v-if="userLog.user.image"
-                        :id="userLog.user.id"
-                    />
+                    <VnUserLink :worker-id="userLog.user.id">
+                        <template #link>
+                            <VnAvatar
+                                :class="{ 'cursor-pointer': userLog.user.id }"
+                                :worker-id="userLog.user.id"
+                                :title="userLog.user.nickname"
+                                size="lg"
+                            />
+                        </template>
+                    </VnUserLink>
                 </div>
                 <div class="arrow bg-panel" v-if="byRecord"></div>
                 <div class="line"></div>
@@ -665,7 +666,6 @@ setLogTree();
                         option-label="locale"
                         :options="actions"
                         @update:model-value="selectFilter('action')"
-                        @clear="() => selectFilter('action')"
                         hide-selected
                     />
                 </QItem>
@@ -704,7 +704,7 @@ setLogTree();
                                     class="q-pa-xs row items-center"
                                 >
                                     <QItemSection class="col-3 items-center">
-                                        <VnAvatar :worker="opt.id" />
+                                        <VnAvatar :worker-id="opt.id" />
                                     </QItemSection>
                                     <QItemSection class="col-9 justify-center">
                                         <span>{{ opt.name }}</span>
@@ -823,14 +823,30 @@ setLogTree();
 .q-item {
     min-height: 0px;
 }
+.q-menu {
+    display: block;
 
+    & > .loading {
+        display: flex;
+        justify-content: center;
+    }
+    & > .q-card {
+        min-width: 180px;
+        max-width: 400px;
+
+        & > .header {
+            color: $dark;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+    }
+}
 .origin-log {
     &:first-child > .origin-info {
         margin-top: 0;
     }
     & > .origin-info {
-        width: 100%;
-        max-width: 42em;
         margin-top: 28px;
         gap: 6px;
 
@@ -847,14 +863,15 @@ setLogTree();
     }
 }
 .user-log {
+    display: flex;
     width: 100%;
     max-width: 40em;
-
     & > .timeline {
         position: relative;
-        padding-right: 5px;
-        width: 50px;
+        padding-right: 1px;
+        width: 38px;
         min-width: 38px;
+        flex-grow: auto;
         & > .arrow {
             height: 8px;
             width: 8px;
@@ -874,7 +891,7 @@ setLogTree();
             position: absolute;
             background-color: $primary;
             width: 2px;
-            left: 23px;
+            left: 19px;
             z-index: -1;
             top: 0;
             bottom: -8px;
@@ -893,6 +910,7 @@ setLogTree();
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
+        min-height: 22px;
         .model-value {
             font-style: italic;
         }
@@ -984,25 +1002,6 @@ setLogTree();
         }
     }
 }
-.q-menu {
-    display: block;
-
-    & > .loading {
-        display: flex;
-        justify-content: center;
-    }
-    & > .q-card {
-        min-width: 180px;
-        max-width: 400px;
-
-        & > .header {
-            color: $dark;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-        }
-    }
-}
 </style>
 <i18n>
 en:
diff --git a/src/components/common/VnSelectCreate.vue b/src/components/common/VnSelectCreate.vue
new file mode 100644
index 000000000..bdc3f5cc8
--- /dev/null
+++ b/src/components/common/VnSelectCreate.vue
@@ -0,0 +1,71 @@
+<script setup>
+import { ref, computed } from 'vue';
+
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+import { useRole } from 'src/composables/useRole';
+
+const emit = defineEmits(['update:modelValue']);
+
+const $props = defineProps({
+    modelValue: {
+        type: [String, Number, Object],
+        default: null,
+    },
+    options: {
+        type: Array,
+        default: () => [],
+    },
+    rolesAllowedToCreate: {
+        type: Array,
+        default: () => ['developer'],
+    },
+});
+
+const role = useRole();
+const showForm = ref(false);
+
+const value = computed({
+    get() {
+        return $props.modelValue;
+    },
+    set(value) {
+        emit('update:modelValue', value);
+    },
+});
+
+const isAllowedToCreate = computed(() => {
+    return role.hasAny($props.rolesAllowedToCreate);
+});
+
+const toggleForm = () => {
+    showForm.value = !showForm.value;
+};
+</script>
+
+<template>
+    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
+        <template v-if="isAllowedToCreate" #append>
+            <QIcon
+                @click.stop.prevent="toggleForm()"
+                name="add"
+                size="xs"
+                class="add-icon"
+            />
+            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
+                <slot name="form" />
+            </QDialog>
+        </template>
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData" :key="slotName" />
+        </template>
+    </VnSelectFilter>
+</template>
+
+<style lang="scss" scoped>
+.add-icon {
+    cursor: pointer;
+    background-color: $primary;
+    border-radius: 50px;
+}
+</style>
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 568da613f..244fb50bb 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, watch, computed } from 'vue';
+import { ref, toRefs, computed, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 
 const $props = defineProps({
@@ -23,18 +23,31 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    defaultFilter: {
+        type: Boolean,
+        default: true,
+    },
 });
+
 const { optionLabel, options } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
-const vnSelectRef = ref(null);
+const vnSelectRef = ref();
+
+const value = computed({
+    get() {
+        return $props.modelValue;
+    },
+    set(value) {
+        emit('update:modelValue', value);
+    },
+});
 
 function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
 setOptions(options.value);
-
 const filter = (val, options) => {
     const search = val.toString().toLowerCase();
 
@@ -58,7 +71,8 @@ const filter = (val, options) => {
 const filterHandler = (val, update) => {
     update(
         () => {
-            myOptions.value = filter(val, myOptionsOriginal.value);
+            if ($props.defaultFilter)
+                myOptions.value = filter(val, myOptionsOriginal.value);
         },
         (ref) => {
             if (val !== '' && ref.options.length > 0) {
@@ -72,15 +86,6 @@ const filterHandler = (val, update) => {
 watch(options, (newValue) => {
     setOptions(newValue);
 });
-
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        emit('update:modelValue', value);
-    },
-});
 </script>
 
 <template>
@@ -96,17 +101,18 @@ const value = computed({
         hide-selected
         fill-input
         ref="vnSelectRef"
+        :class="{ required: $attrs.required }"
     >
         <template v-if="isClearable" #append>
             <QIcon
                 name="close"
                 @click.stop="value = null"
                 class="cursor-pointer"
-                size="18px"
+                size="xs"
             />
         </template>
-        <template v-for="(_, slotName) in $slots" #[slotName]="slotData">
-            <slot :name="slotName" v-bind="slotData ?? {}" />
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
         </template>
     </QSelect>
 </template>
diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 7f019927e..8bb8c3858 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -1,7 +1,9 @@
 <script setup>
 import { ref, computed } from 'vue';
-import { useDialogPluginComponent } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useDialogPluginComponent } from 'quasar';
+
+import VnInput from 'src/components/common/VnInput.vue';
 
 const { dialogRef, onDialogOK } = useDialogPluginComponent();
 const { t, availableLocales } = useI18n();
@@ -117,24 +119,10 @@ async function send() {
                 />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <QInput
-                    :label="t('Phone')"
-                    v-model="phone"
-                    rounded
-                    outlined
-                    autofocus
-                    dense
-                />
+                <VnInput :label="t('Phone')" v-model="phone" is-outlined />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <QInput
-                    :label="t('Subject')"
-                    v-model="subject"
-                    rounded
-                    outlined
-                    autofocus
-                    dense
-                />
+                <VnInput v-model="subject" :label="t('Subject')" is-outlined />
             </QCardSection>
             <QCardSection class="q-mb-md" q-input>
                 <QInput
@@ -198,7 +186,7 @@ async function send() {
 en:
     CustomerDefaultLanguage: This customer uses <strong>{locale}</strong> as their default language
     templates:
-        pendingPayment: 'Your order is pending of payment. 
+        pendingPayment: 'Your order is pending of payment.
             Please, enter the website and make the payment with a credit card. Thank you.'
         minAmount: 'A minimum amount of 50€ (VAT excluded) is required for your order 
             { orderId } of { shipped } to receive it without additional shipping costs.'
@@ -215,7 +203,7 @@ es:
     Subject: Asunto
     Message: Mensaje
     templates:
-        pendingPayment: 'Su pedido está pendiente de pago. 
+        pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
         minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido 
             { orderId } del día { shipped } para recibirlo sin portes adicionales.'
@@ -249,7 +237,7 @@ pt:
     Subject: Assunto
     Message: Mensagem
     templates:
-        pendingPayment: 'Seu pedido está pendente de pagamento. 
+        pendingPayment: 'Seu pedido está pendente de pagamento.
             Por favor, acesse o site e faça o pagamento com cartão. Muito obrigado.'
         minAmount: 'É necessário um valor mínimo de 50€ (sem IVA) em seu pedido 
             { orderId } do dia { shipped } para recebê-lo sem custos de envio adicionais.'
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 2669b53a9..9571c742e 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,8 +1,7 @@
 <script setup>
-import { onMounted, useSlots, ref, watch, computed } from 'vue';
+import { onMounted, useSlots, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import axios from 'axios';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 
@@ -62,7 +61,7 @@ async function getData() {
         filter: $props.filter,
         skip: 0,
     });
-    const { data } = await arrayData.fetch({ append: false });
+    const { data } = await arrayData.fetch({ append: false, updateRouter: false });
     entity.value = data;
     emit('onFetch', data);
 }
diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue
index b385b684f..5a5483084 100644
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@@ -1,18 +1,37 @@
 <script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
 import { useSession } from 'src/composables/useSession';
+import { useColor } from 'src/composables/useColor';
+
 const $props = defineProps({
-    worker: { type: Number, required: true },
+    workerId: { type: Number, required: true },
     description: { type: String, default: null },
+    size: { type: String, default: null },
+    title: { type: String, default: null },
 });
 const session = useSession();
 const token = session.getToken();
+const { t } = useI18n();
+
+const title = computed(() => $props.title ?? t('globals.system'));
+const showLetter = ref(false);
 </script>
 <template>
     <div class="avatar-picture column items-center">
-        <QAvatar color="orange">
+        <QAvatar
+            :style="{
+                backgroundColor: useColor(title),
+            }"
+            :size="$props.size"
+            :title="title"
+        >
+            <template v-if="showLetter">{{ title.charAt(0) }}</template>
             <QImg
-                :src="`/api/Images/user/160x160/${$props.worker}/download?access_token=${token}`"
+                v-else
+                :src="`/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`"
                 spinner-color="white"
+                @error="showLetter = true"
             />
         </QAvatar>
         <div class="description">
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 9cd5a052f..dfe0e57ab 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -4,6 +4,8 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import toDate from 'filters/toDate';
 
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
@@ -24,11 +26,32 @@ const props = defineProps({
         type: Boolean,
         default: true,
     },
+    unremovableParams: {
+        type: Array,
+        required: false,
+        default: () => [],
+        description:
+            'Algunos filtros vienen con parametros de búsqueda por default y necesitan tener si o si un valor, por eso de ser necesario, esta prop nos sirve para saber que filtros podemos remover y cuales no',
+    },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
+    hiddenTags: {
+        type: Array,
+        default: () => [],
+    },
+    customTags: {
+        type: Array,
+        default: () => [],
+    },
 });
 
-const emit = defineEmits(['refresh', 'clear', 'search']);
+const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
 
-const arrayData = useArrayData(props.dataKey);
+const arrayData = useArrayData(props.dataKey, {
+    exprBuilder: props.exprBuilder,
+});
 const store = arrayData.store;
 const userParams = ref({});
 
@@ -37,12 +60,16 @@ onMounted(() => {
     if (Object.keys(store.userParams).length > 0) {
         userParams.value = JSON.parse(JSON.stringify(store.userParams));
     }
+    emit('init', { params: userParams.value });
 });
 
 const isLoading = ref(false);
 async function search() {
     isLoading.value = true;
     const params = { ...userParams.value };
+    store.userParamsChanged = true;
+    store.filter.skip = 0;
+    store.skip = 0;
     const { params: newParams } = await arrayData.addFilter({ params });
     userParams.value = newParams;
 
@@ -63,32 +90,50 @@ async function reload() {
 }
 
 async function clearFilters() {
-    userParams.value = {};
     isLoading.value = true;
-    await arrayData.applyFilter({ params: {} });
-    if (!props.showAll) store.data = [];
-    isLoading.value = false;
+    store.userParamsChanged = true;
+    store.filter.skip = 0;
+    store.skip = 0;
+    // Filtrar los params no removibles
+    const removableFilters = Object.keys(userParams.value).filter((param) =>
+        props.unremovableParams.includes(param)
+    );
+    const newParams = {};
+    // Conservar solo los params que no son removibles
+    for (const key of removableFilters) {
+        newParams[key] = userParams.value[key];
+    }
+    userParams.value = { ...newParams }; // Actualizar los params con los removibles
+    await arrayData.applyFilter({ params: userParams.value });
 
+    if (!props.showAll) {
+        store.data = [];
+    }
+
+    isLoading.value = false;
     emit('clear');
 }
 
-const tags = computed(() => {
-    const params = [];
+const tagsList = computed(() =>
+    Object.entries(userParams.value)
+        .filter(([key, value]) => value && !(props.hiddenTags || []).includes(key))
+        .map(([key, value]) => ({
+            label: key,
+            value: value,
+        }))
+);
 
-    for (const param in userParams.value) {
-        if (!userParams.value[param]) continue;
-        params.push({
-            label: param,
-            value: userParams.value[param],
-        });
-    }
-
-    return params;
-});
+const tags = computed(() =>
+    tagsList.value.filter((tag) => !(props.customTags || []).includes(tag.label))
+);
+const customTags = computed(() =>
+    tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
+);
 
 async function remove(key) {
     userParams.value[key] = null;
     await search();
+    emit('remove', key);
 }
 
 function formatValue(value) {
@@ -144,21 +189,17 @@ function formatValue(value) {
             </QItem>
             <QItem class="q-mb-sm">
                 <div
-                    v-if="tags.length === 0"
+                    v-if="tagsList.length === 0"
                     class="text-grey font-xs text-center full-width"
                 >
                     {{ t(`No filters applied`) }}
                 </div>
                 <div>
-                    <QChip
-                        :key="chip.label"
-                        @remove="remove(chip.label)"
-                        class="text-dark"
-                        color="primary"
-                        icon="label"
-                        removable
-                        size="sm"
+                    <VnFilterPanelChip
                         v-for="chip of tags"
+                        :key="chip.label"
+                        :removable="!unremovableParams.includes(chip.label)"
+                        @remove="remove(chip.label)"
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
@@ -166,7 +207,15 @@ function formatValue(value) {
                                 <span>"{{ chip.value }}"</span>
                             </div>
                         </slot>
-                    </QChip>
+                    </VnFilterPanelChip>
+                    <slot
+                        v-if="$slots.customTags"
+                        name="customTags"
+                        :params="userParams"
+                        :tags="customTags"
+                        :format-fn="formatValue"
+                        :search-fn="search"
+                    />
                 </div>
             </QItem>
             <QSeparator />
diff --git a/src/components/ui/VnFilterPanelChip.vue b/src/components/ui/VnFilterPanelChip.vue
new file mode 100644
index 000000000..89aad39e8
--- /dev/null
+++ b/src/components/ui/VnFilterPanelChip.vue
@@ -0,0 +1,7 @@
+<script setup></script>
+
+<template>
+    <QChip class="text-dark" color="primary" icon="label" size="sm" v-bind="$attrs">
+        <slot />
+    </QChip>
+</template>
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index f02551575..fac74837f 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -1,11 +1,11 @@
 <script setup>
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
 import { toDateHour } from 'src/filters';
 import { ref } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from './VnPaginate.vue';
+import VnUserLink from '../ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: { type: String, required: true },
@@ -28,7 +28,7 @@ async function insert() {
 }
 </script>
 <template>
-    <div class="column items-center">
+    <div class="column items-center full-height">
         <VnPaginate
             :data-key="$props.url"
             :url="$props.url"
@@ -42,13 +42,14 @@ async function insert() {
                 <QCard class="q-pa-md q-mb-md" v-for="(note, index) in rows" :key="index">
                     <QCardSection horizontal>
                         <slot name="picture">
-                            <VnAvatar :worker="note.workerFk" />
+                            <VnAvatar :descriptor="false" :worker-id="note.workerFk" />
                         </slot>
                         <QItem class="full-width justify-between items-start">
-                            <span class="link">
-                                {{ `${note.worker.firstName} ${note.worker.lastName}` }}
-                                <WorkerDescriptorProxy :id="note.worker.id" />
-                            </span>
+                            <VnUserLink
+                                :name="`${note.worker.firstName} ${note.worker.lastName}`"
+                                :worker-id="note.worker.id"
+                            />
+
                             <slot name="actions">
                                 {{ toDateHour(note.created) }}
                             </slot>
@@ -115,6 +116,10 @@ async function insert() {
 <style lang="scss" scoped>
 .q-card {
     max-width: 80em;
+
+    &__section {
+        word-wrap: break-word;
+    }
 }
 .q-dialog .q-card {
     width: 400px;
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c75761462..4c38c1c1a 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -31,7 +31,7 @@ const props = defineProps({
         default: null,
     },
     order: {
-        type: String,
+        type: [String, Array],
         default: '',
     },
     limit: {
@@ -104,6 +104,8 @@ async function paginate() {
     await arrayData.loadMore();
 
     if (!arrayData.hasMoreData.value) {
+        if (store.userParamsChanged) arrayData.hasMoreData.value = true;
+        store.userParamsChanged = false;
         isLoading.value = false;
         return;
     }
@@ -129,9 +131,9 @@ async function onLoad(...params) {
     pagination.value.page = pagination.value.page + 1;
 
     await paginate();
-
-    const endOfPages = !arrayData.hasMoreData.value;
-    done(endOfPages);
+    let isDone = false;
+    if (store.userParamsChanged) isDone = !arrayData.hasMoreData.value;
+    done(isDone);
 }
 </script>
 
@@ -149,7 +151,7 @@ async function onLoad(...params) {
             v-if="props.skeleton && props.autoLoad && !store.data"
             class="card-list q-gutter-y-md"
         >
-            <QCard class="card" v-for="$index in $props.limit" :key="$index">
+            <QCard class="card" v-for="$index in props.limit" :key="$index">
                 <QItem v-ripple class="q-pa-none items-start cursor-pointer q-hoverable">
                     <QItemSection class="q-pa-md">
                         <QSkeleton type="rect" class="q-mb-md" square />
@@ -168,7 +170,12 @@ async function onLoad(...params) {
             </QCard>
         </div>
     </div>
-    <QInfiniteScroll v-if="store.data" @load="onLoad" :offset="offset" class="full-width">
+    <QInfiniteScroll
+        v-if="store.data"
+        @load="onLoad"
+        :offset="offset"
+        class="full-width full-height"
+    >
         <slot name="body" :rows="store.data"></slot>
         <div v-if="isLoading" class="info-row q-pa-md text-center">
             <QSpinner color="orange" size="md" />
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 35f6c1548..eca957092 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,8 +1,12 @@
 <script setup>
 import { onMounted, ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
-import { useArrayData } from 'composables/useArrayData';
 import { useQuasar } from 'quasar';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useArrayData } from 'composables/useArrayData';
+
 const quasar = useQuasar();
 
 const props = defineProps({
@@ -49,6 +53,14 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    staticParams: {
+        type: Array,
+        default: () => [],
+    },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
 });
 
 const router = useRouter();
@@ -65,28 +77,26 @@ onMounted(() => {
 });
 
 async function search() {
+    const staticParams = Object.entries(store.userParams)
+        .filter(([key, value]) => value && (props.staticParams || []).includes(key));
     await arrayData.applyFilter({
         params: {
+            ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
     });
     if (!props.redirect) return;
 
-    const rows = store.data;
-    const module = route.matched[1];
-    if (rows.length === 1) {
-        const [firstRow] = rows;
-        await router.push({ path: `${module.path}/${firstRow.id}` });
-    } else if (route.matched.length > 3) {
-        await router.push({ path: `/${module.path}` });
-        arrayData.updateStateParams();
-    }
+    const { matched: matches } = route;
+    const { path } = matches[matches.length-1];
+    const newRoute = path.replace(':id', searchText.value);
+    await router.push(newRoute);
 }
 </script>
 
 <template>
     <QForm @submit="search">
-        <QInput
+        <VnInput
             id="searchbar"
             v-model="searchText"
             :placeholder="props.label"
@@ -113,7 +123,7 @@ async function search() {
                     <QTooltip>{{ props.info }}</QTooltip>
                 </QIcon>
             </template>
-        </QInput>
+        </VnInput>
     </QForm>
 </template>
 
diff --git a/src/components/ui/VnSms.vue b/src/components/ui/VnSms.vue
new file mode 100644
index 000000000..ceb24b2bb
--- /dev/null
+++ b/src/components/ui/VnSms.vue
@@ -0,0 +1,114 @@
+<script setup>
+import { onBeforeMount } from 'vue';
+import { date } from 'quasar';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnAvatar from '../ui/VnAvatar.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
+
+const $props = defineProps({
+    url: { type: String, default: null },
+    where: { type: Object, default: () => {} },
+});
+
+const filter = {
+    fields: ['smsFk'],
+    include: {
+        relation: 'sms',
+        scope: {
+            fields: [
+                'senderFk',
+                'sender',
+                'destination',
+                'message',
+                'statusCode',
+                'status',
+                'created',
+            ],
+            include: {
+                relation: 'sender',
+                scope: {
+                    fields: ['name'],
+                },
+            },
+        },
+    },
+};
+
+onBeforeMount(() => (filter.where = $props.where));
+
+function formatNumber(number) {
+    if (number.length <= 10) return number;
+    return number.slice(0, 4) + ' ' + number.slice(4);
+}
+</script>
+
+<template>
+    <div class="column items-center">
+        <div class="list">
+            <VnPaginate
+                :data-key="$props.url"
+                :url="$props.url"
+                :filter="filter"
+                order="smsFk DESC"
+                :offset="100"
+                :limit="5"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <QCard
+                        flat
+                        bordered
+                        class="card q-pa-md q-mb-sm smsCard"
+                        v-for="row of rows"
+                        :key="row.smsFk"
+                    >
+                        <QItem>
+                            <QItemSection side top>
+                                <VnUserLink :worker-id="row.sms?.senderFk">
+                                    <template #link>
+                                        <VnAvatar
+                                            :worker-id="row.sms?.senderFk"
+                                            class="cursor-pointer"
+                                            :title="row.sms?.sender?.name"
+                                        />
+                                    </template>
+                                </VnUserLink>
+                            </QItemSection>
+                            <QSeparator />
+                            <QItemSection>
+                                <QItemLabel caption>{{
+                                    formatNumber(row.sms.destination)
+                                }}</QItemLabel>
+                                <QItemLabel>{{ row.sms.message }}</QItemLabel>
+                            </QItemSection>
+                            <QItemSection side>
+                                <QItemLabel caption>{{
+                                    date.formatDate(
+                                        row.sms.created,
+                                        'YYYY-MM-DD HH:mm:ss'
+                                    )
+                                }}</QItemLabel>
+                                <QItemLabel class="row center">
+                                    <QChip
+                                        :color="
+                                            row.sms.status == 'OK'
+                                                ? 'positive'
+                                                : 'negative'
+                                        "
+                                    >
+                                        {{ row.sms.status }}
+                                    </QChip>
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QCard>
+                </template>
+            </VnPaginate>
+        </div>
+    </div>
+</template>
+<style lang="scss" scoped>
+.q-item__section--side {
+    align-items: center;
+}
+</style>
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
new file mode 100644
index 000000000..81a1820f1
--- /dev/null
+++ b/src/components/ui/VnSubToolbar.vue
@@ -0,0 +1,21 @@
+<script setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+const stateStore = useStateStore();
+
+onMounted(() => {
+    stateStore.toggleSubToolbar();
+});
+
+onUnmounted(() => {
+    stateStore.toggleSubToolbar();
+});
+</script>
+
+<template>
+    <QToolbar class="bg-vn-dark justify-end">
+        <div id="st-data"></div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+</template>
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
new file mode 100644
index 000000000..c382ef9f2
--- /dev/null
+++ b/src/components/ui/VnTree.vue
@@ -0,0 +1,159 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { useQuasar } from 'quasar';
+
+import CreateDepartmentChild from '../CreateDepartmentChild.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const quasar = useQuasar();
+const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
+
+const treeRef = ref(null);
+const showCreateNodeFormVal = ref(false);
+const creationNodeSelectedId = ref(null);
+const expanded = ref([]);
+
+const nodes = ref([{ id: null, name: t('Departments'), sons: true, children: [{}] }]);
+
+const fetchedChildrensSet = ref(new Set());
+
+const onNodeExpanded = (nodeKeysArray) => {
+    // Verificar si el nodo ya fue expandido
+    if (!fetchedChildrensSet.value.has(nodeKeysArray.at(-1))) {
+        fetchedChildrensSet.value.add(nodeKeysArray.at(-1));
+        fetchNodeLeaves(nodeKeysArray.at(-1)); // Llamar a la función para obtener los nodos hijos
+    }
+};
+
+const fetchNodeLeaves = async (nodeKey) => {
+    try {
+        const node = treeRef.value.getNodeByKey(nodeKey);
+        if (!node || node.sons === 0) return;
+
+        const params = { parentId: node.id };
+        const response = await axios.get('/departments/getLeaves', { params });
+
+        // Si hay datos en la respuesta y tiene hijos, agregarlos al nodo actual
+        if (response.data) {
+            node.children = response.data;
+            node.children.forEach((node) => {
+                if (node.sons) node.children = [{}];
+            });
+        }
+    } catch (err) {
+        console.error('Error fetching department leaves');
+        throw new Error();
+    }
+};
+
+const removeNode = (node) => {
+    const { id, parentFk } = node;
+    quasar
+        .dialog({
+            title: t('Are you sure you want to delete it?'),
+            message: t('Delete department'),
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.post(`/Departments/${id}/removeChild`, id);
+                notify(t('department.departmentRemoved'), 'positive');
+                await fetchNodeLeaves(parentFk);
+            } catch (err) {
+                console.log('Error removing department');
+            }
+        });
+};
+
+const showCreateNodeForm = (nodeId) => {
+    showCreateNodeFormVal.value = true;
+    creationNodeSelectedId.value = nodeId;
+};
+
+const onNodeCreated = async () => {
+    await fetchNodeLeaves(creationNodeSelectedId.value);
+};
+
+const redirectToDepartmentSummary = (id) => {
+    if (!id) return;
+    router.push({ name: 'DepartmentSummary', params: { id } });
+};
+</script>
+
+<template>
+    <QCard class="full-width" style="max-width: 800px">
+        <QTree
+            ref="treeRef"
+            :nodes="nodes"
+            node-key="id"
+            label-key="name"
+            v-model:expanded="expanded"
+            @update:expanded="onNodeExpanded($event)"
+        >
+            <template #default-header="{ node }">
+                <div
+                    class="row justify-between full-width q-pr-md cursor-pointer"
+                    @click.stop="redirectToDepartmentSummary(node.id)"
+                >
+                    <span class="text-uppercase">
+                        {{ node.name }}
+                    </span>
+                    <div class="row justify-between" style="max-width: max-content">
+                        <QIcon
+                            v-if="node.id"
+                            name="delete"
+                            color="primary"
+                            size="sm"
+                            class="q-pr-xs cursor-pointer"
+                            @click.stop="removeNode(node)"
+                        >
+                            <QTooltip>
+                                {{ t('Remove') }}
+                            </QTooltip>
+                        </QIcon>
+                        <QIcon
+                            name="add"
+                            color="primary"
+                            size="sm"
+                            class="cursor-pointer"
+                            @click.stop="showCreateNodeForm(node.id)"
+                        >
+                            <QTooltip>
+                                {{ t('Create') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                </div>
+            </template>
+        </QTree>
+        <QDialog
+            v-model="showCreateNodeFormVal"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <CreateDepartmentChild
+                :parent-id="creationNodeSelectedId"
+                @on-data-saved="onNodeCreated()"
+            />
+        </QDialog>
+    </QCard>
+</template>
+
+<i18n>
+    es:
+        Departments: Departamentos
+        Remove: Quitar
+        Create: Crear
+        Are you sure you want to delete it?: ¿Seguro que quieres eliminarlo?
+        Delete department: Eliminar departamento
+</i18n>
diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
new file mode 100644
index 000000000..33836550a
--- /dev/null
+++ b/src/components/ui/VnUserLink.vue
@@ -0,0 +1,21 @@
+<script setup>
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import { useI18n } from 'vue-i18n';
+
+const $props = defineProps({
+    name: { type: String, default: null },
+    workerId: { type: Number, default: null },
+    defaultName: { type: Boolean, default: false },
+});
+
+const { t } = useI18n();
+</script>
+<template>
+    <slot name="link">
+        <span :class="{ link: $props.workerId }">
+            {{ $props.defaultName ? $props.name ?? t('globals.system') : $props.name }}
+        </span>
+    </slot>
+    <WorkerDescriptorProxy v-if="$props.workerId" :id="$props.workerId" />
+</template>
+<style scoped></style>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 523340cc9..3f031f1d1 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -58,7 +58,7 @@ export function useArrayData(key, userOptions) {
         }
     }
 
-    async function fetch({ append = false }) {
+    async function fetch({ append = false, updateRouter = true }) {
         if (!store.url) return;
 
         cancelRequest();
@@ -90,7 +90,7 @@ export function useArrayData(key, userOptions) {
         Object.assign(params, userParams);
 
         store.isLoading = true;
-
+        store.currentFilter = params;
         const response = await axios.get(store.url, {
             signal: canceller.signal,
             params,
@@ -100,15 +100,12 @@ export function useArrayData(key, userOptions) {
 
         hasMoreData.value = response.data.length === limit;
 
-        if (append === true) {
+        if (append) {
             if (!store.data) store.data = [];
             for (const row of response.data) store.data.push(row);
-        }
-
-        if (append === false) {
+        } else {
             store.data = response.data;
-
-            updateStateParams();
+            updateRouter && updateStateParams();
         }
 
         store.isLoading = false;
@@ -132,6 +129,7 @@ export function useArrayData(key, userOptions) {
 
     async function applyFilter({ filter, params }) {
         if (filter) store.userFilter = filter;
+        store.filter = {};
         if (params) store.userParams = Object.assign({}, params);
 
         await fetch({ append: false });
@@ -144,7 +142,8 @@ export function useArrayData(key, userOptions) {
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
-
+        store.skip = 0;
+        store.filter.skip = 0;
         await fetch({ append: false });
         return { filter, params };
     }
@@ -155,7 +154,9 @@ export function useArrayData(key, userOptions) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    delete store.filter.where[Object.keys(exprBuilder ? exprBuilder(param) : param)[0]];
+                    delete store.filter.where[
+                        Object.keys(exprBuilder ? exprBuilder(param) : param)[0]
+                    ];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
                     }
diff --git a/src/css/app.scss b/src/css/app.scss
index 65db51d30..bcc75ab38 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -53,3 +53,8 @@ body.body--dark {
     color: var(--vn-text);
     border-radius: 8px;
 }
+
+/* Estilo para el asterisco en campos requeridos */
+.q-field.required .q-field__label:after {
+    content: ' *';
+}
diff --git a/src/filters/dateRange.js b/src/filters/dateRange.js
new file mode 100644
index 000000000..4c0cfe654
--- /dev/null
+++ b/src/filters/dateRange.js
@@ -0,0 +1,8 @@
+export default function dateRange(value) {
+    const minHour = new Date(value);
+    minHour.setHours(0, 0, 0, 0);
+    const maxHour = new Date(value);
+    maxHour.setHours(23, 59, 59, 59);
+
+    return [minHour, maxHour];
+}
diff --git a/src/filters/index.js b/src/filters/index.js
index b0c441641..f0120e663 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -7,6 +7,7 @@ import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
 import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
+import dateRange from './dateRange';
 
 export {
     toLowerCase,
@@ -18,4 +19,5 @@ export {
     toCurrency,
     toPercentage,
     dashIfEmpty,
+    dateRange,
 };
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4e69f05b7..139977e32 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -49,7 +49,6 @@ export default {
         microsip: 'Open in MicroSIP',
         noSelectedRows: `You don't have any line selected`,
         downloadCSVSuccess: 'CSV downloaded successfully',
-        // labels compartidos entre vistas
         reference: 'Reference',
         agency: 'Agency',
         wareHouseOut: 'Warehouse Out',
@@ -63,6 +62,8 @@ export default {
         selectRows: 'Select all { numberRows } row(s)',
         allRows: 'All { numberRows } row(s)',
         markAll: 'Mark all',
+        noResults: 'No results',
+        system: 'System',
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -109,11 +110,28 @@ export default {
     customer: {
         pageTitles: {
             customers: 'Customers',
+            create: 'Create',
             list: 'List',
             webPayments: 'Web Payments',
+            extendedList: 'Extended list',
+            notifications: 'Notifications',
+            defaulter: 'Defaulter',
             createCustomer: 'Create customer',
             summary: 'Summary',
-            basicData: 'Basic Data',
+            basicData: 'Basic data',
+            fiscalData: 'Fiscal data',
+            billingData: 'Billing data',
+            consignees: 'Consignees',
+            notes: 'Notes',
+            credits: 'Credits',
+            greuges: 'Greuges',
+            balance: 'Balance',
+            recoveries: 'Recoveries',
+            webAccess: 'Web access',
+            log: 'Log',
+            sms: 'Sms',
+            creditManagement: 'Credit management',
+            others: 'Others',
         },
         list: {
             phone: 'Phone',
@@ -204,6 +222,52 @@ export default {
             salesPerson: 'Sales person',
             contactChannel: 'Contact channel',
         },
+        extendedList: {
+            tableVisibleColumns: {
+                id: 'Identifier',
+                name: 'Name',
+                fi: 'Tax number',
+                salesPersonFk: 'Salesperson',
+                credit: 'Credit',
+                creditInsurance: 'Credit insurance',
+                phone: 'Phone',
+                mobile: 'Mobile',
+                street: 'Street',
+                countryFk: 'Country',
+                provinceFk: 'Province',
+                city: 'City',
+                postcode: 'Postcode',
+                email: 'Email',
+                created: 'Created',
+                businessTypeFk: 'Business type',
+                payMethodFk: 'Billing data',
+                sageTaxTypeFk: 'Sage tax type',
+                sageTransactionTypeFk: 'Sage tr. type',
+                isActive: 'Active',
+                isVies: 'Vies',
+                isTaxDataChecked: 'Verified data',
+                isEqualizated: 'Is equalizated',
+                isFreezed: 'Freezed',
+                hasToInvoice: 'Invoice',
+                hasToInvoiceByAddress: 'Invoice by address',
+                isToBeMailed: 'Mailing',
+                hasLcr: 'Received LCR',
+                hasCoreVnl: 'VNL core received',
+                hasSepaVnl: 'VNL B2B received',
+            },
+        },
+    },
+    entry: {
+        pageTitles: {
+            entries: 'Entries',
+            list: 'List',
+            createEntry: 'New entry',
+            summary: 'Summary',
+            create: 'Create',
+        },
+        list: {
+            newEntry: 'New entry',
+        },
     },
     ticket: {
         pageTitles: {
@@ -548,6 +612,82 @@ export default {
             country: 'Country',
         },
     },
+    order: {
+        pageTitles: {
+            order: 'Orders',
+            orderList: 'List',
+            create: 'Create',
+            summary: 'Summary',
+            basicData: 'Basic Data',
+            catalog: 'Catalog',
+            volume: 'Volume',
+            lines: 'Lines',
+        },
+        field: {
+            salesPersonFk: 'Sales Person',
+            clientFk: 'Client',
+            isConfirmed: 'Confirmed',
+            created: 'Created',
+            landed: 'Landed',
+            hour: 'Hour',
+            agency: 'Agency',
+            total: 'Total',
+        },
+        form: {
+            clientFk: 'Client',
+            addressFk: 'Address',
+            landed: 'Landed',
+            agencyModeFk: 'Agency',
+        },
+        list: {
+            newOrder: 'New Order',
+        },
+        summary: {
+            basket: 'Basket',
+            nickname: 'Nickname',
+            company: 'Company',
+            confirmed: 'Confirmed',
+            notConfirmed: 'Not confirmed',
+            created: 'Created',
+            landed: 'Landed',
+            phone: 'Phone',
+            createdFrom: 'Created From',
+            address: 'Address',
+            notes: 'Notes',
+            subtotal: 'Subtotal',
+            total: 'Total',
+            vat: 'VAT',
+            state: 'State',
+            alias: 'Alias',
+            items: 'Items',
+            orderTicketList: 'Order Ticket List',
+            details: 'Details',
+            item: 'Item',
+            description: 'Description',
+            quantity: 'Quantity',
+            price: 'Price',
+            amount: 'Amount',
+        },
+    },
+    department: {
+        pageTitles: {
+            basicData: 'Basic data',
+            department: 'Department',
+            summary: 'Summary',
+        },
+        name: 'Name',
+        code: 'Code',
+        chat: 'Chat',
+        bossDepartment: 'Boss Department',
+        email: 'Email',
+        selfConsumptionCustomer: 'Self-consumption customer',
+        telework: 'Telework',
+        notifyOnErrors: 'Notify on errors',
+        worksInProduction: 'Works in production',
+        hasToRefill: 'Fill in days without physical check-ins',
+        hasToSendMail: 'Send check-ins by email',
+        departmentRemoved: 'Department removed',
+    },
     worker: {
         pageTitles: {
             workers: 'Workers',
@@ -555,6 +695,8 @@ export default {
             basicData: 'Basic data',
             summary: 'Summary',
             notifications: 'Notifications',
+            workerCreate: 'New worker',
+            department: 'Department',
         },
         list: {
             name: 'Name',
@@ -564,6 +706,7 @@ export default {
             active: 'Active',
             department: 'Department',
             schedule: 'Schedule',
+            newWorker: 'New worker',
         },
         card: {
             workerId: 'Worker ID',
@@ -595,6 +738,25 @@ export default {
             subscribed: 'Subscribed to the notification',
             unsubscribed: 'Unsubscribed from the notification',
         },
+        create: {
+            name: 'Name',
+            lastName: 'Last name',
+            birth: 'Birth',
+            fi: 'Fi',
+            code: 'Worker code',
+            phone: 'Phone',
+            postcode: 'Postcode',
+            province: 'Province',
+            city: 'City',
+            street: 'Street',
+            webUser: 'Web user',
+            personalEmail: 'Personal email',
+            company: 'Company',
+            boss: 'Boss',
+            payMethods: 'Pay method',
+            iban: 'IBAN',
+            bankEntity: 'Swift / BIC',
+        },
         imageNotFound: 'Image not found',
     },
     wagon: {
@@ -670,6 +832,15 @@ export default {
             list: 'List',
             create: 'Create',
             summary: 'Summary',
+            basicData: 'Basic data',
+            fiscalData: 'Fiscal data',
+            billingData: 'Billing data',
+            log: 'Log',
+            accounts: 'Accounts',
+            contacts: 'Contacts',
+            addresses: 'Addresses',
+            consumption: 'Consumption',
+            agencyTerm: 'Agency agreement',
         },
         list: {
             payMethod: 'Pay method',
@@ -714,6 +885,10 @@ export default {
             create: 'Create',
             summary: 'Summary',
             extraCommunity: 'Extra community',
+            travelCreate: 'New travel',
+            basicData: 'Basic data',
+            history: 'History',
+            thermographs: 'Termographs',
         },
         summary: {
             confirmed: 'Confirmed',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 4b74bc685..43f624cb3 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -62,6 +62,8 @@ export default {
         selectRows: 'Seleccionar las { numberRows } filas(s)',
         allRows: 'Todo { numberRows } filas(s)',
         markAll: 'Marcar todo',
+        noResults: 'Sin resultados',
+        system: 'Sistema',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -108,11 +110,28 @@ export default {
     customer: {
         pageTitles: {
             customers: 'Clientes',
+            create: 'Crear',
             list: 'Listado',
             webPayments: 'Pagos Web',
+            extendedList: 'Listado extendido',
+            notifications: 'Notificaciones',
+            defaulter: 'Morosos',
             createCustomer: 'Crear cliente',
-            basicData: 'Datos básicos',
             summary: 'Resumen',
+            basicData: 'Datos básicos',
+            fiscalData: 'Datos fiscales',
+            billingData: 'Forma de pago',
+            consignees: 'Consignatarios',
+            notes: 'Notas',
+            credits: 'Créditos',
+            greuges: 'Greuges',
+            balance: 'Balance',
+            recoveries: 'Recobros',
+            webAccess: 'Acceso web',
+            log: 'Historial',
+            sms: 'Sms',
+            creditManagement: 'Gestión de crédito',
+            others: 'Otros',
         },
         list: {
             phone: 'Teléfono',
@@ -202,6 +221,51 @@ export default {
             salesPerson: 'Comercial',
             contactChannel: 'Canal de contacto',
         },
+        extendedList: {
+            tableVisibleColumns: {
+                id: 'Identificador',
+                name: 'Nombre',
+                fi: 'NIF / CIF',
+                salesPersonFk: 'Comercial',
+                credit: 'Crédito',
+                creditInsurance: 'Crédito asegurado',
+                phone: 'Teléfono',
+                mobile: 'Móvil',
+                street: 'Dirección fiscal',
+                countryFk: 'País',
+                provinceFk: 'Provincia',
+                city: 'Población',
+                postcode: 'Código postal',
+                email: 'Email',
+                created: 'Fecha creación',
+                businessTypeFk: 'Tipo de negocio',
+                payMethodFk: 'Forma de pago',
+                sageTaxTypeFk: 'Tipo de impuesto Sage',
+                sageTransactionTypeFk: 'Tipo tr. sage',
+                isActive: 'Activo',
+                isVies: 'Vies',
+                isTaxDataChecked: 'Datos comprobados',
+                isEqualizated: 'Recargo de equivalencias',
+                isFreezed: 'Congelado',
+                hasToInvoice: 'Factura',
+                hasToInvoiceByAddress: 'Factura por consigna',
+                isToBeMailed: 'Env. emails',
+                hasLcr: 'Recibido LCR',
+                hasCoreVnl: 'Recibido core VNL',
+                hasSepaVnl: 'Recibido B2B VNL',
+            },
+        },
+    },
+    entry: {
+        pageTitles: {
+            entries: 'Entradas',
+            list: 'Listado',
+            summary: 'Resumen',
+            create: 'Crear',
+        },
+        list: {
+            newEntry: 'Nueva entrada',
+        },
     },
     ticket: {
         pageTitles: {
@@ -371,7 +435,7 @@ export default {
     },
     invoiceOut: {
         pageTitles: {
-            invoiceOuts: 'Crear factura',
+            invoiceOuts: 'Fact. emitidas',
             list: 'Listado',
             negativeBases: 'Bases Negativas',
             globalInvoicing: 'Facturación global',
@@ -456,6 +520,63 @@ export default {
             },
         },
     },
+    order: {
+        pageTitles: {
+            order: 'Cesta',
+            orderList: 'Listado',
+            create: 'Crear',
+            summary: 'Resumen',
+            basicData: 'Datos básicos',
+            catalog: 'Catálogo',
+            volume: 'Volumen',
+            lines: 'Líneas',
+        },
+        field: {
+            salesPersonFk: 'Comercial',
+            clientFk: 'Cliente',
+            isConfirmed: 'Confirmada',
+            created: 'Creado',
+            landed: 'F. entrega',
+            hour: 'Hora',
+            agency: 'Agencia',
+            total: 'Total',
+        },
+        form: {
+            clientFk: 'Cliente',
+            addressFk: 'Dirección',
+            landed: 'F. entrega',
+            agencyModeFk: 'Agencia',
+        },
+        list: {
+            newOrder: 'Nuevo Pedido',
+        },
+        summary: {
+            basket: 'Cesta',
+            nickname: 'Alias',
+            company: 'Empresa',
+            confirmed: 'Confirmada',
+            notConfirmed: 'No confirmada',
+            created: 'Creado',
+            landed: 'F. entrega',
+            phone: 'Teléfono',
+            createdFrom: 'Creado desde',
+            address: 'Dirección',
+            notes: 'Notas',
+            subtotal: 'Subtotal',
+            total: 'Total',
+            vat: 'IVA',
+            state: 'Estado',
+            alias: 'Alias',
+            items: 'Items',
+            orderTicketList: 'Tickets del pedido',
+            details: 'Detalles',
+            item: 'Item',
+            description: 'Descripción',
+            quantity: 'Cantidad',
+            price: 'Precio',
+            amount: 'Monto',
+        },
+    },
     shelving: {
         pageTitles: {
             shelving: 'Carros',
@@ -547,6 +668,25 @@ export default {
             country: 'País',
         },
     },
+    department: {
+        pageTitles: {
+            basicData: 'Basic data',
+            department: 'Departamentos',
+            summary: 'Resumen',
+        },
+        name: 'Nombre',
+        code: 'Código',
+        chat: 'Chat',
+        bossDepartment: 'Jefe de departamento',
+        email: 'Email',
+        selfConsumptionCustomer: 'Cliente autoconsumo',
+        telework: 'Teletrabaja',
+        notifyOnErrors: 'Notificar errores',
+        worksInProduction: 'Pertenece a producción',
+        hasToRefill: 'Completar días sin registros físicos',
+        hasToSendMail: 'Enviar fichadas por mail',
+        departmentRemoved: 'Departamento eliminado',
+    },
     worker: {
         pageTitles: {
             workers: 'Trabajadores',
@@ -554,6 +694,8 @@ export default {
             basicData: 'Datos básicos',
             summary: 'Resumen',
             notifications: 'Notificaciones',
+            workerCreate: 'Nuevo trabajador',
+            department: 'Departamentos',
         },
         list: {
             name: 'Nombre',
@@ -563,6 +705,7 @@ export default {
             active: 'Activo',
             department: 'Departamento',
             schedule: 'Horario',
+            newWorker: 'Nuevo trabajador',
         },
         card: {
             workerId: 'ID Trabajador',
@@ -594,6 +737,25 @@ export default {
             subscribed: 'Se ha suscrito a la notificación',
             unsubscribed: 'Se ha dado de baja de la notificación',
         },
+        create: {
+            name: 'Nombre',
+            lastName: 'Apellido',
+            birth: 'Fecha de nacimiento',
+            fi: 'DNI/NIF/NIE',
+            code: 'Código de trabajador',
+            phone: 'Teléfono',
+            postcode: 'Código postal',
+            province: 'Provincia',
+            city: 'Población',
+            street: 'Dirección',
+            webUser: 'Usuario Web',
+            personalEmail: 'Correo personal',
+            company: 'Empresa',
+            boss: 'Jefe',
+            payMethods: 'Método de pago',
+            iban: 'IBAN',
+            bankEntity: 'Swift / BIC',
+        },
         imageNotFound: 'No se ha encontrado la imagen',
     },
     wagon: {
@@ -669,6 +831,15 @@ export default {
             list: 'Listado',
             create: 'Crear',
             summary: 'Resumen',
+            basicData: 'Datos básicos',
+            fiscalData: 'Datos fiscales',
+            billingData: 'Forma de pago',
+            log: 'Historial',
+            accounts: 'Cuentas',
+            contacts: 'Contactos',
+            addresses: 'Direcciones',
+            consumption: 'Consumo',
+            agencyTerm: 'Acuerdo agencia',
         },
         list: {
             payMethod: 'Método de pago',
@@ -687,7 +858,7 @@ export default {
             payDeadline: 'Plazo de pago',
             payDay: 'Día de pago',
             account: 'Cuenta',
-            fiscalData: 'Data fiscal',
+            fiscalData: 'Datos fiscales',
             sageTaxType: 'Tipo de impuesto Sage',
             sageTransactionType: 'Tipo de transacción Sage',
             sageWithholding: 'Retención sage',
@@ -713,6 +884,10 @@ export default {
             create: 'Crear',
             summary: 'Resumen',
             extraCommunity: 'Extra comunitarios',
+            travelCreate: 'Nuevo envío',
+            basicData: 'Datos básicos',
+            history: 'Historial',
+            thermographs: 'Termógrafos',
         },
         summary: {
             confirmed: 'Confirmado',
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 9c076d98c..021ee685a 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useQuasar } from 'quasar';
 import Navbar from 'src/components/NavBar.vue';
-
 const quasar = useQuasar();
 </script>
 
diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue
index f21e6e568..8e9ab3e41 100644
--- a/src/layouts/OutLayout.vue
+++ b/src/layouts/OutLayout.vue
@@ -26,6 +26,7 @@ const userLocale = computed({
         }
     },
 });
+
 const darkMode = computed({
     get() {
         return Dark.isActive;
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index fb47eeee2..e92e65fc7 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -282,6 +282,8 @@ async function importToNewRefundTicket() {
                 selection="multiple"
                 v-model:selected="selectedRows"
                 :grid="$q.screen.lt.md"
+                :pagination="{ rowsPerPage: 0 }"
+                :hide-bottom="true"
             >
                 <template #body-cell-ticket="{ value }">
                     <QTd align="center">
@@ -335,7 +337,23 @@ async function importToNewRefundTicket() {
                                     </QItemSection>
                                     <QItemSection side>
                                         <QItemLabel v-if="column.name === 'destination'">
-                                            {{ column.value.description }}
+                                            <VnSelectFilter
+                                                v-model="props.row.claimDestinationFk"
+                                                :options="destinationTypes"
+                                                option-label="description"
+                                                option-value="id"
+                                                :autofocus="true"
+                                                dense
+                                                input-debounce="0"
+                                                hide-selected
+                                                @update:model-value="
+                                                    (value) =>
+                                                        updateDestination(
+                                                            value,
+                                                            props.row
+                                                        )
+                                                "
+                                            />
                                         </QItemLabel>
                                         <QItemLabel v-else>
                                             {{ column.value }}
@@ -417,25 +435,6 @@ async function importToNewRefundTicket() {
             </QCardActions>
         </QCard>
     </QDialog>
-    <!-- <QDialog v-model="dialogGreuge">
-        <QCardSection>
-            <QItem class="q-pa-sm">
-                <span class="q-pa-sm q-dialog__title text-white">
-                    {{ t('dialogGreuge title') }}
-                </span>
-                <QBtn class="q-pa-sm" icon="close" flat round dense v-close-popup />
-            </QItem>
-            <QCardActions class="justify-end q-mr-sm">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn
-                    :label="t('globals.save')"
-                    color="primary"
-                    v-close-popup
-                    @click="onUpdateGreugeAccept"
-                />
-            </QCardActions>
-        </QCardSection>
-    </QDialog> -->
 </template>
 <style lang="scss" scoped>
 .slider-container {
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 0f067f281..35f93c736 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -3,11 +3,13 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import { useSession } from 'src/composables/useSession';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnInputDate from "components/common/VnInputDate.vue";
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+import { useSession } from 'src/composables/useSession';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -102,14 +104,17 @@ const statesFilter = {
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QInput
+                    <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')" />
+                    <VnInputDate
+                        v-model="data.created"
+                        :label="t('claim.basicData.created')"
+                    />
                 </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
@@ -165,7 +170,7 @@ const statesFilter = {
                     />
                 </div>
                 <div class="col">
-                    <QInput
+                    <VnInput
                         v-model="data.rma"
                         :label="t('claim.basicData.returnOfMaterial')"
                         :rules="validate('claim.rma')"
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index a8c832967..b6c948c96 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -7,8 +7,8 @@ import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import ClaimDescriptor from './ClaimDescriptor.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
-import { onMounted } from 'vue';
 const stateStore = useStateStore();
 const { t } = useI18n();
 const route = useRoute();
@@ -41,11 +41,7 @@ const entityId = computed(() => {
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 85ae9f7e1..afd22c340 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -2,16 +2,14 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toDate } from 'src/filters';
+import { toDate, toPercentage } from 'src/filters';
 import { useState } from 'src/composables/useState';
-
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: {
@@ -34,7 +32,16 @@ const filter = {
         {
             relation: 'client',
             scope: {
-                include: { relation: 'salesPersonUser' },
+                include: [
+                    { relation: 'salesPersonUser' },
+                    {
+                        relation: 'claimsRatio',
+                        scope: {
+                            fields: ['claimingRate'],
+                            limit: 1,
+                        },
+                    },
+                ],
             },
         },
         {
@@ -118,18 +125,18 @@ const setData = (entity) => {
                 :value="entity.worker.user.name"
             >
                 <template #value>
-                    <span class="link">
-                        {{ entity.worker.user.name }}
-                        <WorkerDescriptorProxy :id="entity.worker.user.id" />
-                    </span>
+                    <VnUserLink
+                        :name="entity.worker.user.name"
+                        :worker-id="entity.worker.id"
+                    />
                 </template>
             </VnLv>
             <VnLv :label="t('claim.card.commercial')">
                 <template #value>
-                    <span class="link">
-                        {{ entity.client?.salesPersonUser?.name }}
-                        <WorkerDescriptorProxy :id="entity.client?.salesPersonFk" />
-                    </span>
+                    <VnUserLink
+                        :name="entity.client?.salesPersonUser?.name"
+                        :worker-id="entity.client?.salesPersonFk"
+                    />
                 </template>
             </VnLv>
             <VnLv
@@ -137,6 +144,10 @@ const setData = (entity) => {
                 :value="entity.ticket?.address?.province?.name"
             />
             <VnLv :label="t('claim.card.zone')" :value="entity.ticket?.zone?.name" />
+            <VnLv
+                :label="t('claim.card.zone')"
+                :value="toPercentage(entity.client?.claimsRatio?.claimingRate)"
+            />
         </template>
         <template #actions="{ entity }">
             <QCardActions>
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 0ab3c6c90..0b740cf64 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -1,13 +1,11 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
-import { getUrl } from 'composables/getUrl';
 import { tMobile } from 'composables/tMobile';
-import router from 'src/router';
 
 const route = useRoute();
 
@@ -21,11 +19,6 @@ const claimRedeliveries = ref([]);
 const workers = ref([]);
 const selected = ref([]);
 const saveButtonRef = ref();
-let salixUrl;
-
-onMounted(async () => {
-    salixUrl = await getUrl(`claim/${route.params.id}`);
-});
 
 const developmentsFilter = {
     fields: [
@@ -54,6 +47,7 @@ const columns = computed(() => [
         optionValue: 'id',
         optionLabel: 'description',
         tabIndex: 1,
+        align: 'left',
     },
     {
         name: 'claimResult',
@@ -66,6 +60,7 @@ const columns = computed(() => [
         optionValue: 'id',
         optionLabel: 'description',
         tabIndex: 2,
+        align: 'left',
     },
     {
         name: 'claimResponsible',
@@ -78,6 +73,7 @@ const columns = computed(() => [
         optionValue: 'id',
         optionLabel: 'description',
         tabIndex: 3,
+        align: 'left',
     },
     {
         name: 'worker',
@@ -89,6 +85,7 @@ const columns = computed(() => [
         optionValue: 'id',
         optionLabel: 'nickname',
         tabIndex: 4,
+        align: 'left',
     },
     {
         name: 'claimRedelivery',
@@ -101,6 +98,7 @@ const columns = computed(() => [
         optionValue: 'id',
         optionLabel: 'description',
         tabIndex: 5,
+        align: 'left',
     },
 ]);
 </script>
@@ -158,6 +156,7 @@ const columns = computed(() => [
                 hide-pagination
                 v-model:selected="selected"
                 :grid="$q.screen.lt.md"
+                table-header-class="text-left"
             >
                 <template #body-cell="{ row, col }">
                     <QTd
@@ -165,7 +164,6 @@ const columns = computed(() => [
                         @keyup.ctrl.enter.stop="claimDevelopmentForm.saveChanges()"
                     >
                         <VnSelectFilter
-                            :label="col.label"
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index fa7fb123f..e7f67bcc2 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -43,17 +43,20 @@ async function onFetchClaim(data) {
     fetchMana();
 }
 
-const amount = ref(0);
-const amountClaimed = ref(0);
+const amount = ref();
+const amountClaimed = ref();
 async function onFetch(rows) {
+    amount.value = 0;
+    amountClaimed.value = 0;
     if (!rows || !rows.length) return;
+
     amount.value = rows.reduce(
-        (acumulator, { sale }) => acumulator + sale.price * sale.quantity,
+        (accumulator, { sale }) => accumulator + sale.price * sale.quantity,
         0
     );
 
     amountClaimed.value = rows.reduce(
-        (acumulator, line) => acumulator + line.sale.price * line.quantity,
+        (accumulator, line) => accumulator + line.sale.price * line.quantity,
         0
     );
 }
@@ -189,6 +192,7 @@ function showImportDialog() {
                 save-url="ClaimBeginnings/crud"
                 :filter="linesFilter"
                 @on-fetch="onFetch"
+                @save-changes="onFetch"
                 v-model:selected="selected"
                 :default-save="false"
                 :default-reset="false"
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 84d350e38..eeaffc85a 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -8,6 +8,10 @@ const state = useState();
 const user = state.getUser();
 const id = route.params.id;
 
+const $props = defineProps({
+    addNote: { type: Boolean, default: true },
+});
+
 const claimFilter = {
     where: { claimFk: id },
     fields: ['created', 'workerFk', 'text'],
@@ -26,8 +30,8 @@ const body = {
 </script>
 <template>
     <div class="column items-center">
-        <VnNotes
-            :add-note="true"
+        <VnNotes style="overflow-y: scroll;"
+            :add-note="$props.addNote"
             :id="id"
             url="claimObservations"
             :filter="claimFilter"
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index d6a7f1333..dcd236027 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -7,8 +7,9 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import FetchData from 'components/FetchData.vue';
 import { getUrl } from 'src/composables/getUrl';
 import { useSession } from 'src/composables/useSession';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -132,7 +133,7 @@ const developmentColumns = ref([
     {
         name: 'worker',
         label: 'claim.summary.worker',
-        field: (row) => row.worker.user.nickname,
+        field: (row) => row.worker?.user.nickname,
         sortable: true,
     },
     {
@@ -195,30 +196,30 @@ function openDialog(dmsId) {
                 </VnLv>
                 <VnLv :label="t('claim.summary.assignedTo')">
                     <template #value>
-                        <span class="link">
-                            {{ claim.worker.user.nickname }}
-                            <WorkerDescriptorProxy :id="claim.workerFk" />
-                        </span>
+                        <VnUserLink
+                            :name="claim.worker?.user?.nickname"
+                            :worker-id="claim.workerFk"
+                        />
                     </template>
                 </VnLv>
                 <VnLv :label="t('claim.summary.attendedBy')">
                     <template #value>
-                        <span class="link">
-                            {{ claim.client.salesPersonUser.name }}
-                            <WorkerDescriptorProxy :id="claim.client.salesPersonFk" />
-                        </span>
+                        <VnUserLink
+                            :name="claim.client?.salesPersonUser?.name"
+                            :worker-id="claim.client?.salesPersonFk"
+                        />
                     </template>
                 </VnLv>
             </QCard>
-            <QCard class="vn-one">
-                <a class="header" :href="claimUrl + 'note/index'">
+            <QCard class="vn-max claimVnNotes">
+                <a class="header" :href="`#/claim/${entityId}/notes`">
                     {{ t('claim.summary.notes') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
-                <!-- Use VnNotes and maybe VirtualScroll-->
+                <ClaimNotes :add-note="false" style="height: 350px" order="created ASC" />
             </QCard>
             <QCard class="vn-max" v-if="salesClaimed.length > 0">
-                <a class="header" :href="claimUrl + 'note/index'">
+                <a class="header" :href="`#/claim/${entityId}/lines`">
                     {{ t('claim.summary.details') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
@@ -312,20 +313,6 @@ function openDialog(dmsId) {
                     />
                 </div>
             </QCard>
-            <!-- <QCardSection class="q-pa-md" v-if="observations.length > 0">
-                <h6>{{ t('claim.summary.notes') }}</h6>
-                <div class="note-list" v-for="note in observations" :key="note.id">
-                    <div class="note-caption">
-                        <span
-                            >{{ note.worker.firstName }} {{ note.worker.lastName }}
-                        </span>
-                        <span>{{ toDate(note.created) }}</span>
-                    </div>
-                    <div class="note-text">
-                        <span>{{ note.text }}</span>
-                    </div>
-                </div>
-            </QCardSection> -->
             <QDialog
                 v-model="multimediaDialog"
                 transition-show="slide-up"
@@ -368,6 +355,13 @@ function openDialog(dmsId) {
         </template>
     </CardSummary>
 </template>
+<style lang="scss">
+.claimVnNotes {
+    .q-card {
+        max-width: 100%;
+    }
+}
+</style>
 <style lang="scss" scoped>
 .q-dialog__inner--minimized > div {
     max-width: 80%;
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index c9716074d..b06f47653 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -1,9 +1,11 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
@@ -34,30 +36,31 @@ const states = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense>
-                <QItem>
+            <QList dense class="list">
+                <QItem class="q-my-sm">
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('Customer ID')"
                             v-model="params.clientFk"
                             lazy-rules
+                            is-outlined
                         >
                             <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </QInput>
+                                <QIcon name="badge" size="xs"></QIcon> </template
+                        ></VnInput>
                     </QItemSection>
                 </QItem>
-                <QItem>
+                <QItem class="q-mb-sm">
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('Client Name')"
                             v-model="params.clientName"
                             lazy-rules
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem>
+                <QItem class="q-mb-sm">
                     <QItemSection v-if="!workers">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
@@ -72,11 +75,15 @@ const states = ref();
                             emit-value
                             map-options
                             use-input
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
                             :input-debounce="0"
                         />
                     </QItemSection>
                 </QItem>
-                <QItem>
+                <QItem class="q-mb-sm">
                     <QItemSection v-if="!workers">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
@@ -91,11 +98,15 @@ const states = ref();
                             emit-value
                             map-options
                             use-input
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
                             :input-debounce="0"
                         />
                     </QItemSection>
                 </QItem>
-                <QItem>
+                <QItem class="q-mb-sm">
                     <QItemSection v-if="!workers">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
@@ -110,11 +121,15 @@ const states = ref();
                             emit-value
                             map-options
                             use-input
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
                             :input-debounce="0"
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-md">
+                <QItem class="q-mb-sm">
                     <QItemSection v-if="!states">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
@@ -128,6 +143,10 @@ const states = ref();
                             option-label="description"
                             emit-value
                             map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
                         />
                     </QItemSection>
                 </QItem>
@@ -151,7 +170,11 @@ const states = ref();
                     </QItem> -->
                     <QItem>
                         <QItemSection>
-                            <VnInputDate v-model="params.created" :label="t('Created')" />
+                            <VnInputDate
+                                v-model="params.created"
+                                :label="t('Created')"
+                                is-outlined
+                            />
                         </QItemSection>
                     </QItem>
                 </QExpansionItem>
@@ -160,6 +183,15 @@ const states = ref();
     </VnFilterPanel>
 </template>
 
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
 <i18n>
 en:
     params:
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 5729ac988..df9af4743 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -11,7 +11,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -38,15 +38,6 @@ function viewSummary(id) {
         },
     });
 }
-
-function viewDescriptor(id) {
-    quasar.dialog({
-        component: CustomerDescriptorProxy,
-        componentProps: {
-            id,
-        },
-    });
-}
 </script>
 
 <template>
@@ -96,20 +87,21 @@ function viewDescriptor(id) {
                         v-for="row of rows"
                     >
                         <template #list-items>
-                            <VnLv label="ID" :value="row.id" />
                             <VnLv :label="t('claim.list.customer')" @click.stop>
                                 <template #value>
-                                    <span class="link">
+                                    <span class="link" @click.stop>
                                         {{ row.clientName }}
                                         <CustomerDescriptorProxy :id="row.clientFk" />
                                     </span>
                                 </template>
                             </VnLv>
-                            <VnLv :label="t('claim.list.assignedTo')" @click.stop>
+                            <VnLv :label="t('claim.list.assignedTo')">
                                 <template #value>
-                                    <span class="link">
-                                        {{ row.workerName }}
-                                        <WorkerDescriptorProxy :id="row.workerFk" />
+                                    <span @click.stop>
+                                        <VnUserLink
+                                            :name="row.workerName"
+                                            :worker-id="row.workerFk"
+                                        />
                                     </span>
                                 </template>
                             </VnLv>
diff --git a/src/pages/Claim/ClaimRmaList.vue b/src/pages/Claim/ClaimRmaList.vue
index 8eac83b1e..3774932e3 100644
--- a/src/pages/Claim/ClaimRmaList.vue
+++ b/src/pages/Claim/ClaimRmaList.vue
@@ -2,10 +2,13 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import axios from 'axios';
+
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import { useArrayData } from 'src/composables/useArrayData';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import axios from 'axios';
 
 const quasar = useQuasar();
 const { t } = useI18n();
@@ -65,7 +68,7 @@ async function remove({ id }) {
         <QPageSticky expand position="top" :offset="[16, 16]">
             <QCard class="card q-pa-md">
                 <QForm @submit="submit">
-                    <QInput
+                    <VnInput
                         ref="input"
                         v-model="newRma.code"
                         :label="t('claim.rmaList.code')"
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
new file mode 100644
index 000000000..9e44f67f5
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Balance</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 47cb6e337..458d50082 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -7,6 +7,7 @@ import { useSession } from 'src/composables/useSession';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -64,7 +65,7 @@ const filterOptions = {
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QInput
+                    <VnInput
                         v-model="data.socialName"
                         :label="t('customer.basicData.socialName')"
                         :rules="validate('client.socialName')"
@@ -87,7 +88,7 @@ const filterOptions = {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QInput
+                    <VnInput
                         v-model="data.contact"
                         :label="t('customer.basicData.contact')"
                         :rules="validate('client.contact')"
@@ -95,7 +96,7 @@ const filterOptions = {
                     />
                 </div>
                 <div class="col">
-                    <QInput
+                    <VnInput
                         v-model="data.email"
                         type="email"
                         :label="t('customer.basicData.email')"
@@ -106,7 +107,7 @@ const filterOptions = {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QInput
+                    <VnInput
                         v-model="data.phone"
                         :label="t('customer.basicData.phone')"
                         :rules="validate('client.phone')"
@@ -114,7 +115,7 @@ const filterOptions = {
                     />
                 </div>
                 <div class="col">
-                    <QInput
+                    <VnInput
                         v-model="data.mobile"
                         :label="t('customer.basicData.mobile')"
                         :rules="validate('client.mobile')"
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
new file mode 100644
index 000000000..c14f3b499
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Billing data</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index c833d0cf9..36ec263f0 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -5,6 +5,7 @@ import { useRoute } from 'vue-router';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const route = useRoute();
@@ -28,11 +29,7 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
new file mode 100644
index 000000000..bab2bd1ff
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Consignees</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerCreditManagement.vue b/src/pages/Customer/Card/CustomerCreditManagement.vue
new file mode 100644
index 000000000..fe24ddfd0
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCreditManagement.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Credit management</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
new file mode 100644
index 000000000..e8a4c3b48
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Credits</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 282a4b958..222406d8a 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -4,9 +4,9 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency } from 'src/filters';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: {
@@ -44,10 +44,10 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         <template #body="{ entity }">
             <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
                 <template #value>
-                    <span class="link">
-                        {{ entity.salesPersonUser.name }}
-                        <WorkerDescriptorProxy :id="entity.salesPersonFk" />
-                    </span>
+                    <VnUserLink
+                        :name="entity.salesPersonUser?.name"
+                        :worker-id="entity.salesPersonFk"
+                    />
                 </template>
             </VnLv>
             <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
new file mode 100644
index 000000000..ced6012b8
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Fiscal data</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
new file mode 100644
index 000000000..d322e04a5
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Greuges</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
new file mode 100644
index 000000000..fe59bf2dc
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerLog.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Log</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
new file mode 100644
index 000000000..65ade2903
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Notes</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerOthers.vue b/src/pages/Customer/Card/CustomerOthers.vue
new file mode 100644
index 000000000..bd4729cab
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerOthers.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Others</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
new file mode 100644
index 000000000..54274717c
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Recoveries</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerSms.vue b/src/pages/Customer/Card/CustomerSms.vue
new file mode 100644
index 000000000..a567f6b47
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerSms.vue
@@ -0,0 +1,17 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import VnSms from 'src/components/ui/VnSms.vue';
+
+const route = useRoute();
+const id = route.params.id;
+
+const where = {
+    clientFk: id,
+    ticketFk: null,
+};
+</script>
+<template>
+    <div class="column items-center">
+        <VnSms url="clientSms" :where="where" />
+    </div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 6693274ac..4ebd6efab 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -38,7 +38,7 @@ const balanceDue = computed(() => {
 const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
-    return customer.value.claimsRatio.claimingRate * 100;
+    return customer.value.claimsRatio.claimingRate;
 });
 
 const priceIncreasingRate = computed(() => {
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
new file mode 100644
index 000000000..95ec77c3d
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Web access</div>
+</template>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
new file mode 100644
index 000000000..cfaef0855
--- /dev/null
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -0,0 +1,266 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+const { t } = useI18n();
+
+const newClientForm = reactive({
+    active: true,
+    name: null,
+    salesPersonFk: null,
+    businessTypeFk: null,
+    fi: null,
+    socialName: null,
+    street: null,
+    postcode: null,
+    city: null,
+    provinceFk: null,
+    countryFk: null,
+    userName: null,
+    email: null,
+    isEqualizated: false,
+});
+
+const postcodeFetchDataRef = ref(null);
+const workersOptions = ref([]);
+const businessTypesOptions = ref([]);
+const citiesLocationOptions = ref([]);
+const provincesLocationOptions = ref([]);
+const countriesOptions = ref([]);
+const postcodesOptions = ref([]);
+
+const onPostcodeCreated = async () => {
+    postcodeFetchDataRef.value.fetch();
+};
+</script>
+
+<template>
+    <FetchData
+        @on-fetch="(data) => (workersOptions = data)"
+        auto-load
+        url="Workers/search?departmentCodes"
+    />
+    <FetchData
+        ref="postcodeFetchDataRef"
+        url="Postcodes/location"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        @on-fetch="(data) => (businessTypesOptions = data)"
+        auto-load
+        url="BusinessTypes"
+    />
+    <FetchData
+        @on-fetch="(data) => (citiesLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (provincesLocationOptions = data)"
+        auto-load
+        url="Provinces/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+        url="Countries"
+    />
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            :form-initial-data="newClientForm"
+            :observe-form-changes="false"
+            model="client"
+            url-create="Clients/createWithUser"
+        >
+            <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">
+                        <VnSelectFilter
+                            :label="t('Salesperson')"
+                            :options="workersOptions"
+                            hide-selected
+                            option-label="name"
+                            option-value="id"
+                            v-model="data.salesPersonFk"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('Business type')"
+                            :options="businessTypesOptions"
+                            hide-selected
+                            option-label="description"
+                            option-value="code"
+                            v-model="data.businessTypeFk"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput v-model="data.fi" :label="t('Tax number')" />
+                    </div>
+                </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">
+                        <VnSelectCreate
+                            v-model="data.postcode"
+                            :label="t('Postcode')"
+                            :rules="validate('Worker.postcode')"
+                            :roles-allowed-to-create="['deliveryAssistant']"
+                            :options="postcodesOptions"
+                            option-label="code"
+                            option-value="code"
+                            hide-selected
+                        >
+                            <template #form>
+                                <CustomerCreateNewPostcode
+                                    @on-data-saved="onPostcodeCreated($event)"
+                                />
+                            </template>
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection v-if="scope.opt">
+                                        <QItemLabel>{{ scope.opt.code }}</QItemLabel>
+                                        <QItemLabel caption
+                                            >{{ scope.opt.code }} -
+                                            {{ scope.opt.town.name }} ({{
+                                                scope.opt.town.province.name
+                                            }},
+                                            {{
+                                                scope.opt.town.province.country.country
+                                            }})</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectCreate>
+                    </div>
+                    <div class="col">
+                        <!-- ciudades -->
+                        <VnSelectFilter
+                            :label="t('City')"
+                            :options="citiesLocationOptions"
+                            hide-selected
+                            option-label="name"
+                            option-value="name"
+                            v-model="data.city"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                        <QItemLabel caption>
+                                            {{
+                                                `${scope.opt.name}, ${scope.opt.province.name} (${scope.opt.province.country.country})`
+                                            }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('Province')"
+                            :options="provincesLocationOptions"
+                            hide-selected
+                            option-label="name"
+                            option-value="id"
+                            v-model="data.provinceFk"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>{{
+                                            `${scope.opt.name} (${scope.opt.country.country})`
+                                        }}</QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('Country')"
+                            :options="countriesOptions"
+                            hide-selected
+                            option-label="country"
+                            option-value="id"
+                            v-model="data.countryFk"
+                        />
+                    </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 v-model="data.email" :label="t('Email')" />
+                    </div>
+                </VnRow>
+                <QCheckbox
+                    :label="t('Is equalizated')"
+                    v-model="newClientForm.isEqualizated"
+                />
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.card {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+    grid-gap: 20px;
+}
+</style>
+
+<i18n>
+es:
+    Comercial name: Nombre comercial
+    Salesperson: Comercial
+    Business type: Tipo de negocio
+    Tax number: NIF / CIF
+    Business name: Razón social
+    Street: Dirección fiscal
+    Postcode: Código postal
+    City: Población
+    Province: Provincia
+    Country: País
+    Web user: Usuario web
+    Email: Email
+    Is equalizated: Recargo de equivalencia
+</i18n>
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index c276b0d3e..36a9add89 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -1,9 +1,11 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -35,31 +37,31 @@ const zones = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense>
-                <QItem>
+            <QList dense class="list">
+                <QItem class="q-my-sm">
                     <QItemSection>
-                        <QInput :label="t('FI')" v-model="params.fi" lazy-rules>
+                        <VnInput :label="t('FI')" v-model="params.fi" is-outlined>
                             <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
+                                <QIcon name="badge" size="xs" />
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
-                <QItem>
+                <QItem class="q-mb-sm">
                     <QItemSection>
-                        <QInput :label="t('Name')" v-model="params.name" lazy-rules />
+                        <VnInput :label="t('Name')" v-model="params.name" is-outlined />
                     </QItemSection>
                 </QItem>
-                <QItem>
+                <QItem class="q-mb-sm">
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('Social Name')"
                             v-model="params.socialName"
-                            lazy-rules
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem>
+                <QItem class="q-mb-sm">
                     <QItemSection v-if="!workers">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
@@ -74,11 +76,15 @@ const zones = ref();
                             emit-value
                             map-options
                             use-input
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
                             :input-debounce="0"
                         />
                     </QItemSection>
                 </QItem>
-                <QItem>
+                <QItem class="q-mb-sm">
                     <QItemSection v-if="!provinces">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
@@ -92,33 +98,45 @@ const zones = ref();
                             option-label="name"
                             emit-value
                             map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
                             :input-debounce="0"
                         />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-mb-md">
                     <QItemSection>
-                        <QInput :label="t('City')" v-model="params.city" lazy-rules />
+                        <VnInput :label="t('City')" v-model="params.city" is-outlined />
                     </QItemSection>
                 </QItem>
                 <QSeparator />
                 <QExpansionItem :label="t('More options')" expand-separator>
                     <QItem>
                         <QItemSection>
-                            <QInput :label="t('Phone')" v-model="params.phone" lazy-rules>
+                            <VnInput
+                                :label="t('Phone')"
+                                v-model="params.phone"
+                                is-outlined
+                            >
                                 <template #prepend>
-                                    <QIcon name="phone" size="sm"></QIcon>
+                                    <QIcon name="phone" size="xs" />
                                 </template>
-                            </QInput>
+                            </VnInput>
                         </QItemSection>
                     </QItem>
                     <QItem>
                         <QItemSection>
-                            <QInput :label="t('Email')" v-model="params.email" lazy-rules>
+                            <VnInput
+                                :label="t('Email')"
+                                v-model="params.email"
+                                is-outlined
+                            >
                                 <template #prepend>
-                                    <QIcon name="email" size="sm"></QIcon>
+                                    <QIcon name="email" size="sm" />
                                 </template>
-                            </QInput>
+                            </VnInput>
                         </QItemSection>
                     </QItem>
                     <QItem>
@@ -135,15 +153,19 @@ const zones = ref();
                                 option-label="name"
                                 emit-value
                                 map-options
+                                hide-selected
+                                dense
+                                outlined
+                                rounded
                             />
                         </QItemSection>
                     </QItem>
                     <QItem>
                         <QItemSection>
-                            <QInput
+                            <VnInput
                                 :label="t('Postcode')"
                                 v-model="params.postcode"
-                                lazy-rules
+                                is-outlined
                             />
                         </QItemSection>
                     </QItem>
@@ -153,6 +175,15 @@ const zones = ref();
     </VnFilterPanel>
 </template>
 
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
 <i18n>
 en:
     params:
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 7e37bb88a..540afcc4c 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -28,25 +28,29 @@ function viewSummary(id) {
         },
     });
 }
+
+const redirectToCreateView = () => {
+    router.push({ name: 'CustomerCreate' });
+};
 </script>
 
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
             <VnSearchbar
-                data-key="CustomerList"
-                :label="t('Search customer')"
                 :info="t('You can search by customer id or name')"
+                :label="t('Search customer')"
+                data-key="CustomerList"
             />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
                 <QBtn
-                    flat
                     @click="stateStore.toggleRightDrawer()"
-                    round
                     dense
+                    flat
                     icon="menu"
+                    round
                 >
                     <QTooltip bottom anchor="bottom right">
                         {{ t('globals.collapseMenu') }}
@@ -55,7 +59,7 @@ function viewSummary(id) {
             </div>
         </Teleport>
     </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+    <QDrawer :width="256" show-if-above side="right" v-model="stateStore.rightDrawer">
         <QScrollArea class="fit text-grey-8">
             <CustomerFilter data-key="CustomerList" />
         </QScrollArea>
@@ -63,18 +67,18 @@ function viewSummary(id) {
     <QPage class="column items-center q-pa-md">
         <div class="card-list">
             <VnPaginate
-                data-key="CustomerList"
-                url="/Clients/filter"
-                order="id DESC"
                 auto-load
+                data-key="CustomerList"
+                order="id DESC"
+                url="/Clients/filter"
             >
                 <template #body="{ rows }">
                     <CardList
-                        v-for="row of rows"
+                        :id="row.id"
                         :key="row.id"
                         :title="row.name"
-                        :id="row.id"
                         @click="navigate(row.id)"
+                        v-for="row of rows"
                     >
                         <template #list-items>
                             <VnLv :label="t('customer.list.email')" :value="row.email" />
@@ -103,6 +107,12 @@ function viewSummary(id) {
                 </template>
             </VnPaginate>
         </div>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn @click="redirectToCreateView()" color="primary" fab icon="add" />
+            <QTooltip>
+                {{ t('New client') }}
+            </QTooltip>
+        </QPageSticky>
     </QPage>
 </template>
 
@@ -117,4 +127,5 @@ function viewSummary(id) {
 es:
     Search customer: Buscar cliente
     You can search by customer id or name: Puedes buscar por id o nombre del cliente
+    New client: Nuevo cliente
 </i18n>
diff --git a/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
new file mode 100644
index 000000000..c4a50a10f
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
@@ -0,0 +1,51 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import { toCurrency } from 'filters/index';
+
+const $props = defineProps({
+    amount: {
+        type: Number,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+</script>
+
+<template>
+    <div class="card_balance q-px-md q-py-sm q-my-sm">
+        <h6 class="title_balance text-center">{{ t('Total') }}</h6>
+        <div class="row">
+            <p class="key_balance">{{ t('Balance due') }}:&ensp;</p>
+            <b class="value_balance">
+                {{ toCurrency($props.amount) }}
+            </b>
+        </div>
+    </div>
+</template>
+
+<style lang="scss">
+.card_balance {
+    border: 1px solid black;
+}
+.title_balance {
+    color: var(--vn-text);
+    margin-top: 0;
+    margin-bottom: 0;
+}
+.key_balance {
+    color: var(--vn-label);
+    margin-bottom: 0;
+}
+.value_balance {
+    color: var(--vn-text);
+    margin-bottom: 0;
+}
+</style>
+
+<i18n>
+es:
+    Total: Total
+    Balance due: Saldo vencido
+</i18n>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
new file mode 100644
index 000000000..d54d5df35
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -0,0 +1,252 @@
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { QBtn, QCheckbox } from 'quasar';
+
+import { toCurrency, toDate } from 'filters/index';
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+
+import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
+import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+const balanceDueTotal = ref(0);
+
+onBeforeMount(async () => {
+    arrayData.value = useArrayData('CustomerDefaulter', {
+        url: 'Defaulters/filter',
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    balanceDueTotal.value = arrayData.value.store.data.reduce(
+        (accumulator, currentValue) => {
+            return accumulator + (currentValue['amount'] || 0);
+        },
+        0
+    );
+    console.log(balanceDueTotal.value);
+    stateStore.rightDrawer = true;
+});
+
+const rows = computed(() => arrayData.value.store.data);
+
+const selected = ref([]);
+const workerId = ref(0);
+const customerId = ref(0);
+
+const tableColumnComponents = {
+    client: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: ({ row }) => selectCustomerId(row.clientFk),
+    },
+    isWorker: {
+        component: QCheckbox,
+        props: ({ value }) => ({
+            disable: true,
+            'model-value': Boolean(value),
+        }),
+        event: () => {},
+    },
+    salesperson: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: ({ row }) => selectWorkerId(row.salesPersonFk),
+    },
+    country: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    paymentMethod: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    balance: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    author: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: ({ row }) => selectWorkerId(row.workerFk),
+    },
+    lastObservation: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    date: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    credit: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    from: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'clientName',
+        label: t('Client'),
+        name: 'client',
+    },
+    {
+        align: 'left',
+        field: 'isWorker',
+        label: t('Is worker'),
+        name: 'isWorker',
+    },
+    {
+        align: 'left',
+        field: 'salesPersonName',
+        label: t('Salesperson'),
+        name: 'salesperson',
+    },
+    {
+        align: 'left',
+        field: 'country',
+        label: t('Country'),
+        name: 'country',
+    },
+    {
+        align: 'left',
+        field: 'payMethod',
+        label: t('P. Method'),
+        name: 'paymentMethod',
+    },
+    {
+        align: 'left',
+        field: ({ amount }) => toCurrency(amount),
+        label: t('Balance D.'),
+        name: 'balance',
+    },
+    {
+        align: 'left',
+        field: 'workerName',
+        label: t('Author'),
+        name: 'author',
+    },
+    {
+        align: 'left',
+        field: 'observation',
+        label: t('Last observation'),
+        name: 'lastObservation',
+    },
+    {
+        align: 'left',
+        field: ({ created }) => toDate(created),
+        label: t('L. O. Date'),
+        name: 'date',
+    },
+    {
+        align: 'left',
+        field: ({ creditInsurance }) => toCurrency(creditInsurance),
+        label: t('Credit I.'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: ({ defaulterSinced }) => toDate(defaulterSinced),
+        label: t('From'),
+        name: 'from',
+    },
+]);
+
+const selectCustomerId = (id) => {
+    workerId.value = 0;
+    customerId.value = id;
+};
+
+const selectWorkerId = (id) => {
+    customerId.value = 0;
+    workerId.value = id;
+};
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
+        </QScrollArea>
+    </QDrawer>
+
+    <QToolbar class="bg-vn-dark">
+        <div id="st-data">
+            <CustomerBalanceDueTotal :amount="balanceDueTotal" />
+        </div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 0 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            hide-bottom
+            row-key="id"
+            selection="multiple"
+            v-model:selected="selected"
+        >
+            <template #body-cell="props">
+                <QTd :props="props">
+                    <QTr :props="props" class="cursor-pointer">
+                        <component
+                            :is="tableColumnComponents[props.col.name].component"
+                            class="col-content"
+                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                            @click="tableColumnComponents[props.col.name].event(props)"
+                        >
+                            {{ props.value }}
+
+                            <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
+                            <CustomerDescriptorProxy v-else :id="customerId" />
+                        </component>
+                    </QTr>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.col-content {
+    border-radius: 4px;
+    padding: 6px;
+}
+</style>
+
+<i18n>
+es:
+    Client: Cliente
+    Is worker: Es trabajador
+    Salesperson: Comercial
+    Country: País
+    P. Method: F. Pago
+    Balance D.: Saldo V.
+    Author: Autor
+    Last observation: Última observación
+    L. O. Date: Fecha Ú. O.
+    Credit I.: Crédito A.
+    From: Desde
+</i18n>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
new file mode 100644
index 000000000..43ceb1bac
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -0,0 +1,238 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const clients = ref();
+const salespersons = ref();
+const countries = ref();
+const authors = ref();
+</script>
+
+<template>
+    <FetchData @on-fetch="(data) => (clients = data)" auto-load url="Clients" />
+    <FetchData
+        :filter="{ where: { role: 'salesPerson' } }"
+        @on-fetch="(data) => (salespersons = data)"
+        auto-load
+        url="Workers/activeWithInheritedRole"
+    />
+    <FetchData @on-fetch="(data) => (countries = data)" auto-load url="Countries" />
+    <FetchData
+        @on-fetch="(data) => (authors = data)"
+        auto-load
+        url="Workers/activeWithInheritedRole"
+    />
+
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+
+        <template #body="{ params }">
+            <QList dense class="list">
+                <QItem class="q-mb-sm q-mt-sm">
+                    <QItemSection v-if="clients">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Client')"
+                            :options="clients"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="clientTypeFk"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.clientFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="salespersons">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Salesperson')"
+                            :options="salespersons"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="id"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.salesPersonFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="countries">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Country')"
+                            :options="countries"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="country"
+                            option-value="id"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.countryFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('P. Method')"
+                            is-outlined
+                            v-model="params.paymentMethod"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('Balance D.')"
+                            is-outlined
+                            v-model="params.balance"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="authors">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Author')"
+                            :options="authors"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="id"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.workerFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('L. O. Date')"
+                            is-outlined
+                            v-model="params.date"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('Credit I.')"
+                            is-outlined
+                            v-model="params.credit"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInputDate
+                            :label="t('From')"
+                            is-outlined
+                            v-model="params.defaulterSinced"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        clientFk: Client
+        salesPersonFk: Salesperson
+        countryFk: Country
+        paymentMethod: P. Method
+        balance: Balance D.
+        workerFk: Author
+        date: L. O. Date
+        credit: Credit I.
+        defaulterSinced: From
+es:
+    params:
+        clientFk: Cliente
+        salesPersonFk: Comercial
+        countryFk: País
+        paymentMethod: F. Pago
+        balance: Saldo V.
+        workerFk: Autor
+        date: Fecha Ú. O.
+        credit: Crédito A.
+        defaulterSinced: Desde
+    Client: Cliente
+    Salesperson: Comercial
+    Country: País
+    P. Method: F. Pago
+    Balance D.: Saldo V.
+    Author: Autor
+    L. O. Date: Fecha Ú. O.
+    Credit I.: Crédito A.
+    From: Desde
+</i18n>
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
new file mode 100644
index 000000000..caee06d60
--- /dev/null
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -0,0 +1,568 @@
+<script setup>
+import { ref, computed, onBeforeMount, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import { QBtn, QIcon } from 'quasar';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
+import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import { dashIfEmpty, toDate } from 'src/filters';
+
+const { t } = useI18n();
+const router = useRouter();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+
+onBeforeMount(async () => {
+    arrayData.value = useArrayData('CustomerExtendedList', {
+        url: 'Clients/extendedListFilter',
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+onMounted(() => {
+    const filteredColumns = columns.value.filter(
+        (col) => col.name !== 'actions' && col.name !== 'customerStatus'
+    );
+    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([]);
+const visibleColumns = ref([]);
+
+const tableColumnComponents = {
+    customerStatus: {
+        component: QIcon,
+        props: (prop) => ({
+            name: !prop.row.isActive
+                ? 'vn:disabled'
+                : prop.row.isActive && prop.row.isFreezed
+                ? 'vn:frozen'
+                : '',
+            color: 'primary',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    id: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => {
+            selectCustomerId(prop.row.id);
+        },
+    },
+    name: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    fi: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    salesPersonFk: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectSalesPersonId(prop.row.salesPersonFk),
+    },
+    credit: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    creditInsurance: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    phone: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    mobile: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    street: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    countryFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    provinceFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    city: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    postcode: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    email: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    created: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    businessTypeFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    payMethodFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    sageTaxTypeFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    sageTransactionTypeFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    isActive: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isActive ? 'check' : 'close',
+            color: prop.row.isActive ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isVies: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isVies ? 'check' : 'close',
+            color: prop.row.isVies ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isTaxDataChecked: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isTaxDataChecked ? 'check' : 'close',
+            color: prop.row.isTaxDataChecked ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isEqualizated: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isEqualizated ? 'check' : 'close',
+            color: prop.row.isEqualizated ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isFreezed: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isFreezed ? 'check' : 'close',
+            color: prop.row.isFreezed ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasToInvoice: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasToInvoice ? 'check' : 'close',
+            color: prop.row.hasToInvoice ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasToInvoiceByAddress: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasToInvoiceByAddress ? 'check' : 'close',
+            color: prop.row.hasToInvoiceByAddress ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isToBeMailed: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isToBeMailed ? 'check' : 'close',
+            color: prop.row.isToBeMailed ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasLcr: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasLcr ? 'check' : 'close',
+            color: prop.row.hasLcr ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasCoreVnl: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasCoreVnl ? 'check' : 'close',
+            color: prop.row.hasCoreVnl ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasSepaVnl: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasSepaVnl ? 'check' : 'close',
+            color: prop.row.hasSepaVnl ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    actions: {
+        component: CustomerExtendedListActions,
+        props: (prop) => ({
+            id: prop.row.id,
+        }),
+        event: () => {},
+    },
+};
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: '',
+        label: '',
+        name: 'customerStatus',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        name: 'id',
+    },
+    {
+        align: 'left',
+        field: 'name',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'name',
+    },
+    {
+        align: 'left',
+        field: 'fi',
+        label: t('customer.extendedList.tableVisibleColumns.fi'),
+        name: 'fi',
+    },
+    {
+        align: 'left',
+        field: 'salesPerson',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'salesPersonFk',
+    },
+    {
+        align: 'left',
+        field: 'credit',
+        label: t('customer.extendedList.tableVisibleColumns.credit'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: 'creditInsurance',
+        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
+        name: 'creditInsurance',
+    },
+    {
+        align: 'left',
+        field: 'phone',
+        label: t('customer.extendedList.tableVisibleColumns.phone'),
+        name: 'phone',
+    },
+    {
+        align: 'left',
+        field: 'mobile',
+        label: t('customer.extendedList.tableVisibleColumns.mobile'),
+        name: 'mobile',
+    },
+    {
+        align: 'left',
+        field: 'street',
+        label: t('customer.extendedList.tableVisibleColumns.street'),
+        name: 'street',
+    },
+    {
+        align: 'left',
+        field: 'country',
+        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
+        name: 'countryFk',
+    },
+    {
+        align: 'left',
+        field: 'province',
+        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
+        name: 'provinceFk',
+    },
+    {
+        align: 'left',
+        field: 'city',
+        label: t('customer.extendedList.tableVisibleColumns.city'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        field: 'postcode',
+        label: t('customer.extendedList.tableVisibleColumns.postcode'),
+        name: 'postcode',
+    },
+    {
+        align: 'left',
+        field: 'email',
+        label: t('customer.extendedList.tableVisibleColumns.email'),
+        name: 'email',
+    },
+    {
+        align: 'left',
+        field: 'created',
+        label: t('customer.extendedList.tableVisibleColumns.created'),
+        name: 'created',
+        format: (value) => toDate(value),
+    },
+    {
+        align: 'left',
+        field: 'businessType',
+        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
+        name: 'businessTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'payMethod',
+        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
+        name: 'payMethodFk',
+    },
+    {
+        align: 'left',
+        field: 'sageTaxType',
+        label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
+        name: 'sageTaxTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'sageTransactionType',
+        label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
+        name: 'sageTransactionTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'isActive',
+        label: t('customer.extendedList.tableVisibleColumns.isActive'),
+        name: 'isActive',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isVies',
+        label: t('customer.extendedList.tableVisibleColumns.isVies'),
+        name: 'isVies',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isTaxDataChecked',
+        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
+        name: 'isTaxDataChecked',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isEqualizated',
+        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
+        name: 'isEqualizated',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isFreezed',
+        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
+        name: 'isFreezed',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasToInvoice',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
+        name: 'hasToInvoice',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasToInvoiceByAddress',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
+        name: 'hasToInvoiceByAddress',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isToBeMailed',
+        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
+        name: 'isToBeMailed',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasLcr',
+        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
+        name: 'hasLcr',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasCoreVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
+        name: 'hasCoreVnl',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasSepaVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
+        name: 'hasSepaVnl',
+        format: () => ' ',
+    },
+    {
+        align: 'right',
+        field: 'actions',
+        label: '',
+        name: 'actions',
+    },
+]);
+
+const stopEventPropagation = (event, col) => {
+    if (!['id', 'salesPersonFk'].includes(col.name)) return;
+    event.preventDefault();
+    event.stopPropagation();
+};
+
+const navigateToTravelId = (id) => {
+    router.push({ path: `/customer/${id}` });
+};
+
+const selectCustomerId = (id) => {
+    selectedCustomerId.value = id;
+};
+
+const selectSalesPersonId = (id) => {
+    console.log('selectedSalesPersonId:: ', selectedSalesPersonId.value);
+    selectedSalesPersonId.value = id;
+};
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <CustomerExtendedListFilter
+                v-if="visibleColumns.length !== 0"
+                data-key="CustomerExtendedList"
+                :visible-columns="visibleColumns"
+            />
+        </QScrollArea>
+    </QDrawer>
+
+    <QToolbar class="bg-vn-dark">
+        <div id="st-data">
+            <TableVisibleColumns
+                :all-columns="allColumnNames"
+                table-code="clientsDetail"
+                labels-traductions-path="customer.extendedList.tableVisibleColumns"
+                @on-config-saved="
+                    visibleColumns = ['customerStatus', ...$event, 'actions']
+                "
+            />
+        </div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 12 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            row-key="id"
+            :visible-columns="visibleColumns"
+        >
+            <template #body="props">
+                <QTr
+                    :props="props"
+                    @click="navigateToTravelId(props.row.id)"
+                    class="cursor-pointer"
+                >
+                    <QTd
+                        v-for="col in props.cols"
+                        :key="col.name"
+                        :props="props"
+                        @click="stopEventPropagation($event, col)"
+                    >
+                        <component
+                            :is="tableColumnComponents[col.name].component"
+                            class="col-content"
+                            v-bind="tableColumnComponents[col.name].props(props)"
+                            @click="tableColumnComponents[col.name].event(props)"
+                        >
+                            {{ dashIfEmpty(col.value) }}
+                            <WorkerDescriptorProxy
+                                v-if="props.row.salesPersonFk"
+                                :id="selectedSalesPersonId"
+                            />
+                            <CustomerDescriptorProxy
+                                v-if="props.row.id"
+                                :id="selectedCustomerId"
+                            />
+                        </component>
+                    </QTd>
+                </QTr>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.col-content {
+    border-radius: 4px;
+    padding: 6px;
+}
+</style>
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue
new file mode 100644
index 000000000..a7c51d714
--- /dev/null
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue
@@ -0,0 +1,71 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import { useQuasar } from 'quasar';
+
+import CustomerSummaryDialog from '../Card/CustomerSummaryDialog.vue';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const router = useRouter();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+const redirectToCreateView = () => {
+    router.push({
+        name: 'TicketList',
+        query: {
+            params: JSON.stringify({
+                clientFk: $props.id,
+            }),
+        },
+    });
+};
+
+const viewSummary = () => {
+    quasar.dialog({
+        component: CustomerSummaryDialog,
+        componentProps: {
+            id: $props.id,
+        },
+    });
+};
+</script>
+
+<template>
+    <div>
+        <QIcon
+            @click.stop="redirectToCreateView"
+            color="primary"
+            name="vn:ticket"
+            size="sm"
+        >
+            <QTooltip>
+                {{ t('Client ticket list') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            @click.stop="viewSummary"
+            class="q-ml-md"
+            color="primary"
+            name="preview"
+            size="sm"
+        >
+            <QTooltip>
+                {{ t('Preview') }}
+            </QTooltip>
+        </QIcon>
+    </div>
+</template>
+
+<i18n>
+es:
+    Client ticket list: Listado de tickets del cliente
+    Preview: Vista previa
+</i18n>
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
new file mode 100644
index 000000000..46b4e1e7b
--- /dev/null
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -0,0 +1,617 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import { dateRange } from 'src/filters';
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    visibleColumns: {
+        type: Array,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+
+const clients = ref();
+const workers = ref();
+const countriesOptions = ref([]);
+const provincesOptions = ref([]);
+const paymethodsOptions = ref([]);
+const businessTypesOptions = ref([]);
+const sageTaxTypesOptions = ref([]);
+const sageTransactionTypesOptions = ref([]);
+
+const visibleColumnsSet = computed(() => new Set(props.visibleColumns));
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'created':
+            return {
+                'c.created': {
+                    between: dateRange(value),
+                },
+            };
+        case 'id':
+        case 'name':
+        case 'socialName':
+        case 'fi':
+        case 'credit':
+        case 'creditInsurance':
+        case 'phone':
+        case 'mobile':
+        case 'street':
+        case 'city':
+        case 'postcode':
+        case 'email':
+        case 'isActive':
+        case 'isVies':
+        case 'isTaxDataChecked':
+        case 'isEqualizated':
+        case 'isFreezed':
+        case 'hasToInvoice':
+        case 'hasToInvoiceByAddress':
+        case 'isToBeMailed':
+        case 'hasSepaVnl':
+        case 'hasLcr':
+        case 'hasCoreVnl':
+        case 'countryFk':
+        case 'provinceFk':
+        case 'salesPersonFk':
+        case 'businessTypeFk':
+        case 'payMethodFk':
+        case 'sageTaxTypeFk':
+        case 'sageTransactionTypeFk':
+            return { [`c.${param}`]: value };
+    }
+};
+
+const shouldRenderColumn = (colName) => {
+    return visibleColumnsSet.value.has(colName);
+};
+</script>
+
+<template>
+    <FetchData
+        url="Clients"
+        :filter="{ where: { role: 'socialName' } }"
+        @on-fetch="(data) => (clients = data)"
+        auto-load
+    />
+    <FetchData
+        url="Workers/activeWithInheritedRole"
+        :filter="{ where: { role: 'salesPerson' } }"
+        @on-fetch="(data) => (workers = data)"
+        auto-load
+    />
+    <FetchData
+        url="Workers/activeWithInheritedRole"
+        :filter="{ where: { role: 'salesPerson' } }"
+        @on-fetch="(data) => (workers = data)"
+        auto-load
+    />
+    <FetchData
+        url="Countries"
+        :filter="{ fields: ['id', 'country'], order: 'country ASC' }"
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="provincesFetchDataRef"
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+        url="Provinces"
+    />
+    <FetchData
+        url="Paymethods"
+        @on-fetch="(data) => (paymethodsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="BusinessTypes"
+        @on-fetch="(data) => (businessTypesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="SageTaxTypes"
+        auto-load
+        @on-fetch="(data) => (sageTaxTypesOptions = data)"
+    />
+    <FetchData
+        url="sageTransactionTypes"
+        auto-load
+        @on-fetch="(data) => (sageTransactionTypesOptions = data)"
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :expr-builder="exprBuilder"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong
+                    >{{ t(`customer.extendedList.tableVisibleColumns.${tag.label}`) }}:
+                </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QList dense class="list q-gutter-y-sm q-mt-sm">
+                <QItem v-if="shouldRenderColumn('id')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.id')"
+                            v-model="params.id"
+                            is-outlined
+                            clearable
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('name')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.name')"
+                            v-model="params.name"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <!-- <QItem class="q-mb-sm">
+                    <QItemSection v-if="!clients">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="clients">
+                        <VnSelectFilter
+                            :label="t('Social name')"
+                            v-model="params.socialName"
+                            @update:model-value="searchFn()"
+                            :options="clients"
+                            option-value="socialName"
+                            option-label="socialName"
+                            emit-value
+                            map-options
+                            use-input
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem> -->
+                <QItem v-if="shouldRenderColumn('fi')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.fi')"
+                            v-model="params.fi"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('salesPersonFk')">
+                    <QItemSection v-if="!workers">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="workers">
+                        <VnSelectFilter
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.salesPersonFk'
+                                )
+                            "
+                            v-model="params.salesPersonFk"
+                            @update:model-value="searchFn()"
+                            :options="workers"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            map-options
+                            use-input
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('credit')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.credit')"
+                            v-model="params.credit"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('creditInsurance')">
+                    <QItemSection>
+                        <VnInput
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.creditInsurance'
+                                )
+                            "
+                            v-model="params.creditInsurance"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('phone')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.phone')"
+                            v-model="params.phone"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('mobile')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.mobile')"
+                            v-model="params.mobile"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('street')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.street')"
+                            v-model="params.street"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('countryFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.countryFk')
+                            "
+                            v-model="params.countryFk"
+                            @update:model-value="searchFn()"
+                            :options="countriesOptions"
+                            option-value="id"
+                            option-label="country"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('provinceFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.provinceFk')
+                            "
+                            v-model="params.provinceFk"
+                            @update:model-value="searchFn()"
+                            :options="provincesOptions"
+                            option-value="id"
+                            option-label="name"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('city')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.city')"
+                            v-model="params.city"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('postcode')">
+                    <QItemSection>
+                        <VnInput
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.postcode')
+                            "
+                            v-model="params.postcode"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('email')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.email')"
+                            v-model="params.email"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem v-if="shouldRenderColumn('created')">
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.created"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.created')
+                            "
+                            @update:model-value="searchFn()"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('businessTypeFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.businessTypeFk'
+                                )
+                            "
+                            v-model="params.businessTypeFk"
+                            :options="businessTypesOptions"
+                            @update:model-value="searchFn()"
+                            option-value="code"
+                            option-label="description"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('payMethodFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.payMethodFk')
+                            "
+                            v-model="params.payMethodFk"
+                            :options="paymethodsOptions"
+                            @update:model-value="searchFn()"
+                            option-value="id"
+                            option-label="name"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('sageTaxTypeFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.sageTaxTypeFk'
+                                )
+                            "
+                            v-model="params.sageTaxTypeFk"
+                            @update:model-value="searchFn()"
+                            :options="sageTaxTypesOptions"
+                            option-value="id"
+                            option-label="vat"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('sageTransactionTypeFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'
+                                )
+                            "
+                            v-model="params.sageTransactionTypeFk"
+                            @update:model-value="searchFn()"
+                            :options="sageTransactionTypesOptions"
+                            option-value="id"
+                            option-label="transaction"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="shouldRenderColumn('isActive') || shouldRenderColumn('isVies')"
+                >
+                    <QItemSection v-if="shouldRenderColumn('isActive')">
+                        <QCheckbox
+                            v-model="params.isActive"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.isActive')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('isVies')">
+                        <QCheckbox
+                            v-model="params.isVies"
+                            @update:model-value="searchFn()"
+                            :label="t('customer.extendedList.tableVisibleColumns.isVies')"
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('isEqualizated') ||
+                        shouldRenderColumn('isTaxDataChecked')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('isTaxDataChecked')">
+                        <QCheckbox
+                            v-model="params.isTaxDataChecked"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.isTaxDataChecked'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('isEqualizated')">
+                        <QCheckbox
+                            v-model="params.isEqualizated"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.isEqualizated'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('hasToInvoice') ||
+                        shouldRenderColumn('isFreezed')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('isFreezed')">
+                        <QCheckbox
+                            v-model="params.isFreezed"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.isFreezed')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('hasToInvoice')">
+                        <QCheckbox
+                            v-model="params.hasToInvoice"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.hasToInvoice'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('isToBeMailed') ||
+                        shouldRenderColumn('hasToInvoiceByAddress')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('hasToInvoiceByAddress')">
+                        <QCheckbox
+                            v-model="params.hasToInvoiceByAddress"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('isToBeMailed')">
+                        <QCheckbox
+                            v-model="params.isToBeMailed"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.isToBeMailed'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('hasLcr') || shouldRenderColumn('hasCoreVnl')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('hasLcr')">
+                        <QCheckbox
+                            v-model="params.hasLcr"
+                            @update:model-value="searchFn()"
+                            :label="t('customer.extendedList.tableVisibleColumns.hasLcr')"
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('hasCoreVnl')">
+                        <QCheckbox
+                            v-model="params.hasCoreVnl"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.hasCoreVnl')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('hasSepaVnl')">
+                    <QItemSection>
+                        <QCheckbox
+                            v-model="params.hasSepaVnl"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.hasSepaVnl')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QSeparator />
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
+<i18n>
+es:
+    Social name: Razón social
+</i18n>
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
new file mode 100644
index 000000000..cf66443b9
--- /dev/null
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -0,0 +1,153 @@
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { QBtn } from 'quasar';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+
+import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
+import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+
+onBeforeMount(async () => {
+    arrayData.value = useArrayData('CustomerNotifications', {
+        url: 'Clients',
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+const rows = computed(() => arrayData.value.store.data);
+
+const selected = ref([]);
+const selectedCustomerId = ref(0);
+
+const tableColumnComponents = {
+    id: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectCustomerId(prop.row.id),
+    },
+    socialName: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    city: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    phone: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    email: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'id',
+        label: t('Identifier'),
+        name: 'id',
+    },
+    {
+        align: 'left',
+        field: 'socialName',
+        label: t('Social name'),
+        name: 'socialName',
+    },
+    {
+        align: 'left',
+        field: 'city',
+        label: t('City'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        field: 'phone',
+        label: t('Phone'),
+        name: 'phone',
+    },
+    {
+        align: 'left',
+        field: 'email',
+        label: t('Email'),
+        name: 'email',
+    },
+]);
+
+const selectCustomerId = (id) => {
+    selectedCustomerId.value = id;
+};
+</script>
+
+<template>
+    <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 />
+
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 0 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            hide-bottom
+            row-key="id"
+            selection="multiple"
+            v-model:selected="selected"
+        >
+            <template #body-cell="props">
+                <QTd :props="props">
+                    <QTr :props="props" class="cursor-pointer">
+                        <component
+                            :is="tableColumnComponents[props.col.name].component"
+                            class="col-content"
+                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                            @click="tableColumnComponents[props.col.name].event(props)"
+                        >
+                            {{ props.value }}
+                            <CustomerDescriptorProxy :id="selectedCustomerId" />
+                        </component>
+                    </QTr>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.col-content {
+    border-radius: 4px;
+    padding: 6px;
+}
+</style>
+
+<i18n>
+es:
+    Identifier: Identificador
+    Social name: Razón social
+    Salesperson: Comercial
+    Phone: Teléfono
+    City: Población
+    Email: Email
+</i18n>
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
new file mode 100644
index 000000000..650158278
--- /dev/null
+++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
@@ -0,0 +1,144 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const cities = ref();
+const clients = ref();
+</script>
+
+<template>
+    <FetchData
+        :filter="{ where: { role: 'socialName' } }"
+        @on-fetch="(data) => (clients = data)"
+        auto-load
+        url="Clients"
+    />
+    <FetchData @on-fetch="(data) => (cities = data)" auto-load url="Towns" />
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+
+        <template #body="{ params, searchFn }">
+            <QList dense class="list">
+                <QItem class="q-mb-sm q-mt-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('Identifier')"
+                            is-outlined
+                            v-model="params.identifier"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="!clients">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="clients">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Social name')"
+                            :options="clients"
+                            @update:model-value="searchFn()"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="socialName"
+                            option-value="socialName"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.socialName"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="!cities">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="cities">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('City')"
+                            :options="cities"
+                            @update:model-value="searchFn()"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="name"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.city"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput :label="t('Phone')" is-outlined v-model="params.phone" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput :label="t('Email')" is-outlined v-model="params.email" />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        identifier: Identifier
+        socialName: Social name
+        city: City
+        phone: Phone
+        email: Email
+es:
+    params:
+        identifier: Identificador
+        socialName: Razón social
+        city: Población
+        phone: Teléfono
+        email: Email
+    Identifier: Identificador
+    Social name: Razón social
+    City: Población
+    Phone: Teléfono
+    Email: Email
+</i18n>
diff --git a/src/pages/Customer/CustomerPayments.vue b/src/pages/Customer/Payments/CustomerPayments.vue
similarity index 98%
rename from src/pages/Customer/CustomerPayments.vue
rename to src/pages/Customer/Payments/CustomerPayments.vue
index 24e5efa39..de774e63e 100644
--- a/src/pages/Customer/CustomerPayments.vue
+++ b/src/pages/Customer/Payments/CustomerPayments.vue
@@ -7,7 +7,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
-import CustomerDescriptorProxy from './Card/CustomerDescriptorProxy.vue';
+import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import { toDate, toCurrency } from 'filters/index';
 import CustomerPaymentsFilter from './CustomerPaymentsFilter.vue';
 
@@ -123,8 +123,7 @@ function stateColor(row) {
     </QDrawer>
     <QPage class="column items-center q-pa-md customer-payments">
         <div class="card-list">
-            <QToolbar class="q-pa-none">
-                <QToolbarTitle>{{ t('Web Payments') }}</QToolbarTitle>
+            <QToolbar class="q-pa-none justify-end">
                 <QBtn
                     @click="arrayData.refresh()"
                     :loading="isLoading"
@@ -133,7 +132,7 @@ function stateColor(row) {
                     class="q-mr-sm"
                     round
                     dense
-                ></QBtn>
+                />
                 <QBtn @click="grid = !grid" icon="list" color="primary" round dense>
                     <QTooltip>{{ t('Change view') }}</QTooltip>
                 </QBtn>
diff --git a/src/pages/Customer/CustomerPaymentsFilter.vue b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
similarity index 82%
rename from src/pages/Customer/CustomerPaymentsFilter.vue
rename to src/pages/Customer/Payments/CustomerPaymentsFilter.vue
index 7ee584d7f..a19b35a20 100644
--- a/src/pages/Customer/CustomerPaymentsFilter.vue
+++ b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
@@ -1,6 +1,8 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
+
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
@@ -25,39 +27,39 @@ function isValidNumber(value) {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense>
+            <QList dense class="q-gutter-y-sm q-mt-sm">
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('Order ID')"
                             v-model="params.orderFk"
-                            lazy-rules
+                            is-outlined
                         >
                             <template #prepend>
-                                <QIcon name="vn:basket" size="sm"></QIcon>
+                                <QIcon name="vn:basket" size="xs" />
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('Customer ID')"
                             v-model="params.clientFk"
-                            lazy-rules
+                            is-outlined
                         >
                             <template #prepend>
-                                <QIcon name="vn:client" size="sm"></QIcon>
+                                <QIcon name="vn:client" size="xs" />
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('Amount')"
                             v-model="params.amount"
-                            lazy-rules
+                            is-outlined
                             @update:model-value="
                                 (value) => {
                                     if (value.includes(','))
@@ -68,25 +70,25 @@ function isValidNumber(value) {
                                 (val) =>
                                     isValidNumber(val) || !val || 'Please type a number',
                             ]"
+                            lazy-rules
                         >
                             <template #prepend>
                                 <QIcon name="euro" size="sm" />
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
+
                 <QItem>
                     <QItemSection>
                         <VnInputDate
                             v-model="params.from"
                             :label="t('From')"
+                            is-outlined
                         />
                     </QItemSection>
                     <QItemSection>
-                        <VnInputDate
-                            v-model="params.to"
-                            :label="t('To')"
-                        />
+                        <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
                     </QItemSection>
                 </QItem>
             </QList>
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
new file mode 100644
index 000000000..3b30a97e6
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -0,0 +1,135 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const workersOptions = ref([]);
+const clientsOptions = ref([]);
+</script>
+<template>
+    <fetch-data
+        url="Workers/search"
+        @on-fetch="(data) => (workersOptions = data)"
+        auto-load
+    />
+    <fetch-data url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
+    <FormModel
+        :url="`Departments/${route.params.id}`"
+        model="department"
+        auto-load
+        class="full-width"
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        :label="t('department.name')"
+                        v-model="data.name"
+                        :rules="validate('department.name')"
+                        clearable
+                        autofocus
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.code"
+                        :label="t('department.code')"
+                        :rules="validate('department.code')"
+                        clearable
+                    />
+                </div>
+            </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">
+                    <VnSelectFilter
+                        :label="t('department.bossDepartment')"
+                        v-model="data.workerFk"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                        :rules="validate('department.workerFk')"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('department.selfConsumptionCustomer')"
+                        v-model="data.clientFk"
+                        :options="clientsOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                        :rules="validate('department.clientFk')"
+                    />
+                </div>
+            </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>
+</template>
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Department/Card/DepartmentCard.vue
new file mode 100644
index 000000000..da9accee1
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentCard.vue
@@ -0,0 +1,26 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <DepartmentDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+
+            <div class="q-pa-md column items-center">
+                <RouterView></RouterView>
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
new file mode 100644
index 000000000..1f7e6dcbb
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -0,0 +1,129 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import useCardDescription from 'src/composables/useCardDescription';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+});
+
+const quasar = useQuasar();
+const route = useRoute();
+const router = useRouter();
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const department = ref();
+
+const data = ref(useCardDescription());
+
+const setData = (entity) => {
+    if (!entity) return;
+    data.value = useCardDescription(entity.name, entity.id);
+};
+
+const removeDepartment = () => {
+    console.log('entityId: ', entityId.value);
+    quasar
+        .dialog({
+            title: 'Are you sure you want to delete it?',
+            message: 'Delete department',
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.post(
+                    `/Departments/${entityId.value}/removeChild`,
+                    entityId.value
+                );
+                router.push({ name: 'WorkerDepartment' });
+                notify('department.departmentRemoved', 'positive');
+            } catch (err) {
+                console.log('Error removing department');
+            }
+        });
+};
+</script>
+<template>
+    <CardDescriptor
+        module="Department"
+        data-key="departmentData"
+        :url="`Departments/${entityId}`"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        :summary="$props.summary"
+        @on-fetch="
+            (data) => {
+                department = data;
+                setData(data);
+            }
+        "
+    >
+        <template #menu="{}">
+            <QItem v-ripple clickable @click="removeDepartment()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('department.chat')" :value="entity.chatName" dash />
+            <VnLv :label="t('department.email')" :value="entity.notificationEmail" dash />
+            <VnLv
+                :label="t('department.selfConsumptionCustomer')"
+                :value="entity.client?.name"
+                dash
+            />
+            <VnLv
+                :label="t('department.bossDepartment')"
+                :value="entity.worker?.user?.name"
+                dash
+            />
+        </template>
+        <template #actions>
+            <QCardActions>
+                <QBtn
+                    size="md"
+                    icon="vn:worker"
+                    color="primary"
+                    :to="{
+                        name: 'WorkerList',
+                        query: {
+                            params: JSON.stringify({ departmentFk: entityId }),
+                        },
+                    }"
+                >
+                    <QTooltip>{{ t('Department workers') }}</QTooltip>
+                </QBtn>
+            </QCardActions>
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+    es:
+        Department workers: Trabajadores del departamento
+</i18n>
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
new file mode 100644
index 000000000..40bb4c83d
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -0,0 +1,107 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardSummary from 'components/ui/CardSummary.vue';
+import { getUrl } from 'src/composables/getUrl';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const entityId = computed(() => $props.id || route.params.id);
+const departmentUrl = ref();
+
+onMounted(async () => {
+    departmentUrl.value = (await getUrl('')) + `departments/${entityId.value}/`;
+});
+</script>
+
+<template>
+    <CardSummary
+        ref="summary"
+        :url="`Departments/${entityId}`"
+        class="full-width"
+        style="max-width: 900px"
+    >
+        <template #header="{ entity }">
+            <div>{{ entity.name }}</div>
+        </template>
+        <template #body="{ entity: department }">
+            <QCard class="column">
+                <a class="header" :href="department + `basic-data`">
+                    {{ t('Basic data') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <div class="full-width row wrap justify-between content-between">
+                    <div class="column" style="min-width: 50%">
+                        <VnLv
+                            :label="t('department.name')"
+                            :value="department.name"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.code')"
+                            :value="department.code"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.chat')"
+                            :value="department.chatName"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.bossDepartment')"
+                            :value="department.worker?.user?.name"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.email')"
+                            :value="department.notificationEmail"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.selfConsumptionCustomer')"
+                            :value="department.client?.name"
+                            dash
+                        />
+                    </div>
+                    <div class="column" style="min-width: 50%">
+                        <VnLv
+                            :label="t('department.telework')"
+                            :value="department.isTeleworking"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.notifyOnErrors')"
+                            :value="Boolean(department.hasToMistake)"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.worksInProduction')"
+                            :value="department.isProduction"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.hasToRefill')"
+                            :value="department.hasToRefill"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.hasToSendMail')"
+                            :value="department.hasToSendMail"
+                            dash
+                        />
+                    </div>
+                </div>
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
new file mode 100644
index 000000000..d4937e983
--- /dev/null
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -0,0 +1,24 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <!-- Entry searchbar -->
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <!-- EntryDescriptor -->
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+
+            <div class="q-pa-md"><RouterView></RouterView></div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
new file mode 100644
index 000000000..d4eb8a3ef
--- /dev/null
+++ b/src/pages/Entry/EntryCreate.vue
@@ -0,0 +1,135 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { toDate } from 'src/filters';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const newEntryForm = reactive({
+    supplierFk: null,
+    travelFk: route.query?.travelFk || null,
+    companyFk: null,
+});
+
+const suppliersOptions = ref([]);
+const travelsOptionsOptions = ref([]);
+const companiesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="Suppliers"
+        :filter="{ fields: ['id', 'nickname'] }"
+        order="nickname"
+        @on-fetch="(data) => (suppliersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Travels/filter"
+        :filter="{ fields: ['id', 'warehouseInName'] }"
+        order="id"
+        @on-fetch="(data) => (travelsOptionsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="companiesRef"
+        url="Companies"
+        :filter="{ fields: ['id', 'code'] }"
+        order="code"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+
+    <!-- Agregar searchbar de entries -->
+
+    <QPage>
+        <VnSubToolbar />
+        <FormModel url-create="Entries" model="entry" :form-initial-data="newEntryForm">
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        :label="t('Supplier')"
+                        class="full-width"
+                        v-model="data.supplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :required="true"
+                        :rules="validate('entry.supplierFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        :label="t('Travel')"
+                        class="full-width"
+                        v-model="data.travelFk"
+                        :options="travelsOptionsOptions"
+                        option-value="id"
+                        option-label="warehouseInName"
+                        map-options
+                        hide-selected
+                        :required="true"
+                        :rules="validate('entry.travelFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel
+                                        >{{ scope.opt?.agencyModeName }} -
+                                        {{ scope.opt?.warehouseInName }} ({{
+                                            toDate(scope.opt?.shipped)
+                                        }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
+                                            toDate(scope.opt?.landed)
+                                        }})</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        :label="t('Company')"
+                        class="full-width"
+                        v-model="data.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        map-options
+                        hide-selected
+                        :required="true"
+                        :rules="validate('entry.companyFk')"
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+    es:
+        Supplier: Proveedor
+        Travel: Envío
+        Company: Empresa
+</i18n>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
new file mode 100644
index 000000000..1baa9e019
--- /dev/null
+++ b/src/pages/Entry/EntryList.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+const router = useRouter();
+const { t } = useI18n();
+
+const redirectToCreateView = () => {
+    router.push({ name: 'EntryCreate' });
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+            <QTooltip>
+                {{ t('entry.list.newEntry') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
diff --git a/src/pages/Entry/EntryMain.vue b/src/pages/Entry/EntryMain.vue
new file mode 100644
index 000000000..66ce78f23
--- /dev/null
+++ b/src/pages/Entry/EntryMain.vue
@@ -0,0 +1,17 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'src/components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 4572c4c16..a46978458 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -23,6 +23,7 @@ const userConfig = ref(null);
 
 const suppliers = ref([]);
 const suppliersRef = ref();
+const suppliersRefFilter = ref({ fields: ['id', 'nickname'], limit: 30 });
 const currencies = ref([]);
 const currenciesRef = ref();
 const companies = ref([]);
@@ -130,13 +131,24 @@ async function upsert() {
         });
     }
 }
+
+function supplierRefFilter(val) {
+    let where = { limit: 30 };
+    let params = {};
+    let key = 'nickname';
+
+    if (new RegExp(/\d/g).test(val)) {
+        key = 'id';
+    }
+    params = { [key]: { like: `%${val}%` } };
+    where = Object.assign(where, params);
+    suppliersRef.value.fetch({ where });
+}
 </script>
 <template>
     <FetchData
         ref="suppliersRef"
         url="Suppliers"
-        :filter="{ fields: ['id', 'nickname'] }"
-        limit="30"
         @on-fetch="(data) => (suppliers = data)"
     />
     <FetchData
@@ -145,6 +157,7 @@ async function upsert() {
         :filter="{ fields: ['id', 'code'] }"
         order="code"
         @on-fetch="(data) => (currencies = data)"
+        auto-load
     />
     <FetchData
         ref="companiesRef"
@@ -152,6 +165,7 @@ async function upsert() {
         :filter="{ fields: ['id', 'code'] }"
         order="code"
         @on-fetch="(data) => (companies = data)"
+        auto-load
     />
     <FetchData
         ref="dmsTypesRef"
@@ -159,6 +173,7 @@ async function upsert() {
         :filter="{ fields: ['id', 'name'] }"
         order="name"
         @on-fetch="(data) => (dmsTypes = data)"
+        auto-load
     />
     <FetchData
         ref="warehousesRef"
@@ -166,11 +181,13 @@ async function upsert() {
         :filter="{ fields: ['id', 'name'] }"
         order="name"
         @on-fetch="(data) => (warehouses = data)"
+        auto-load
     />
     <FetchData
         ref="allowTypesRef"
         url="DmsContainers/allowedContentTypes"
         @on-fetch="(data) => (allowedContentTypes = data)"
+        auto-load
     />
     <FetchData
         url="UserConfigs/getUserConfig"
@@ -189,7 +206,8 @@ async function upsert() {
                         option-value="id"
                         option-label="nickname"
                         :input-debounce="100"
-                        @input-value="suppliersRef.fetch()"
+                        @input-value="supplierRefFilter"
+                        :default-filter="false"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -406,7 +424,6 @@ async function upsert() {
                         :options="currencies"
                         option-value="id"
                         option-label="code"
-                        @input-value="currenciesRef.fetch()"
                     />
                 </div>
                 <div class="col">
@@ -417,7 +434,6 @@ async function upsert() {
                         :options="companies"
                         option-value="id"
                         option-label="code"
-                        @input-value="companiesRef.fetch()"
                     />
                 </div>
             </div>
@@ -459,7 +475,6 @@ async function upsert() {
                         :options="companies"
                         option-value="id"
                         option-label="code"
-                        @input-value="companiesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                 </QItem>
@@ -471,7 +486,6 @@ async function upsert() {
                         :options="warehouses"
                         option-value="id"
                         option-label="name"
-                        @input-value="warehousesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                     <VnSelectFilter
@@ -481,7 +495,6 @@ async function upsert() {
                         :options="dmsTypes"
                         option-value="id"
                         option-label="name"
-                        @input-value="dmsTypesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                 </QItem>
@@ -571,7 +584,6 @@ async function upsert() {
                         :options="companies"
                         option-value="id"
                         option-label="code"
-                        @input-value="companiesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                 </QItem>
@@ -583,7 +595,6 @@ async function upsert() {
                         :options="warehouses"
                         option-value="id"
                         option-label="name"
-                        @input-value="warehousesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                     <VnSelectFilter
@@ -593,7 +604,6 @@ async function upsert() {
                         :options="dmsTypes"
                         option-value="id"
                         option-label="name"
-                        @input-value="dmsTypesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                 </QItem>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 4d06cb41e..e22da75bf 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -4,6 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { onMounted, watch } from 'vue';
 import { useRoute } from 'vue-router';
@@ -74,11 +75,7 @@ onMounted(async () => {
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 6348d4167..f8198d237 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -1,9 +1,12 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import FetchData from 'components/FetchData.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -33,28 +36,32 @@ const suppliersRef = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense>
+            <QList dense class="list q-gutter-y-sm q-mt-sm">
                 <QItem>
                     <QItemSection>
-                        <QInput :label="t('Id or Supplier')" v-model="params.search">
+                        <VnInput
+                            :label="t('Id or Supplier')"
+                            v-model="params.search"
+                            is-outlined
+                        >
                             <template #prepend>
                                 <QIcon name="badge" size="sm"></QIcon>
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('params.supplierRef')"
                             v-model="params.supplierRef"
-                            @input.
+                            is-outlined
                             lazy-rules
                         >
                             <template #prepend>
                                 <QIcon name="vn:client" size="sm"></QIcon>
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
@@ -66,52 +73,67 @@ const suppliersRef = ref();
                             option-value="id"
                             option-label="nickname"
                             @input-value="suppliersRef.fetch()"
+                            dense
+                            outlined
+                            rounded
                         >
                         </VnSelectFilter>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput :label="t('params.fi')" v-model="params.fi" lazy-rules>
+                        <VnInput
+                            :label="t('params.fi')"
+                            v-model="params.fi"
+                            is-outlined
+                            lazy-rules
+                        >
                             <template #prepend>
                                 <QIcon name="badge" size="sm"></QIcon>
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('params.serialNumber')"
                             v-model="params.serialNumber"
+                            is-outlined
                             lazy-rules
                         >
                             <template #prepend>
                                 <QIcon name="badge" size="sm"></QIcon>
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('params.serial')"
                             v-model="params.serial"
+                            is-outlined
                             lazy-rules
                         >
                             <template #prepend>
                                 <QIcon name="badge" size="sm"></QIcon>
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput :label="t('Amount')" v-model="params.amount" lazy-rules>
+                        <VnInput
+                            :label="t('Amount')"
+                            v-model="params.amount"
+                            is-outlined
+                            lazy-rules
+                        >
                             <template #prepend>
                                 <QIcon name="euro" size="sm"></QIcon>
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem class="q-mb-md">
@@ -127,137 +149,57 @@ const suppliersRef = ref();
                 <QExpansionItem :label="t('More options')" expand-separator>
                     <QItem>
                         <QItemSection>
-                            <QInput
+                            <VnInput
                                 :label="t('params.awb')"
                                 v-model="params.awbCode"
+                                is-outlined
                                 lazy-rules
                             >
                                 <template #prepend>
                                     <QIcon name="badge" size="sm"></QIcon>
                                 </template>
-                            </QInput>
+                            </VnInput>
                         </QItemSection>
                     </QItem>
                     <QItem>
                         <QItemSection>
-                            <QInput
+                            <VnInput
                                 :label="t('params.account')"
                                 v-model="params.account"
+                                is-outlined
                                 lazy-rules
                             >
                                 <template #prepend>
                                     <QIcon name="person" size="sm" />
                                 </template>
-                            </QInput>
+                            </VnInput>
                         </QItemSection>
                     </QItem>
                     <QItem>
                         <QItemSection>
-                            <QInput :label="t('From')" v-model="params.from" mask="date">
-                                <template #append>
-                                    <QIcon name="event" class="cursor-pointer">
-                                        <QPopupProxy
-                                            cover
-                                            transition-show="scale"
-                                            transition-hide="scale"
-                                        >
-                                            <QDate v-model="params.from" landscape>
-                                                <div
-                                                    class="row items-center justify-end q-gutter-sm"
-                                                >
-                                                    <QBtn
-                                                        :label="t('globals.cancel')"
-                                                        color="primary"
-                                                        flat
-                                                        v-close-popup
-                                                    />
-                                                    <QBtn
-                                                        :label="t('globals.confirm')"
-                                                        color="primary"
-                                                        flat
-                                                        @click="save"
-                                                        v-close-popup
-                                                    />
-                                                </div>
-                                            </QDate>
-                                        </QPopupProxy>
-                                    </QIcon>
-                                </template>
-                            </QInput>
+                            <VnInputDate
+                                :label="t('From')"
+                                v-model="params.from"
+                                is-outlined
+                            />
                         </QItemSection>
                     </QItem>
                     <QItem>
                         <QItemSection>
-                            <QInput :label="t('To')" v-model="params.to" mask="date">
-                                <template #append>
-                                    <QIcon name="event" class="cursor-pointer">
-                                        <QPopupProxy
-                                            cover
-                                            transition-show="scale"
-                                            transition-hide="scale"
-                                        >
-                                            <QDate v-model="params.to" landscape>
-                                                <div
-                                                    class="row items-center justify-end q-gutter-sm"
-                                                >
-                                                    <QBtn
-                                                        :label="t('globals.cancel')"
-                                                        color="primary"
-                                                        flat
-                                                        v-close-popup
-                                                    />
-                                                    <QBtn
-                                                        :label="t('globals.confirm')"
-                                                        color="primary"
-                                                        flat
-                                                        @click="save"
-                                                        v-close-popup
-                                                    />
-                                                </div>
-                                            </QDate>
-                                        </QPopupProxy>
-                                    </QIcon>
-                                </template>
-                            </QInput>
+                            <VnInputDate
+                                :label="t('To')"
+                                v-model="params.to"
+                                is-outlined
+                            />
                         </QItemSection>
                     </QItem>
                     <QItem>
                         <QItemSection>
-                            <QInput
+                            <VnInputDate
                                 :label="t('Issued')"
                                 v-model="params.issued"
-                                mask="date"
-                            >
-                                <template #append>
-                                    <QIcon name="event" class="cursor-pointer">
-                                        <QPopupProxy
-                                            cover
-                                            transition-show="scale"
-                                            transition-hide="scale"
-                                        >
-                                            <QDate v-model="params.issued" landscape>
-                                                <div
-                                                    class="row items-center justify-end q-gutter-sm"
-                                                >
-                                                    <QBtn
-                                                        :label="t('globals.cancel')"
-                                                        color="primary"
-                                                        flat
-                                                        v-close-popup
-                                                    />
-                                                    <QBtn
-                                                        :label="t('globals.confirm')"
-                                                        color="primary"
-                                                        flat
-                                                        @click="save"
-                                                        v-close-popup
-                                                    />
-                                                </div>
-                                            </QDate>
-                                        </QPopupProxy>
-                                    </QIcon>
-                                </template>
-                            </QInput>
+                                is-outlined
+                            />
                         </QItemSection>
                     </QItem>
                 </QExpansionItem>
@@ -266,6 +208,15 @@ const suppliersRef = ref();
     </VnFilterPanel>
 </template>
 
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
 <i18n>
 en:
     params:
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index effccc830..869377209 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -76,7 +76,6 @@ function viewSummary(id) {
                 data-key="InvoiceInList"
                 url="InvoiceIns/filter"
                 order="issued DESC, id DESC"
-                auto-load
             >
                 <template #body="{ rows }">
                     <CardList
@@ -146,7 +145,7 @@ function viewSummary(id) {
             </VnPaginate>
         </div>
     </QPage>
-    <QPageSticky position="bottom-right" :offset="[25, 25]">
+    <QPageSticky position="bottom-right" :offset="[20, 20]">
         <QBtn
             color="primary"
             icon="add"
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index d24eb3ef2..bfab4b9e1 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -4,6 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -26,11 +27,7 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index 5d965816f..124ea00d1 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -1,8 +1,10 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
@@ -39,47 +41,31 @@ function setWorkers(data) {
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense>
+            <QList dense class="q-gutter-y-sm q-mt-sm">
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('Customer ID')"
-                            class="q-mt-sm"
-                            dense
-                            lazy-rules
-                            outlined
-                            rounded
                             v-model="params.clientFk"
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
-                            :label="t('FI')"
-                            class="q-mt-sm"
-                            dense
-                            lazy-rules
-                            outlined
-                            rounded
-                            v-model="params.fi"
-                        />
+                        <VnInput v-model="params.fi" :label="t('FI')" is-outlined />
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('Amount')"
-                            class="q-mt-sm"
-                            dense
-                            lazy-rules
-                            outlined
-                            rounded
                             v-model="params.amount"
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mt-sm">
+                <QItem>
                     <QItemSection>
                         <QInput
                             :label="t('Min')"
@@ -103,7 +89,7 @@ function setWorkers(data) {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-md">
+                <QItem>
                     <QItemSection>
                         <QCheckbox
                             :label="t('Has PDF')"
@@ -120,9 +106,7 @@ function setWorkers(data) {
                             <VnInputDate
                                 v-model="params.issued"
                                 :label="t('Issued')"
-                                dense
-                                outlined
-                                rounded
+                                is-outlined
                             />
                         </QItemSection>
                     </QItem>
@@ -131,9 +115,7 @@ function setWorkers(data) {
                             <VnInputDate
                                 v-model="params.created"
                                 :label="t('Created')"
-                                dense
-                                outlined
-                                rounded
+                                is-outlined
                             />
                         </QItemSection>
                     </QItem>
@@ -142,9 +124,7 @@ function setWorkers(data) {
                             <VnInputDate
                                 v-model="params.dued"
                                 :label="t('Dued')"
-                                dense
-                                outlined
-                                rounded
+                                is-outlined
                             />
                         </QItemSection>
                     </QItem>
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index 7284ca04e..7e2b43a76 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -49,30 +49,28 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
-        {
-            label: t('invoiceOut.globalInvoices.table.client'),
-            field: 'clientName',
-            name: 'clientName',
-            align: 'left',
-        },
-        {
-            label: t('invoiceOut.globalInvoices.table.addressId'),
-            field: 'id',
-            name: 'id',
-            align: 'left',
-        },
-        {
-            label: t('invoiceOut.globalInvoices.table.streetAddress'),
-            field: 'nickname',
-            name: 'nickname',
-            align: 'left',
-        },
-        { label: 'Error', field: 'message', name: 'message', align: 'left' },
-    ];
-});
+const columns = computed(() => [
+    { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
+    {
+        label: t('invoiceOut.globalInvoices.table.client'),
+        field: 'clientName',
+        name: 'clientName',
+        align: 'left',
+    },
+    {
+        label: t('invoiceOut.globalInvoices.table.addressId'),
+        field: 'id',
+        name: 'id',
+        align: 'left',
+    },
+    {
+        label: t('invoiceOut.globalInvoices.table.streetAddress'),
+        field: 'nickname',
+        name: 'nickname',
+        align: 'left',
+    },
+    { label: 'Error', field: 'message', name: 'message', align: 'left' },
+]);
 
 const rows = computed(() => {
     if (!errors && !errors.length > 0) return [];
@@ -175,7 +173,7 @@ onUnmounted(() => {
 
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index c15d56671..c61b9f7ff 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -1,11 +1,13 @@
 <script setup>
 import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 import { storeToRefs } from 'pinia';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
 import FetchData from 'components/FetchData.vue';
-import VnInputDate from "components/common/VnInputDate.vue";
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 
 const { t } = useI18n();
 const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
@@ -55,18 +57,6 @@ const getStatus = computed({
     },
 });
 
-const onFetchCompanies = (companies) => {
-    companiesOptions.value = [...companies];
-};
-
-const onFetchPrinters = (printers) => {
-    printersOptions.value = [...printers];
-};
-
-const onFetchClients = (clients) => {
-    clientsOptions.value = [...clients];
-};
-
 onMounted(async () => {
     await invoiceOutGlobalStore.init();
     formData.value = { ...formInitialData.value };
@@ -74,9 +64,13 @@ onMounted(async () => {
 </script>
 
 <template>
-    <FetchData url="Companies" @on-fetch="(data) => onFetchCompanies(data)" auto-load />
-    <FetchData url="Printers" @on-fetch="(data) => onFetchPrinters(data)" auto-load />
-    <FetchData url="Clients" @on-fetch="(data) => onFetchClients(data)" auto-load />
+    <FetchData
+        url="Companies"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+    <FetchData url="Printers" @on-fetch="(data) => (printersOptions = data)" auto-load />
+    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
 
     <QForm
         v-if="!initialDataLoading && optionsInitialData"
@@ -84,7 +78,7 @@ onMounted(async () => {
         class="form-container q-pa-md"
         style="max-width: 256px"
     >
-        <div class="column q-gutter-y-md">
+        <div class="column q-gutter-y-sm">
             <QRadio
                 v-model="clientsToInvoice"
                 dense
@@ -98,6 +92,7 @@ onMounted(async () => {
                 val="one"
                 :label="t('oneClient')"
                 :dark="true"
+                class="q-mb-sm"
             />
             <VnSelectFilter
                 v-if="clientsToInvoice === 'one'"
@@ -114,15 +109,13 @@ onMounted(async () => {
             <VnInputDate
                 v-model="formData.invoiceDate"
                 :label="t('invoiceDate')"
-                dense
-                outlined
-                rounded />
+                is-outlined
+            />
             <VnInputDate
                 v-model="formData.maxShipped"
                 :label="t('maxShipped')"
-                dense
-                outlined
-                rounded />
+                is-outlined
+            />
             <VnSelectFilter
                 :label="t('company')"
                 v-model="formData.companyFk"
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 7d07b8217..c832d577c 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -1,41 +1,55 @@
 <script setup>
-import { onMounted, ref, reactive } from 'vue';
+import { ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import invoiceOutService from 'src/services/invoiceOut.service';
-import { toCurrency } from 'src/filters';
 import { QCheckbox, QBtn } from 'quasar';
+
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import InvoiceOutNegativeFilter from './InvoiceOutNegativeBasesFilter.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { toCurrency } from 'src/filters';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
-import VnInputDate from 'components/common/VnInputDate.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { useArrayData } from 'composables/useArrayData';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
-
-const rows = ref([]);
+const stateStore = useStateStore();
 const { t } = useI18n();
 
-const dateRange = reactive({
-    from: Date.vnFirstDayOfMonth().toISOString(),
-    to: Date.vnLastDayOfMonth().toISOString(),
+const arrayData = ref(null);
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'from':
+        case 'to':
+            return;
+        default:
+            return { [param]: value };
+    }
+}
+
+onBeforeMount(async () => {
+    const defaultParams = {
+        from: Date.vnFirstDayOfMonth().toISOString(),
+        to: Date.vnLastDayOfMonth().toISOString(),
+    };
+    arrayData.value = useArrayData('InvoiceOutNegative', {
+        url: 'InvoiceOuts/negativeBases',
+        limit: 0,
+        userParams: defaultParams,
+        exprBuilder: exprBuilder,
+    });
+    await arrayData.value.fetch({ append: false });
+
+    stateStore.rightDrawer = true;
 });
 
+const rows = computed(() => arrayData.value.store.data);
+
 const selectedCustomerId = ref(0);
 const selectedWorkerId = ref(0);
 
-const filter = ref({
-    company: null,
-    country: null,
-    clientId: null,
-    client: null,
-    amount: null,
-    base: null,
-    ticketId: null,
-    active: null,
-    hasToInvoice: null,
-    verifiedData: null,
-    comercial: null,
-});
-
 const tableColumnComponents = {
     company: {
         component: 'span',
@@ -103,70 +117,70 @@ const tableColumnComponents = {
     },
 };
 
-const columns = ref([
+const columns = computed(() => [
     {
-        label: 'company',
+        label: t('invoiceOut.negativeBases.company'),
         field: 'company',
         name: 'company',
         align: 'left',
     },
     {
-        label: 'country',
+        label: t('invoiceOut.negativeBases.country'),
         field: 'country',
         name: 'country',
         align: 'left',
     },
     {
-        label: 'clientId',
+        label: t('invoiceOut.negativeBases.clientId'),
         field: 'clientId',
         name: 'clientId',
         align: 'left',
     },
     {
-        label: 'client',
+        label: t('invoiceOut.negativeBases.client'),
         field: 'clientSocialName',
         name: 'client',
         align: 'left',
     },
     {
-        label: 'amount',
+        label: t('invoiceOut.negativeBases.amount'),
         field: 'amount',
         name: 'amount',
         align: 'left',
         format: (value) => toCurrency(value),
     },
     {
-        label: 'base',
+        label: t('invoiceOut.negativeBases.base'),
         field: 'taxableBase',
         name: 'base',
         align: 'left',
     },
     {
-        label: 'ticketId',
+        label: t('invoiceOut.negativeBases.ticketId'),
         field: 'ticketFk',
         name: 'ticketId',
         align: 'left',
     },
     {
-        label: 'active',
+        label: t('invoiceOut.negativeBases.active'),
         field: 'isActive',
         name: 'active',
         align: 'left',
     },
     {
-        label: 'hasToInvoice',
+        label: t('invoiceOut.negativeBases.hasToInvoice'),
         field: 'hasToInvoice',
         name: 'hasToInvoice',
         align: 'left',
     },
     {
-        label: 'verifiedData',
+        label: t('invoiceOut.negativeBases.verifiedData'),
         field: 'isTaxDataChecked',
         name: 'verifiedData',
         align: 'left',
     },
     {
-        label: 'comercial',
+        label: t('invoiceOut.negativeBases.comercial'),
         field: 'comercialName',
         name: 'comercial',
         align: 'left',
@@ -174,8 +188,7 @@ const columns = ref([
 ]);
 
 const downloadCSV = async () => {
-    const params = filter.value;
-
+    const params = {}; // filter.value;
     const filterParams = {
         limit: 20,
         where: {
@@ -187,57 +200,12 @@ const downloadCSV = async () => {
     }
 
     await invoiceOutGlobalStore.getNegativeBasesCsv(
-        dateRange.from,
-        dateRange.to,
-        JSON.stringify(filterParams)
+        arrayData.value.store.userParams.from,
+        arrayData.value.store.userParams.to,
+        params
     );
 };
 
-const search = async () => {
-    const and = [];
-    Object.keys(filter.value).forEach((key) => {
-        if (filter.value[key]) {
-            and.push({
-                [key]: filter.value[key],
-            });
-        }
-    });
-    const searchFilter = {
-        limit: 20,
-    };
-
-    if (and.length) {
-        searchFilter.where = {
-            and,
-        };
-    }
-
-    const params = {
-        ...dateRange,
-        filter: JSON.stringify(searchFilter),
-    };
-    rows.value = await invoiceOutService.getNegativeBases(params);
-};
-
-const refresh = () => {
-    dateRange.from = Date.vnFirstDayOfMonth().toISOString();
-    dateRange.to = Date.vnLastDayOfMonth().toISOString();
-    filter.value = {
-        company: null,
-        country: null,
-        clientId: null,
-        client: null,
-        amount: null,
-        base: null,
-        ticketId: null,
-        active: null,
-        hasToInvoice: null,
-        verifiedData: null,
-        comercial: null,
-    };
-    search();
-};
-
 const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
 };
@@ -245,86 +213,29 @@ const selectCustomerId = (id) => {
 const selectWorkerId = (id) => {
     selectedWorkerId.value = id;
 };
-
-onMounted(() => refresh());
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+            <QBtn color="primary" icon-right="archive" no-caps @click="downloadCSV()" />
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <InvoiceOutNegativeFilter data-key="InvoiceOutNegative" />
+        </QScrollArea>
+    </QDrawer>
+    <VnSubToolbar />
     <QPage class="column items-center q-pa-md">
         <QTable
-            :rows="rows"
             :columns="columns"
+            :rows="rows"
             hide-bottom
             row-key="clientId"
             :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
         >
-            <template #top-left>
-                <div class="row justify-start items-end">
-                    <VnInputDate
-                        v-model="dateRange.from"
-                        :label="t('invoiceOut.negativeBases.from')"
-                        class="q-mr-md"
-                        dense
-                        lazy-rules
-                        outlined
-                        rounded
-                    />
-                    <VnInputDate
-                        v-model="dateRange.to"
-                        :label="t('invoiceOut.negativeBases.to')"
-                        class="q-mr-md"
-                        dense
-                        lazy-rules
-                        outlined
-                        rounded
-                    />
-                    <QBtn
-                        color="primary"
-                        icon-right="archive"
-                        no-caps
-                        @click="downloadCSV()"
-                    />
-                </div>
-            </template>
-            <template #top-right>
-                <div class="row justify-start items-center">
-                    <span class="q-mr-md text-results">
-                        {{ rows.length }} {{ t('results') }}
-                    </span>
-                    <QBtn
-                        color="primary"
-                        icon-right="search"
-                        no-caps
-                        class="q-mr-sm"
-                        @click="search()"
-                    />
-                    <QBtn color="primary" icon-right="refresh" no-caps @click="refresh" />
-                </div>
-            </template>
-            <template #header="props">
-                <QTr :props="props" class="full-height">
-                    <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                        <div class="column justify-start items-start full-height">
-                            {{ t(`invoiceOut.negativeBases.${col.label}`) }}
-                            <QInput
-                                :class="{
-                                    invisible:
-                                        col.field === 'isActive' ||
-                                        col.field === 'hasToInvoice' ||
-                                        col.field === 'isTaxDataChecked',
-                                }"
-                                dense
-                                outlined
-                                rounded
-                                v-model="filter[col.field]"
-                                type="text"
-                                @keyup.enter="search()"
-                            />
-                        </div>
-                    </QTh>
-                </QTr>
-            </template>
             <template #body-cell="props">
                 <QTd :props="props">
                     <component
@@ -345,9 +256,9 @@ onMounted(() => refresh());
                             v-if="props.col.name === 'clientId'"
                             :id="selectedCustomerId"
                         />
-                        <WorkerDescriptorProxy
+                        <VnUserLink
                             v-if="props.col.name === 'comercial'"
-                            :id="selectedWorkerId"
+                            :worker-id="selectedWorkerId"
                         />
                     </component>
                 </QTd>
@@ -359,11 +270,7 @@ onMounted(() => refresh());
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
-}
-
-.text-results {
-    color: var(--vn-label);
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
new file mode 100644
index 000000000..028246aeb
--- /dev/null
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -0,0 +1,134 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :unremovable-params="['from', 'to']"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QList dense class="q-gutter-y-sm q-mt-sm">
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.from"
+                            :label="t('invoiceOut.negativeBases.from')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.to"
+                            :label="t('invoiceOut.negativeBases.to')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.company"
+                            :label="t('invoiceOut.negativeBases.company')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.country"
+                            :label="t('invoiceOut.negativeBases.country')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.clientId"
+                            :label="t('invoiceOut.negativeBases.clientId')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.clientSocialName"
+                            :label="t('invoiceOut.negativeBases.client')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.amount"
+                            :label="t('invoiceOut.negativeBases.amount')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.comercialName"
+                            :label="t('invoiceOut.negativeBases.comercial')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style scoped></style>
+
+<i18n>
+en:
+    params:
+        from: From
+        to: To
+        company: Company
+        country: Country
+        clientId: Client Id
+        clientSocialName: Client
+        amount: Amount
+        comercialName: Comercial
+es:
+    params:
+        from: Desde
+        to: Hasta
+        company: Empresa
+        country: País
+        clientId: Id cliente
+        clientSocialName: Cliente
+        amount: Importe
+        comercialName: Comercial
+    Date is required: La fecha es requerida
+
+</i18n>
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index 2e4fd91ca..e2ccdac16 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -3,12 +3,13 @@ import { ref } from 'vue';
 import { Notify, useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import axios from 'axios';
 
 import { useSession } from 'src/composables/useSession';
 import { useLogin } from 'src/composables/useLogin';
 
 import VnLogo from 'components/ui/VnLogo.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import axios from 'axios';
 
 const quasar = useQuasar();
 const session = useSession();
@@ -68,13 +69,14 @@ async function onSubmit() {
 <template>
     <QForm @submit="onSubmit" class="q-gutter-y-md q-pa-lg formCard">
         <VnLogo alt="Logo" fit="contain" :ratio="16 / 9" class="q-mb-md" />
-        <QInput
+
+        <VnInput
             v-model="username"
             :label="t('login.username')"
             lazy-rules
             :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
         />
-        <QInput
+        <VnInput
             type="password"
             v-model="password"
             :label="t('login.password')"
diff --git a/src/pages/Login/TwoFactor.vue b/src/pages/Login/TwoFactor.vue
index 1c99e8dec..b3a139149 100644
--- a/src/pages/Login/TwoFactor.vue
+++ b/src/pages/Login/TwoFactor.vue
@@ -53,7 +53,7 @@ async function onSubmit() {
             <QIcon name="phonelink_lock" size="xl" color="primary" />
             <h5 class="text-center q-my-md">{{ t('twoFactor.insert') }}</h5>
         </div>
-        <QInput
+        <VnInput
             v-model="code"
             :hint="t('twoFactor.explanation')"
             mask="# # # # # #"
@@ -64,7 +64,7 @@ async function onSubmit() {
             <template #prepend>
                 <QIcon name="lock" />
             </template>
-        </QInput>
+        </VnInput>
         <div class="q-mt-xl">
             <QBtn
                 :label="t('twoFactor.validate')"
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
new file mode 100644
index 000000000..7ac083c37
--- /dev/null
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -0,0 +1,23 @@
+<script setup>
+import LeftMenu from 'components/LeftMenu.vue';
+import { useStateStore } from 'stores/useStateStore';
+import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <OrderDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <RouterView></RouterView>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
new file mode 100644
index 000000000..c325a9b05
--- /dev/null
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -0,0 +1,471 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import axios from 'axios';
+
+import VnInput from 'components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    tags: {
+        type: Array,
+        required: true,
+    },
+});
+
+const categoryList = ref(null);
+const selectedCategoryFk = ref(null);
+const typeList = ref(null);
+const selectedTypeFk = ref(null);
+
+const resetCategory = () => {
+    selectedCategoryFk.value = null;
+    typeList.value = null;
+};
+
+const selectedOrder = ref(null);
+const orderList = [
+    { way: 'ASC', name: 'Ascendant' },
+    { way: 'DESC', name: 'Descendant' },
+];
+
+const selectedOrderField = ref(null);
+const OrderFields = [
+    { field: 'relevancy DESC, name', name: 'Relevancy', priority: 999 },
+    { field: 'showOrder, price', name: 'Color and price', priority: 999 },
+    { field: 'name', name: 'Name', priority: 999 },
+    { field: 'price', name: 'Price', priority: 999 },
+];
+
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
+const selectCategory = (params, category, search) => {
+    if (params.categoryFk === category?.id) {
+        resetCategory();
+        params.categoryFk = null;
+    } else {
+        selectedCategoryFk.value = category?.id;
+        params.categoryFk = category?.id;
+        loadTypes(category?.id);
+    }
+    search();
+};
+
+const loadTypes = async (categoryFk) => {
+    const { data } = await axios.get(`Orders/${route.params.id}/getItemTypeAvailable`, {
+        params: { itemCategoryId: categoryFk },
+    });
+    typeList.value = data;
+};
+
+const onFilterInit = async ({ params }) => {
+    if (params.typeFk) {
+        selectedTypeFk.value = params.typeFk;
+    }
+    if (params.categoryFk) {
+        await loadTypes(params.categoryFk);
+        selectedCategoryFk.value = params.categoryFk;
+    }
+    if (params.orderBy) {
+        orderByParam.value = JSON.parse(params.orderBy);
+        selectedOrder.value = orderByParam.value?.way;
+        selectedOrderField.value = orderByParam.value?.field;
+    }
+};
+
+const selectedCategory = computed(() =>
+    (categoryList.value || []).find(
+        (category) => category?.id === selectedCategoryFk.value
+    )
+);
+
+const selectedType = computed(() => {
+    return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
+});
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'categoryFk':
+        case 'typeFk':
+            return { [param]: value };
+        case 'search':
+            return { 'i.name': { like: `%${value}%` } };
+    }
+}
+
+const selectedTag = ref(null);
+const tagValues = ref([{}]);
+const tagOptions = ref(null);
+const isButtonDisabled = computed(
+    () => !selectedTag.value || tagValues.value.some((item) => !item.value)
+);
+
+const applyTagFilter = (params, search) => {
+    if (!tagValues.value?.length) {
+        params.tagGroups = null;
+        search();
+        return;
+    }
+    if (!params.tagGroups) {
+        params.tagGroups = [];
+    }
+    params.tagGroups.push(
+        JSON.stringify({
+            values: tagValues.value,
+            tagSelection: {
+                ...selectedTag.value,
+                orgShowField: selectedTag.value.name,
+            },
+            tagFk: selectedTag.value.tagFk,
+        })
+    );
+    search();
+    selectedTag.value = null;
+    tagValues.value = [{}];
+};
+
+const removeTagChip = (selection, params, search) => {
+    if (params.tagGroups) {
+        params.tagGroups = (params.tagGroups || []).filter(
+            (value) => value !== selection
+        );
+    }
+    search();
+};
+
+const orderByParam = ref(null);
+
+const onOrderFieldChange = (value, params, search) => {
+    const orderBy = Object.assign({}, orderByParam.value, { field: value.field });
+    params.orderBy = JSON.stringify(orderBy);
+    search();
+};
+
+const onOrderChange = (value, params, search) => {
+    const orderBy = Object.assign({}, orderByParam.value, { way: value.way });
+    params.orderBy = JSON.stringify(orderBy);
+    search();
+};
+
+const setCategoryList = (data) => {
+    categoryList.value = (data || [])
+        .filter((category) => category.display)
+        .map((category) => ({
+            ...category,
+            icon: `vn:${(category.icon || '').split('-')[1]}`,
+        }));
+};
+
+const getCategoryClass = (category, params) => {
+    if (category.id === params?.categoryFk) {
+        return 'active';
+    }
+};
+</script>
+
+<template>
+    <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :hidden-tags="['orderFk', 'orderBy']"
+        :expr-builder="exprBuilder"
+        :custom-tags="['tagGroups']"
+        @init="onFilterInit"
+        @remove="clearFilter"
+    >
+        <template #tags="{ tag, formatFn }">
+            <strong v-if="tag.label === 'categoryFk'">
+                {{ t(selectedCategory?.name || '') }}
+            </strong>
+            <strong v-else-if="tag.label === 'typeFk'">
+                {{ t(selectedType?.name || '') }}
+            </strong>
+            <div v-else class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #customTags="{ tags: customTags, params, searchFn }">
+            <template v-for="tag in customTags" :key="tag.label">
+                <template v-if="tag.label === 'tagGroups'">
+                    <VnFilterPanelChip
+                        v-for="chip in tag.value"
+                        :key="chip"
+                        removable
+                        @remove="removeTagChip(chip, params, searchFn)"
+                    >
+                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
+                        <span>{{
+                            (JSON.parse(chip).values || [])
+                                .map((item) => item.value)
+                                .join(' | ')
+                        }}</span>
+                    </VnFilterPanelChip>
+                </template>
+            </template>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QList dense style="max-width: 256px">
+                <QItem class="category-filter q-mt-md">
+                    <div
+                        v-for="category in categoryList"
+                        :key="category.name"
+                        :class="['category', getCategoryClass(category, params)]"
+                    >
+                        <QIcon
+                            :name="category.icon"
+                            class="category-icon"
+                            @click="selectCategory(params, category, searchFn)"
+                        >
+                            <QTooltip>
+                                {{ t(category.name) }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                </QItem>
+                <QItem class="q-my-md">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.type')"
+                            v-model="params.typeFk"
+                            :options="typeList"
+                            option-value="id"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            emit-value
+                            use-input
+                            :disable="!selectedCategoryFk"
+                            @update:model-value="
+                                (value) => {
+                                    selectedTypeFk = value;
+                                    searchFn();
+                                }
+                            "
+                        >
+                            <template #option="{ itemProps, opt }">
+                                <QItem v-bind="itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>{{ opt.name }}</QItemLabel>
+                                        <QItemLabel caption>
+                                            {{ opt.categoryName }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
+                <QItem class="q-my-md">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.order')"
+                            v-model="selectedOrder"
+                            :options="orderList || []"
+                            option-value="way"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            :emit-value="false"
+                            use-input
+                            :is-clearable="false"
+                            @update:model-value="
+                                (value) => onOrderChange(value, params, searchFn)
+                            "
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-mb-md">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.order')"
+                            v-model="selectedOrderField"
+                            :options="OrderFields || []"
+                            option-value="field"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            :emit-value="false"
+                            use-input
+                            :is-clearable="false"
+                            @update:model-value="
+                                (value) => onOrderFieldChange(value, params, searchFn)
+                            "
+                        />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
+                <QItem class="q-mt-md">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.tag')"
+                            v-model="selectedTag"
+                            :options="props.tags || []"
+                            option-value="id"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            :emit-value="false"
+                            use-input
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-for="(value, index) in tagValues"
+                    :key="value"
+                    class="q-mt-md filter-value"
+                >
+                    <VnInput
+                        v-if="selectedTag?.isFree"
+                        v-model="value.value"
+                        :label="t('params.value')"
+                        is-outlined
+                        class="filter-input"
+                    />
+                    <VnSelectFilter
+                        v-else
+                        :label="t('params.value')"
+                        v-model="value.value"
+                        :options="tagOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!selectedTag"
+                        class="filter-input"
+                    />
+
+                    <FetchData
+                        v-if="selectedTag && !selectedTag.isFree"
+                        :url="`Tags/${selectedTag?.id}/filterValue`"
+                        limit="30"
+                        auto-load
+                        @on-fetch="(data) => (tagOptions = data)"
+                    />
+
+                    <QIcon
+                        name="delete"
+                        class="filter-icon"
+                        @click="(tagValues || []).splice(index, 1)"
+                    />
+                </QItem>
+                <QItem class="q-mt-lg">
+                    <QIcon
+                        name="add_circle"
+                        class="filter-icon"
+                        @click="tagValues.push({})"
+                    />
+                </QItem>
+                <QItem>
+                    <QItemSection class="q-py-sm">
+                        <QBtn
+                            :label="t('Search')"
+                            class="full-width"
+                            color="primary"
+                            dense
+                            icon="search"
+                            rounded
+                            type="button"
+                            unelevated
+                            :disable="isButtonDisabled"
+                            @click.stop="applyTagFilter(params, searchFn)"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style lang="scss" scoped>
+.category-filter {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 12px;
+
+    .category {
+        flex: 1;
+        flex-shrink: 0;
+        display: flex;
+        justify-content: center;
+
+        &.active {
+            .category-icon {
+                background-color: $primary;
+            }
+        }
+    }
+
+    .category-icon {
+        border-radius: 50%;
+        background-color: var(--vn-light-gray);
+        font-size: 2.6rem;
+        padding: 8px;
+        cursor: pointer;
+    }
+}
+
+.filter-icon {
+    font-size: 24px;
+    color: $primary;
+    padding: 0 4px;
+    cursor: pointer;
+}
+
+.filter-input {
+    flex-shrink: 1;
+    min-width: 0;
+}
+
+.filter-value {
+    display: flex;
+    align-items: center;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        type: Type
+        orderBy: Order By
+        tag: Tag
+        value: Value
+        order: Order
+es:
+    params:
+        type: Tipo
+        orderBy: Ordenar por
+        tag: Etiqueta
+        value: Valor
+        order: Orden
+    Plant: Planta
+    Flower: Flor
+    Handmade: Confección
+    Green: Verde
+    Accessories: Complemento
+    Fruit: Fruta
+</i18n>
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
new file mode 100644
index 000000000..bc448eb8c
--- /dev/null
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -0,0 +1,180 @@
+<script setup>
+import { useSession } from 'composables/useSession';
+import VnLv from 'components/ui/VnLv.vue';
+import { useI18n } from 'vue-i18n';
+import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
+import toCurrency from '../../../filters/toCurrency';
+import { ref } from 'vue';
+
+const DEFAULT_PRICE_KG = 0;
+
+const session = useSession();
+const token = session.getToken();
+const { t } = useI18n();
+
+defineProps({
+    item: {
+        type: Object,
+        required: true,
+    },
+});
+
+const dialog = ref(null);
+</script>
+
+<template>
+    <div class="container order-catalog-item overflow-hidden">
+        <QCard class="card shadow-6">
+            <div class="img-wrapper">
+                <QImg
+                    :src="`/api/Images/catalog/200x200/${item.id}/download?access_token=${token}`"
+                    spinner-color="primary"
+                    :ratio="1"
+                    height="192"
+                    width="192"
+                    class="image"
+                />
+                <div v-if="item.hex" class="item-color-container">
+                    <div
+                        class="item-color"
+                        :style="{ backgroundColor: `#${item.hex}` }"
+                    ></div>
+                </div>
+            </div>
+            <div class="content">
+                <span class="link">{{ item.name }}</span>
+                <p class="subName">{{ item.subName }}</p>
+                <template v-for="index in 4" :key="`tag-${index}`">
+                    <VnLv
+                        v-if="item?.[`tag${index + 4}`]"
+                        :label="item?.[`tag${index + 4}`] + ':'"
+                        :value="item?.[`value${index + 4}`]"
+                    />
+                </template>
+                <div class="footer">
+                    <div class="price">
+                        <p>{{ item.available }} {{ t('to') }} {{ item.price }}</p>
+                        <QIcon name="add_circle" class="icon">
+                            <QTooltip>{{ t('globals.add') }}</QTooltip>
+                            <QPopupProxy ref="dialog">
+                                <OrderCatalogItemDialog
+                                    :prices="item.prices"
+                                    @added="() => dialog.hide()"
+                                />
+                            </QPopupProxy>
+                        </QIcon>
+                    </div>
+                    <p v-if="item.priceKg" class="price-kg">
+                        {{ t('price-kg') }}
+                        {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
+                    </p>
+                </div>
+            </div>
+        </QCard>
+    </div>
+</template>
+
+<style lang="scss">
+.order-catalog-item {
+    .vn-label-value {
+        display: flex;
+        gap: 4px;
+        font-size: 11px;
+
+        .label {
+            color: var(--vn-label);
+        }
+
+        .value {
+            color: var(--vn-text);
+        }
+    }
+}
+</style>
+<style lang="scss" scoped>
+.container {
+    max-width: 448px;
+    width: 100%;
+}
+
+.card {
+    display: flex;
+    height: 100%;
+    max-height: 192px;
+}
+
+.card > * {
+    flex: 1;
+}
+
+.img-wrapper {
+    position: relative;
+    max-width: 192px;
+}
+
+.content {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+
+    .subName {
+        color: var(--vn-label);
+        text-transform: uppercase;
+    }
+
+    p {
+        margin-bottom: 0;
+    }
+}
+
+.footer {
+    .price {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        p {
+            font-size: 12px;
+        }
+
+        .icon {
+            color: $primary;
+            font-size: 24px;
+            cursor: pointer;
+        }
+    }
+
+    .price-kg {
+        font-size: 12px;
+    }
+}
+
+.item-color-container {
+    position: absolute;
+    bottom: 12px;
+    right: 12px;
+    background: linear-gradient($dark, $primary);
+    border-radius: 50%;
+    width: 40px;
+    height: 40px;
+    padding: 4px;
+
+    .item-color {
+        width: 100%;
+        height: 100%;
+        border-radius: 50%;
+    }
+}
+</style>
+<i18n>
+es:
+    to: to
+    price-kg: Precio por Kg
+en:
+    to: hasta
+    price-kg: Price per Kg
+</i18n>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
new file mode 100644
index 000000000..d5464ed1a
--- /dev/null
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -0,0 +1,82 @@
+<script setup>
+import toCurrency from '../../../filters/toCurrency';
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import { useRoute } from 'vue-router';
+import useNotify from 'composables/useNotify';
+
+const { t } = useI18n();
+const route = useRoute();
+const { notify } = useNotify();
+const props = defineProps({
+    prices: {
+        type: Array,
+        required: true,
+    },
+});
+
+const emit = defineEmits(['added']);
+
+const fields = ref((props.prices || []).map((item) => ({ ...item, quantity: 0 })));
+
+const addToOrder = async () => {
+    const items = (fields.value || []).filter((item) => Number(item.quantity) > 0);
+    await axios.post('/OrderRows/addToOrder', {
+        items,
+        orderFk: Number(route.params.id),
+    });
+    notify(t('globals.dataSaved'), 'positive');
+    emit('added');
+};
+</script>
+
+<template>
+    <div class="container order-catalog-item q-pb-md">
+        <QForm @submit.prevent="addToOrder">
+            <QMarkupTable class="shadow-0">
+                <tbody>
+                    <tr v-for="item in fields" :key="item.warehouse">
+                        <td class="text-bold q-py-lg">
+                            {{ item.warehouse }}
+                        </td>
+                        <td class="text-right">
+                            <span
+                                class="link"
+                                @click="
+                                    () => {
+                                        item.quantity += item.grouping;
+                                    }
+                                "
+                            >
+                                {{ item.grouping }}
+                            </span>
+                            x {{ toCurrency(item.price) }}
+                        </td>
+                        <td class="text-right">
+                            <QInput
+                                v-model.number="item.quantity"
+                                type="number"
+                                :step="item.grouping"
+                                min="0"
+                                dense
+                            />
+                        </td>
+                    </tr>
+                </tbody>
+            </QMarkupTable>
+            <div class="flex justify-center q-mt-lg">
+                <QBtn color="primary" type="submit">
+                    {{ t('globals.add') }}
+                </QBtn>
+            </div>
+        </QForm>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+    max-width: 448px;
+    width: 100%;
+}
+</style>
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
new file mode 100644
index 000000000..1c770194a
--- /dev/null
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -0,0 +1,139 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { toCurrency, toDate } from 'src/filters';
+import { useState } from 'src/composables/useState';
+
+import useCardDescription from 'src/composables/useCardDescription';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import OrderDescriptorMenu from 'pages/Order/Card/OrderDescriptorMenu.vue';
+import FetchData from 'components/FetchData.vue';
+
+const DEFAULT_ITEMS = 0;
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const state = useState();
+const { t } = useI18n();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const filter = {
+    include: [
+        { relation: 'agencyMode', scope: { fields: ['name'] } },
+        {
+            relation: 'address',
+            scope: { fields: ['nickname'] },
+        },
+        { relation: 'rows', scope: { fields: ['id'] } },
+        {
+            relation: 'client',
+            scope: {
+                fields: [
+                    'salesPersonFk',
+                    'name',
+                    'isActive',
+                    'isFreezed',
+                    'isTaxDataChecked',
+                ],
+                include: {
+                    relation: 'salesPersonUser',
+                    scope: { fields: ['id', 'name'] },
+                },
+            },
+        },
+    ],
+};
+
+const data = ref(useCardDescription());
+const setData = (entity) => {
+    if (!entity) return;
+    data.value = useCardDescription(entity.client.name, entity.id);
+    state.set('ClaimDescriptor', entity);
+};
+
+const getConfirmationValue = (isConfirmed) => {
+    return t(isConfirmed ? 'order.summary.confirmed' : 'order.summary.notConfirmed');
+};
+
+const total = ref(null);
+</script>
+
+<template>
+    <FetchData
+        :url="`Orders/${entityId}/getTotal`"
+        @on-fetch="(response) => (total = response)"
+        auto-load
+    />
+    <CardDescriptor
+        ref="descriptor"
+        :url="`Orders/${entityId}`"
+        :filter="filter"
+        module="Order"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+        data-key="orderData"
+    >
+        <template #menu="{ entity }">
+            <OrderDescriptorMenu :order="entity" />
+        </template>
+        <template #body="{ entity }">
+            <VnLv
+                :label="t('order.summary.state')"
+                :value="getConfirmationValue(entity.isConfirmed)"
+            />
+            <VnLv :label="t('order.field.salesPersonFk')">
+                <template #value>
+                    <span class="link">
+                        {{ entity?.client?.salesPersonUser?.name || '-' }}
+                        <WorkerDescriptorProxy :id="entity?.client?.salesPersonFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('order.summary.landed')" :value="toDate(entity?.landed)" />
+            <VnLv :label="t('order.field.agency')" :value="entity?.agencyMode?.name" />
+            <VnLv :label="t('order.summary.alias')" :value="entity?.address?.nickname" />
+            <VnLv
+                :label="t('order.summary.items')"
+                :value="(entity?.rows?.length || DEFAULT_ITEMS).toString()"
+            />
+            <VnLv :label="t('order.summary.total')" :value="toCurrency(total)" />
+        </template>
+        <template #actions="{ entity }">
+            <QCardActions>
+                <QBtn
+                    size="md"
+                    icon="vn:ticket"
+                    color="primary"
+                    :to="{
+                        name: 'TicketList',
+                        query: { params: JSON.stringify({ orderFk: entity.id }) },
+                    }"
+                >
+                    <QTooltip>{{ t('order.summary.orderTicketList') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    size="md"
+                    icon="vn:client"
+                    color="primary"
+                    :to="{ name: 'CustomerCard', params: { id: entity.clientFk } }"
+                >
+                    <QTooltip>{{ t('claim.card.customerSummary') }}</QTooltip>
+                </QBtn>
+            </QCardActions>
+        </template>
+    </CardDescriptor>
+</template>
diff --git a/src/pages/Order/Card/OrderDescriptorMenu.vue b/src/pages/Order/Card/OrderDescriptorMenu.vue
new file mode 100644
index 000000000..2e36aa3c5
--- /dev/null
+++ b/src/pages/Order/Card/OrderDescriptorMenu.vue
@@ -0,0 +1,63 @@
+<script setup>
+import axios from 'axios';
+import { ref } from 'vue';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+
+const $props = defineProps({
+    order: {
+        type: Object,
+        required: true,
+    },
+});
+
+const router = useRouter();
+const quasar = useQuasar();
+const { t } = useI18n();
+const order = ref($props.order);
+
+function confirmRemove() {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('confirmDeletion'),
+                message: t('confirmDeletionMessage'),
+                promise: remove,
+            },
+        })
+        .onOk(async () => await router.push({ name: 'OrderList' }));
+}
+
+async function remove() {
+    const id = order.value.id;
+    await axios.delete(`Orders/${id}`);
+    quasar.notify({
+        message: t('globals.dataDeleted'),
+        type: 'positive',
+    });
+}
+</script>
+<template>
+    <QItem @click="confirmRemove()" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="delete" />
+        </QItemSection>
+        <QItemSection>{{ t('deleteOrder') }}</QItemSection>
+    </QItem>
+</template>
+
+<i18n>
+en:
+    deleteOrder: Delete order
+    confirmDeletion: Confirm deletion
+    confirmDeletionMessage: Are you sure you want to delete this order?
+
+es:
+    deleteOrder: Eliminar pedido
+    confirmDeletion: Confirmar eliminación
+    confirmDeletionMessage: Seguro que quieres eliminar este pedido?
+
+</i18n>
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
new file mode 100644
index 000000000..b49f0b115
--- /dev/null
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -0,0 +1,265 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const agencyFilter = { fields: ['id', 'name'] };
+const agencyList = ref(null);
+const salesPersonFilter = {
+    fields: ['id', 'nickname'],
+};
+const salesPersonList = ref(null);
+const sourceFilter = { fields: ['value'] };
+const sourceList = ref(null);
+</script>
+
+<template>
+    <FetchData
+        url="AgencyModes/isActive"
+        :filter="agencyFilter"
+        limit="30"
+        sort-by="name ASC"
+        auto-load
+        @on-fetch="(data) => (agencyList = data)"
+    />
+    <FetchData
+        url="Workers/search"
+        :filter="salesPersonFilter"
+        limit="30"
+        sort-by="nickname ASC"
+        @on-fetch="(data) => (salesPersonList = data)"
+        :params="{ departmentCodes: ['VT'] }"
+        auto-load
+    />
+    <FetchData
+        url="Orders/getSourceValues"
+        :filter="sourceFilter"
+        limit="30"
+        sort-by="value ASC"
+        @on-fetch="(data) => (sourceList = data)"
+        auto-load
+    />
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QList id="orderFilter" dense>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            is-outlined
+                            :label="t('customerId')"
+                            v-model="params.clientFk"
+                            lazy-rules
+                        >
+                            <template #prepend>
+                                <QIcon name="badge" size="sm"></QIcon>
+                            </template>
+                        </VnInput>
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection v-if="agencyList">
+                        <VnSelectFilter
+                            :label="t('agency')"
+                            v-model="params.agencyModeFk"
+                            :options="agencyList"
+                            option-value="id"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            emit-value
+                            map-options
+                            use-input
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection v-if="salesPersonList">
+                        <VnSelectFilter
+                            :label="t('salesPerson')"
+                            v-model="params.workerFk"
+                            :options="salesPersonList"
+                            option-value="id"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            emit-value
+                            map-options
+                            use-input
+                            :input-debounce="0"
+                        >
+                            <template #option="{ itemProps, opt }">
+                                <QItem v-bind="itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>{{ opt.name }}</QItemLabel>
+                                        <QItemLabel caption>
+                                            {{ opt.nickname }},{{ opt.code }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.from"
+                            :label="t('fromLanded')"
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.to"
+                            :label="t('toLanded')"
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            :label="t('orderId')"
+                            v-model="params.orderFk"
+                            lazy-rules
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection v-if="sourceList">
+                        <VnSelectFilter
+                            :label="t('application')"
+                            v-model="params.sourceApp"
+                            :options="sourceList"
+                            option-label="value"
+                            emit-value
+                            map-options
+                            use-input
+                            dense
+                            outlined
+                            rounded
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <QCheckbox
+                            v-model="params.myTeam"
+                            :label="t('myTeam')"
+                            toggle-indeterminate
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <QCheckbox
+                            v-model="params.isConfirmed"
+                            :label="t('isConfirmed')"
+                            toggle-indeterminate
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <QCheckbox v-model="params.showEmpty" :label="t('showEmpty')" />
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style lang="scss">
+#orderFilter {
+    .q-item {
+        padding-top: 8px;
+    }
+}
+</style>
+
+<i18n>
+en:
+    params:
+        search: Includes
+        clientFk: Client
+        agencyModeFk: Agency
+        salesPersonFk: Sales Person
+        from: From
+        to: To
+        orderFk: Order
+        sourceApp: Application
+        myTeam: My Team
+        isConfirmed: Is Confirmed
+        showEmpty: Show Empty
+    customerId: Customer ID
+    agency: Agency
+    salesPerson: Sales Person
+    fromLanded: From Landed
+    toLanded: To Landed
+    orderId: Order ID
+    application: Application
+    myTeam: My Team
+    isConfirmed: Order Confirmed
+    showEmpty: Show Empty
+es:
+    params:
+        search: Búsqueda
+        clientFk: Cliente
+        agencyModeFk: Agencia
+        salesPersonFk: Comercial
+        from: Desde
+        to: Hasta
+        orderFk: Cesta
+        sourceApp: Aplicación
+        myTeam: Mi Equipo
+        isConfirmed: Confirmado
+        showEmpty: Mostrar vacías
+    customerId: ID Cliente
+    agency: Agencia
+    salesPerson: Comercial
+    fromLanded: Desde F. entrega
+    toLanded: Hasta F. entrega
+    orderId: ID Cesta
+    application: Aplicación
+    myTeam: Mi Equipo
+    isConfirmed: Confirmado
+    showEmpty: Mostrar vacías
+</i18n>
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
new file mode 100644
index 000000000..42aee7640
--- /dev/null
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -0,0 +1,208 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import { useState } from 'composables/useState';
+import FormModel from 'components/FormModel.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const state = useState();
+const ORDER_MODEL = 'order';
+
+const isNew = Boolean(!route.params.id);
+const initialFormState = reactive({
+    clientFk: null,
+    addressFk: null,
+    agencyModeFk: null,
+    landed: null,
+});
+const clientList = ref([]);
+const agencyList = ref([]);
+const addressList = ref([]);
+
+const fetchAddressList = async (addressId) => {
+    try {
+        const { data } = await axios.get('addresses', {
+            params: {
+                filter: JSON.stringify({
+                    fields: ['id', 'nickname', 'street', 'city'],
+                    where: { id: addressId },
+                }),
+            },
+        });
+        addressList.value = data;
+        //  Set address by default
+        if (addressList.value?.length === 1) {
+            state.get(ORDER_MODEL).addressFk = addressList.value[0].id;
+        }
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
+};
+const fetchAgencyList = async (landed, addressFk) => {
+    if (!landed || !addressFk) {
+        return;
+    }
+    try {
+        const { data } = await axios.get('Agencies/landsThatDay', {
+            params: {
+                addressFk,
+                landed: new Date(landed).toISOString(),
+            },
+        });
+        agencyList.value = data;
+    } catch (err) {
+        console.error(`Error fetching agencies`, err);
+        return err.response;
+    }
+};
+
+const fetchOrderDetails = (order) => {
+    fetchAddressList(order?.addressFk);
+    fetchAgencyList(order?.landed, order?.addressFk);
+};
+
+const orderMapper = (order) => {
+    return {
+        addressId: order.addressFk,
+        agencyModeId: order.agencyModeFk,
+        landed: new Date(order.landed).toISOString(),
+    };
+};
+const orderFilter = {
+    include: [
+        { relation: 'agencyMode', scope: { fields: ['name'] } },
+        {
+            relation: 'address',
+            scope: { fields: ['nickname'] },
+        },
+        { relation: 'rows', scope: { fields: ['id'] } },
+        {
+            relation: 'client',
+            scope: {
+                fields: [
+                    'salesPersonFk',
+                    'name',
+                    'isActive',
+                    'isFreezed',
+                    'isTaxDataChecked',
+                ],
+                include: {
+                    relation: 'salesPersonUser',
+                    scope: { fields: ['id', 'name'] },
+                },
+            },
+        },
+    ],
+};
+</script>
+
+<template>
+    <FetchData
+        url="Clients"
+        @on-fetch="(data) => (clientList = data)"
+        :filter="{ fields: ['id', 'name', 'defaultAddressFk'] }"
+        auto-load
+    />
+    <VnSubToolbar v-if="isNew" />
+    <div class="q-pa-md">
+        <FormModel
+            :url="!isNew ? `Orders/${route.params.id}` : null"
+            :url-create="isNew ? 'Orders/new' : null"
+            :model="ORDER_MODEL"
+            :form-initial-data="isNew ? initialFormState : null"
+            :observe-form-changes="!isNew"
+            :mapper="isNew ? orderMapper : null"
+            :filter="orderFilter"
+            @on-fetch="fetchOrderDetails"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('order.form.clientFk')"
+                            v-model="data.clientFk"
+                            :options="clientList"
+                            option-value="id"
+                            option-label="name"
+                            hide-selected
+                            @update:model-value="
+                                (client) => fetchAddressList(client.defaultAddressFk)
+                            "
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('order.form.addressFk')"
+                            v-model="data.addressFk"
+                            :options="addressList"
+                            option-value="id"
+                            option-label="nickname"
+                            hide-selected
+                            :disable="!addressList?.length"
+                            @update:model-value="
+                                () => fetchAgencyList(data.landed, data.addressFk)
+                            "
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{
+                                                `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
+                                            }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInputDate
+                            placeholder="dd-mm-aaa"
+                            :label="t('order.form.landed')"
+                            v-model="data.landed"
+                            @update:model-value="
+                                () => fetchAgencyList(data.landed, data.addressFk)
+                            "
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('order.form.agencyModeFk')"
+                            v-model="data.agencyModeFk"
+                            :options="agencyList"
+                            option-value="agencyModeFk"
+                            option-label="agencyMode"
+                            hide-selected
+                            :disable="!agencyList?.length"
+                        >
+                        </VnSelectFilter>
+                    </div>
+                </VnRow>
+            </template>
+        </FormModel>
+    </div>
+</template>
diff --git a/src/pages/Order/Card/OrderSearchbar.vue b/src/pages/Order/Card/OrderSearchbar.vue
new file mode 100644
index 000000000..a768768a5
--- /dev/null
+++ b/src/pages/Order/Card/OrderSearchbar.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+
+const { t } = useI18n();
+</script>
+
+<template>
+    <VnSearchbar
+        data-key="OrderList"
+        url="Orders/filter"
+        :label="t('Search order')"
+        :info="t('You can search orders by reference')"
+    />
+</template>
+
+<style scoped lang="scss"></style>
+<i18n>
+es:
+    Search order: Buscar orden
+    You can search orders by reference: Puedes buscar por referencia de la orden
+</i18n>
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
new file mode 100644
index 000000000..9b26891a1
--- /dev/null
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -0,0 +1,255 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import { dashIfEmpty, toCurrency, toDateHour } from 'src/filters';
+import VnLv from 'components/ui/VnLv.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
+import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const entityId = computed(() => $props.id || route.params.id);
+const detailsColumns = ref([
+    {
+        name: 'item',
+        label: t('order.summary.item'),
+        field: (row) => row?.item?.id,
+        sortable: true,
+    },
+    {
+        name: 'description',
+        label: t('order.summary.description'),
+        field: (row) => row?.item?.name,
+    },
+    {
+        name: 'quantity',
+        label: t('order.summary.quantity'),
+        field: (row) => row?.quantity,
+    },
+    {
+        name: 'price',
+        label: t('order.summary.price'),
+        field: (row) => toCurrency(row?.price),
+    },
+    {
+        name: 'amount',
+        label: t('order.summary.amount'),
+        field: (row) => toCurrency(row?.quantity * row?.price),
+    },
+]);
+</script>
+
+<template>
+    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
+        <OrderSearchbar />
+    </Teleport>
+
+    <div class="q-pa-md">
+        <CardSummary ref="summary" :url="`Orders/${entityId}/summary`">
+            <template #header="{ entity }">
+                {{ t('order.summary.basket') }} #{{ entity?.id }} -
+                {{ entity?.client?.name }} ({{ entity?.clientFk }})
+            </template>
+            <template #body="{ entity }">
+                <QCard class="vn-one">
+                    <VnLv label="ID" :value="entity.id" />
+                    <VnLv :label="t('order.summary.nickname')" dash>
+                        <template #value>
+                            <span class="link">
+                                {{ dashIfEmpty(entity?.address?.nickname) }}
+                                <CustomerDescriptorProxy :id="entity?.clientFk" />
+                            </span>
+                        </template>
+                    </VnLv>
+                    <VnLv
+                        :label="t('order.summary.company')"
+                        :value="entity?.address?.companyFk"
+                    />
+                    <VnLv
+                        :label="t('order.summary.confirmed')"
+                        :value="Boolean(entity?.isConfirmed)"
+                    />
+                </QCard>
+                <QCard class="vn-one">
+                    <VnLv
+                        :label="t('order.summary.created')"
+                        :value="toDateHour(entity?.created)"
+                    />
+                    <VnLv
+                        :label="t('order.summary.confirmed')"
+                        :value="toDateHour(entity?.confirmed)"
+                    />
+                    <VnLv
+                        :label="t('order.summary.landed')"
+                        :value="toDateHour(entity?.landed)"
+                    />
+                    <VnLv :label="t('order.summary.phone')">
+                        <template #value>
+                            {{ dashIfEmpty(entity?.address?.phone) }}
+                            <a
+                                v-if="entity?.address?.phone"
+                                :href="`tel:${entity?.address?.phone}`"
+                                class="text-primary"
+                            >
+                                <QIcon name="phone" />
+                            </a>
+                        </template>
+                    </VnLv>
+                    <VnLv
+                        :label="t('order.summary.createdFrom')"
+                        :value="entity?.sourceApp"
+                    />
+                    <VnLv
+                        :label="t('order.summary.address')"
+                        :value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
+                        class="order-summary-address"
+                    />
+                </QCard>
+                <QCard class="vn-one">
+                    <p class="header">
+                        {{ t('order.summary.notes') }}
+                    </p>
+                    <p v-if="entity?.note" class="no-margin">
+                        {{ entity?.note }}
+                    </p>
+                </QCard>
+                <QCard class="vn-one">
+                    <VnLv>
+                        <template #label>
+                            <span class="text-h6">{{ t('order.summary.subtotal') }}</span>
+                        </template>
+                        <template #value>
+                            <span class="text-h6">{{
+                                toCurrency(entity?.subTotal)
+                            }}</span>
+                        </template>
+                    </VnLv>
+                    <VnLv>
+                        <template #label>
+                            <span class="text-h6">{{ t('order.summary.vat') }}</span>
+                        </template>
+                        <template #value>
+                            <span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
+                        </template>
+                    </VnLv>
+                    <VnLv>
+                        <template #label>
+                            <span class="text-h6">{{ t('order.summary.total') }}</span>
+                        </template>
+                        <template #value>
+                            <span class="text-h6">{{ toCurrency(entity?.total) }}</span>
+                        </template>
+                    </VnLv>
+                </QCard>
+                <QCard>
+                    <p class="header">
+                        {{ t('order.summary.details') }}
+                    </p>
+                    <QTable
+                        :columns="detailsColumns"
+                        :rows="entity?.rows"
+                        flat
+                        hide-pagination
+                    >
+                        <template #header="props">
+                            <QTr :props="props">
+                                <QTh auto-width>{{ t('order.summary.item') }}</QTh>
+                                <QTh>{{ t('order.summary.description') }}</QTh>
+                                <QTh auto-width>{{ t('order.summary.quantity') }}</QTh>
+                                <QTh auto-width>{{ t('order.summary.price') }}</QTh>
+                                <QTh auto-width>{{ t('order.summary.amount') }}</QTh>
+                            </QTr>
+                        </template>
+                        <template #body="props">
+                            <QTr :props="props">
+                                <QTd key="item" :props="props" class="item">
+                                    {{ props.row.item?.id }}
+                                </QTd>
+                                <QTd key="description" :props="props" class="description">
+                                    <div class="name">
+                                        <span>{{ props.row.item.name }}</span>
+                                        <span
+                                            v-if="props.row.item.subName"
+                                            class="subName"
+                                        >
+                                            {{ props.row.item.subName }}
+                                        </span>
+                                    </div>
+                                    <fetched-tags
+                                        :item="props.row.item"
+                                        :max-length="5"
+                                    />
+                                </QTd>
+                                <QTd key="quantity" :props="props">
+                                    {{ props.row.quantity }}
+                                </QTd>
+                                <QTd key="price" :props="props">
+                                    {{ props.row.price }}
+                                </QTd>
+                                <QTd key="amount" :props="props">
+                                    {{
+                                        toCurrency(props.row?.quantity * props.row?.price)
+                                    }}
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
+</template>
+<style lang="scss">
+.cardSummary .summaryBody .vn-label-value.order-summary-address {
+    .label {
+        flex-shrink: 0;
+    }
+
+    .value {
+        white-space: normal;
+    }
+}
+</style>
+<style lang="scss" scoped>
+.item {
+    text-align: center;
+}
+
+.description {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    text-align: left;
+    height: auto;
+    padding-top: 12px;
+    padding-bottom: 12px;
+
+    .name {
+        display: flex;
+        align-items: center;
+        padding-bottom: 8px;
+
+        & > * {
+            flex: 1;
+        }
+
+        .subName {
+            text-transform: uppercase;
+            color: var(--vn-label);
+        }
+    }
+}
+</style>
diff --git a/src/pages/Order/Card/OrderSummaryDialog.vue b/src/pages/Order/Card/OrderSummaryDialog.vue
new file mode 100644
index 000000000..ebe891f4a
--- /dev/null
+++ b/src/pages/Order/Card/OrderSummaryDialog.vue
@@ -0,0 +1,29 @@
+<script setup>
+import { useDialogPluginComponent } from 'quasar';
+import OrderSummary from "pages/Order/Card/OrderSummary.vue";
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+defineEmits([...useDialogPluginComponent.emits]);
+
+const { dialogRef, onDialogHide } = useDialogPluginComponent();
+</script>
+
+<template>
+    <QDialog ref="dialogRef" @hide="onDialogHide">
+        <OrderSummary v-if="$props.id" :id="$props.id" />
+    </QDialog>
+</template>
+
+<style lang="scss">
+.q-dialog .summary .header {
+    position: sticky;
+    z-index: $z-max;
+    top: 0;
+}
+</style>
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
new file mode 100644
index 000000000..55f5e7da1
--- /dev/null
+++ b/src/pages/Order/OrderCatalog.vue
@@ -0,0 +1,114 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import { useRoute } from 'vue-router';
+import {onMounted, onUnmounted, ref} from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import OrderCatalogItem from 'pages/Order/Card/OrderCatalogItem.vue';
+import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
+
+const route = useRoute();
+const stateStore = useStateStore();
+const { t } = useI18n();
+
+onMounted(() => (stateStore.rightDrawer = true));
+onUnmounted(() => (stateStore.rightDrawer = false));
+
+const catalogParams = {
+    orderFk: route.params.id,
+    orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
+};
+
+const tags = ref([])
+
+function extractTags(items) {
+    const resultTags = [];
+    (items || []).forEach((item) => {
+        (item.tags || []).forEach((tag) => {
+            const index = resultTags.findIndex((item) => item.tagFk === tag.tagFk);
+            if (index === -1) {
+                resultTags.push({ ...tag, priority: 1 });
+            } else {
+                resultTags[index].priority += 1;
+            }
+        });
+    });
+    tags.value = resultTags
+}
+</script>
+
+<template>
+    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
+        <VnSearchbar
+            data-key="OrderCatalogList"
+            url="Orders/CatalogFilter"
+            :limit="50"
+            :user-params="catalogParams"
+            :static-params="['orderFk', 'orderBy']"
+            :redirect="false"
+        />
+    </Teleport>
+    <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" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <OrderCatalogFilter data-key="OrderCatalogList" :tags="tags" />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="column items-center q-pa-md">
+        <div class="card-list">
+            <VnPaginate
+                data-key="OrderCatalogList"
+                url="Orders/CatalogFilter"
+                :limit="50"
+                :user-params="catalogParams"
+                auto-load
+                @on-fetch="extractTags"
+            >
+                <template #body="{ rows }">
+                    <div class="catalog-list">
+                        <div v-if="rows && !rows?.length" class="no-result">
+                            {{ t('globals.noResults') }}
+                        </div>
+                        <OrderCatalogItem v-for="row in rows" :key="row.id" :item="row" />
+                    </div>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+}
+
+.catalog-list {
+    display: flex;
+    align-items: flex-start;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 16px;
+}
+
+.no-result {
+    font-size: 24px;
+    font-weight: bold;
+    color: var(--vn-label);
+    text-align: center;
+}
+</style>
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
new file mode 100644
index 000000000..0dce70831
--- /dev/null
+++ b/src/pages/Order/OrderLines.vue
@@ -0,0 +1,295 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+import { useQuasar } from 'quasar';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import FetchData from 'components/FetchData.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import CardList from 'components/ui/CardList.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+
+import { toCurrency, toDate } from 'src/filters';
+import { useSession } from 'composables/useSession';
+import axios from 'axios';
+
+const route = useRoute();
+const { t } = useI18n();
+const session = useSession();
+const quasar = useQuasar();
+const token = session.getToken();
+const orderSummary = ref({
+    total: null,
+    vat: null,
+});
+const componentKey = ref(0);
+const order = ref(0);
+
+const refresh = () => {
+    componentKey.value += 1;
+};
+
+function confirmRemove(item) {
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('confirmDeletion'),
+            message: t('confirmDeletionMessage'),
+            promise: async () => remove(item),
+        },
+    });
+}
+
+async function remove(item) {
+    await axios.post('OrderRows/removes', {
+        actualOrderId: route.params.id,
+        rows: [item.id],
+    });
+    quasar.notify({
+        message: t('globals.dataDeleted'),
+        type: 'positive',
+    });
+    refresh();
+}
+
+async function confirmOrder() {
+    await axios.post(`Orders/${route.params.id}/confirm`);
+    quasar.notify({
+        message: t('globals.confirm'),
+        type: 'positive',
+    });
+}
+</script>
+
+<template>
+    <FetchData
+        :key="componentKey"
+        :url="`Orders/${route.params.id}`"
+        @on-fetch="(data) => (order = data)"
+        auto-load
+    />
+    <FetchData
+        :key="componentKey"
+        :url="`Orders/${route.params.id}/getTotal`"
+        @on-fetch="(data) => (orderSummary.total = data)"
+        auto-load
+    />
+    <FetchData
+        :key="componentKey"
+        :url="`Orders/${route.params.id}/getVAT`"
+        @on-fetch="(data) => (orderSummary.vat = data)"
+        auto-load
+    />
+    <QPage :key="componentKey" class="column items-center q-pa-md">
+        <div class="card-list">
+            <div v-if="!orderSummary.total" class="no-result">
+                {{ t('globals.noResults') }}
+            </div>
+            <QCard v-else class="order-lines-summary q-pa-lg">
+                <p class="header text-right block">
+                    {{ t('summary') }}
+                </p>
+                <VnLv
+                    v-if="orderSummary.vat && orderSummary.total"
+                    :label="t('subtotal')"
+                    :value="toCurrency(orderSummary.total - orderSummary.vat)"
+                />
+                <VnLv
+                    v-if="orderSummary.vat"
+                    :label="t('VAT')"
+                    :value="toCurrency(orderSummary?.vat)"
+                />
+                <VnLv
+                    v-if="orderSummary.total"
+                    :label="t('total')"
+                    :value="toCurrency(orderSummary?.total)"
+                />
+            </QCard>
+            <VnPaginate
+                data-key="OrderLines"
+                url="OrderRows"
+                :limit="20"
+                auto-load
+                :filter="{
+                    include: [
+                        {
+                            relation: 'item',
+                        },
+                        {
+                            relation: 'warehouse',
+                        },
+                    ],
+                    where: { orderFk: route.params.id },
+                }"
+            >
+                <template #body="{ rows }">
+                    <div class="catalog-list q-mt-xl">
+                        <CardList
+                            v-for="row in rows"
+                            :key="row.id"
+                            :id="row.id"
+                            :title="row?.item?.name"
+                            class="cursor-inherit"
+                        >
+                            <template #title>
+                                <div class="flex items-center">
+                                    <div class="image-wrapper q-mr-md">
+                                        <QImg
+                                            :src="`/api/Images/catalog/50x50/${row?.item?.id}/download?access_token=${token}`"
+                                            spinner-color="primary"
+                                            :ratio="1"
+                                            height="50"
+                                            width="50"
+                                            class="image"
+                                        />
+                                    </div>
+                                    <div
+                                        class="title text-primary text-weight-bold text-h5"
+                                    >
+                                        {{ row?.item?.name }}
+                                    </div>
+                                    <QChip class="q-chip-color" outline size="sm">
+                                        {{ t('ID') }}: {{ row.id }}
+                                    </QChip>
+                                </div>
+                            </template>
+                            <template #list-items>
+                                <div class="q-mb-sm">
+                                    <span class="text-uppercase subname">
+                                        {{ row.item.subName }}
+                                    </span>
+                                    <fetched-tags :item="row.item" :max-length="5" />
+                                </div>
+                                <VnLv :label="t('item')" :value="String(row.item.id)" />
+                                <VnLv
+                                    :label="t('warehouse')"
+                                    :value="row.warehouse.name"
+                                />
+                                <VnLv
+                                    :label="t('shipped')"
+                                    :value="toDate(row.shipped)"
+                                />
+                                <VnLv
+                                    :label="t('quantity')"
+                                    :value="String(row.quantity)"
+                                />
+                                <VnLv
+                                    :label="t('price')"
+                                    :value="toCurrency(row.price)"
+                                />
+                                <VnLv
+                                    :label="t('amount')"
+                                    :value="toCurrency(row.price * row.quantity)"
+                                />
+                            </template>
+                            <template #actions v-if="!order?.isConfirmed">
+                                <QBtn
+                                    :label="t('remove')"
+                                    @click.stop="confirmRemove(row)"
+                                    color="primary"
+                                    style="margin-top: 15px"
+                                />
+                            </template>
+                        </CardList>
+                    </div>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed">
+            <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
+            <QTooltip>
+                {{ t('confirm') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
+<style lang="scss">
+.order-lines-summary {
+    .vn-label-value {
+        display: flex;
+        justify-content: flex-end;
+        gap: 2%;
+
+        .label {
+            color: var(--vn-label);
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .value {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+    }
+}
+</style>
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+
+.header {
+    color: $primary;
+    font-weight: bold;
+    margin-bottom: 25px;
+    font-size: 20px;
+    display: inline-block;
+}
+
+.image-wrapper {
+    height: 50px;
+    width: 50px;
+
+    .image {
+        border-radius: 50%;
+    }
+}
+
+.subname {
+    color: var(--vn-label);
+}
+
+.no-result {
+    font-size: 24px;
+    font-weight: bold;
+    color: var(--vn-label);
+    text-align: center;
+}
+</style>
+<i18n>
+en:
+    summary: Summary
+    subtotal: Subtotal
+    VAT: VAT
+    total: Total
+    item: Item
+    warehouse: Warehouse
+    shipped: Shipped
+    quantity: Quantity
+    price: Price
+    amount: Amount
+    remove: Remove
+    confirmDeletion: Confirm deletion,
+    confirmDeletionMessage: Are you sure you want to delete this item?
+    confirm: Confirm
+es:
+    summary: Resumen
+    subtotal: Subtotal
+    VAT: IVA
+    total: Total
+    item: Artículo
+    warehouse: Almacén
+    shipped: F. envío
+    quantity: Cantidad
+    price: Precio
+    amount: Importe
+    remove: Eliminar
+    confirmDeletion: Confirmar eliminación,
+    confirmDeletionMessage: Seguro que quieres eliminar este artículo?
+    confirm: Confirmar
+</i18n>
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
new file mode 100644
index 000000000..362a68b4d
--- /dev/null
+++ b/src/pages/Order/OrderList.vue
@@ -0,0 +1,162 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { onMounted, onUnmounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { useStateStore } from 'stores/useStateStore';
+import { toCurrency, toDate } from 'src/filters';
+import {useQuasar} from "quasar";
+import CardList from 'components/ui/CardList.vue';
+import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
+import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
+import OrderSummaryDialog from "pages/Order/Card/OrderSummaryDialog.vue";
+
+const stateStore = useStateStore();
+const quasar = useQuasar();
+const router = useRouter();
+const { t } = useI18n();
+
+onMounted(() => (stateStore.rightDrawer = true));
+onUnmounted(() => (stateStore.rightDrawer = false));
+
+function navigate(id) {
+    router.push({ path: `/order/${id}` });
+}
+
+function viewSummary(id) {
+    quasar.dialog({
+        component: OrderSummaryDialog,
+        componentProps: {
+            id,
+        },
+    });
+}
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <OrderSearchbar />
+        </Teleport>
+        <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">
+            <OrderFilter data-key="OrderList" />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="column items-center q-pa-md">
+        <div class="card-list">
+            <VnPaginate
+                data-key="OrderList"
+                url="Orders/filter"
+                :limit="20"
+                :order="['landed DESC', 'clientFk', 'id DESC']"
+                :user-params="{ showEmpty: false }"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :id="row.id"
+                        :title="`${row?.clientName} (${row?.clientFk})`"
+                        @click="navigate(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv
+                                :label="t('order.field.salesPersonFk')"
+                                :title-label="t('order.field.salesPersonFk')"
+                            >
+                                <template #value>
+                                    <span class="link" @click.stop>
+                                        {{ row?.name || '-' }}
+                                        <WorkerDescriptorProxy :id="row?.salesPersonFk" />
+                                    </span>
+                                </template>
+                            </VnLv>
+                            <VnLv
+                                :label="t('order.field.clientFk')"
+                                :title-label="t('order.field.clientFk')"
+                            >
+                                <template #value>
+                                    <span class="link" @click.stop>
+                                        {{ row?.clientName || '-' }}
+                                        <CustomerDescriptorProxy :id="row?.clientFk" />
+                                    </span>
+                                </template>
+                            </VnLv>
+                            <VnLv
+                                :label="t('order.field.isConfirmed')"
+                                :value="row?.isConfirmed === 1"
+                            />
+                            <VnLv
+                                :label="t('order.field.created')"
+                                :value="toDate(row?.created)"
+                            />
+                            <VnLv :label="t('order.field.landed')">
+                                <template #value>
+                                    <QBadge color="positive" dense>
+                                        {{ toDate(row?.landed) }}
+                                    </QBadge>
+                                </template>
+                            </VnLv>
+                            <VnLv
+                                :label="t('order.field.hour')"
+                                :value="row.hourTheoretical || row.hourEffective"
+                            />
+                            <VnLv
+                                :label="t('order.field.agency')"
+                                :value="row?.agencyName"
+                            />
+                            <VnLv
+                                :label="t('order.field.total')"
+                                :value="toCurrency(row?.total)"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky :offset="[20, 20]">
+            <RouterLink :to="{ name: 'OrderCreate' }">
+                <QBtn fab icon="add" color="primary" />
+                <QTooltip>
+                    {{ t('order.list.newOrder') }}
+                </QTooltip>
+            </RouterLink>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+</style>
diff --git a/src/pages/Order/OrderMain.vue b/src/pages/Order/OrderMain.vue
new file mode 100644
index 000000000..66ce78f23
--- /dev/null
+++ b/src/pages/Order/OrderMain.vue
@@ -0,0 +1,17 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'src/components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue
new file mode 100644
index 000000000..4f4c269f6
--- /dev/null
+++ b/src/pages/Order/OrderVolume.vue
@@ -0,0 +1,161 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import FetchData from 'components/FetchData.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import CardList from 'components/ui/CardList.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+
+import { dashIfEmpty } from 'src/filters';
+import axios from 'axios';
+
+const route = useRoute();
+const { t } = useI18n();
+const volumeSummary = ref(null);
+
+const loadVolumes = async (rows) => {
+    const { data } = await axios.get(`Orders/${route.params.id}/getVolumes`);
+    (rows || []).forEach((order) => {
+        (data.volumes || []).forEach((volume) => {
+            if (order.itemFk === volume.itemFk) {
+                order.volume = volume.volume;
+            }
+        });
+    });
+};
+</script>
+
+<template>
+    <FetchData
+        :url="`Orders/${route.params.id}/getTotalVolume`"
+        @on-fetch="(data) => (volumeSummary = data)"
+        auto-load
+    />
+    <QPage class="column items-center q-pa-md">
+        <div class="card-list">
+            <div
+                v-if="!volumeSummary?.totalVolume && !volumeSummary?.totalBoxes"
+                class="no-result"
+            >
+                {{ t('globals.noResults') }}
+            </div>
+            <QCard v-else class="order-volume-summary q-pa-lg">
+                <p class="header text-right block">
+                    {{ t('summary') }}
+                </p>
+                <VnLv :label="t('total')" :value="`${volumeSummary?.totalVolume} m³`" />
+                <VnLv
+                    :label="t('boxes')"
+                    :value="`${dashIfEmpty(volumeSummary?.totalBoxes)} U`"
+                />
+            </QCard>
+            <VnPaginate
+                data-key="OrderCatalogVolume"
+                url="OrderRows"
+                :limit="20"
+                auto-load
+                :filter="{
+                    include: {
+                        relation: 'item',
+                    },
+                    where: { orderFk: route.params.id },
+                }"
+                order="itemFk"
+                @on-fetch="(data) => loadVolumes(data)"
+            >
+                <template #body="{ rows }">
+                    <div class="catalog-list q-mt-xl">
+                        <CardList
+                            v-for="row in rows"
+                            :key="row.id"
+                            :id="row.id"
+                            :title="row?.item?.name"
+                            class="cursor-inherit"
+                        >
+                            <template #list-items>
+                                <div class="q-mb-sm">
+                                    <fetched-tags :item="row.item" :max-length="5" />
+                                </div>
+                                <VnLv :label="t('item')" :value="row.item.id" />
+                                <VnLv :label="t('subName')">
+                                    <template #value>
+                                        <span class="text-uppercase">
+                                            {{ row.item.subName }}
+                                        </span>
+                                    </template>
+                                </VnLv>
+                                <VnLv :label="t('quantity')" :value="row.quantity" />
+                                <VnLv :label="t('volume')" :value="row.volume" />
+                            </template>
+                        </CardList>
+                    </div>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+
+<style lang="scss">
+.order-volume-summary {
+    .vn-label-value {
+        display: flex;
+        justify-content: flex-end;
+        gap: 2%;
+
+        .label {
+            color: var(--vn-label);
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .value {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+    }
+}
+</style>
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+
+.header {
+    color: $primary;
+    font-weight: bold;
+    margin-bottom: 25px;
+    font-size: 20px;
+    display: inline-block;
+}
+
+.no-result {
+    font-size: 24px;
+    font-weight: bold;
+    color: var(--vn-label);
+    text-align: center;
+}
+</style>
+<i18n>
+en:
+    summary: Summary
+    total: Total
+    boxes: Boxes
+    item: Item
+    subName: Subname
+    quantity: Quantity
+    volume: m³ per quantity
+es:
+    summary: Resumen
+    total: Total
+    boxes: Cajas
+    item: Artículo
+    subName: Subname
+    quantity: Cantidad
+    volume: m³ por cantidad
+</i18n>
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index bab300672..a5bf5513b 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -1,9 +1,11 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInputDate from "components/common/VnInputDate.vue";
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -26,18 +28,18 @@ const countries = ref();
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense>
+            <QList dense class="q-gutter-y-sm q-mt-sm">
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('route.cmr.list.cmrFk')"
                             v-model="params.cmrFk"
-                            lazy-rules
+                            is-outlined
                         >
                             <template #prepend>
                                 <QIcon name="article" size="sm"></QIcon>
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
@@ -51,48 +53,48 @@ const countries = ref();
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('route.cmr.list.ticketFk')"
                             v-model="params.ticketFk"
-                            lazy-rules
+                            is-outlined
                         >
                             <template #prepend>
                                 <QIcon name="vn:ticket" size="sm"></QIcon>
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('route.cmr.list.routeFk')"
                             v-model="params.routeFk"
-                            lazy-rules
+                            is-outlined
                         >
                             <template #prepend>
                                 <QIcon name="vn:delivery" size="sm"></QIcon>
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('route.cmr.list.clientFk')"
                             v-model="params.clientFk"
-                            lazy-rules
+                            is-outlined
                         >
                             <template #prepend>
                                 <QIcon name="vn:client" size="sm"></QIcon>
                             </template>
-                        </QInput>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection v-if="!countries">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
-                    <QItemSection v-if="countries">
+                    <QItemSection v-if="countries" class="q-mb-sm">
                         <QSelect
                             :label="t('route.cmr.list.country')"
                             v-model="params.country"
@@ -103,6 +105,9 @@ const countries = ref();
                             transition-hide="jump-up"
                             emit-value
                             map-options
+                            dense
+                            outlined
+                            rounded
                         >
                             <template #prepend>
                                 <QIcon name="flag" size="sm"></QIcon>
@@ -112,7 +117,11 @@ const countries = ref();
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <VnInputDate v-model="params.shipped" :label="t('route.cmr.list.shipped')" />
+                        <VnInputDate
+                            v-model="params.shipped"
+                            :label="t('route.cmr.list.shipped')"
+                            is-outlined
+                        />
                     </QItemSection>
                 </QItem>
             </QList>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index e9355eed0..dc5602c1c 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -150,7 +150,7 @@ function downloadPdfs() {
                                     <QIcon
                                         name="visibility"
                                         color="primary"
-                                        size="2em"
+                                        size="md"
                                         class="q-mr-sm q-ml-sm"
                                     />
                                     <QTooltip>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 34c374117..6beca6d88 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -5,8 +5,8 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import useCardDescription from 'composables/useCardDescription';
-import WorkerDescriptorProxy from "pages/Worker/Card/WorkerDescriptorProxy.vue";
-import ShelvingDescriptorMenu from "pages/Shelving/Card/ShelvingDescriptorMenu.vue";
+import ShelvingDescriptorMenu from 'pages/Shelving/Card/ShelvingDescriptorMenu.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: {
@@ -57,14 +57,14 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
             <VnLv :label="t('shelving.summary.parking')" :value="entity.parking?.code" />
             <VnLv v-if="entity.worker" :label="t('shelving.summary.worker')">
                 <template #value>
-                    <span class="link">
-                        {{ entity.worker?.user?.nickname }}
-                        <WorkerDescriptorProxy :id="entity.worker?.id" />
-                    </span>
+                    <VnUserLink
+                        :name="entity.worker?.user?.nickname"
+                        :worker-id="entity.worker?.id"
+                    />
                 </template>
             </VnLv>
         </template>
-        <template #menu="{entity}">
+        <template #menu="{ entity }">
             <ShelvingDescriptorMenu :shelving="entity" />
         </template>
     </CardDescriptor>
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index e30ac1939..e9e5e68c3 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -5,6 +5,8 @@ import { useRoute } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -15,7 +17,7 @@ const defaultInitialData = {
     priority: 0,
     code: null,
     isRecyclable: false,
-}
+};
 
 const parkingFilter = { fields: ['id', 'code'] };
 const parkingList = ref([]);
@@ -58,11 +60,7 @@ const shelvingFilter = {
 };
 </script>
 <template>
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+    <VnSubToolbar />
     <FetchData
         url="Parkings"
         :filter="parkingFilter"
@@ -81,7 +79,7 @@ const shelvingFilter = {
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QInput
+                    <VnInput
                         v-model="data.code"
                         :label="t('shelving.basicData.code')"
                         :rules="validate('Shelving.code')"
@@ -107,7 +105,7 @@ const shelvingFilter = {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QInput
+                    <VnInput
                         v-model="data.priority"
                         :label="t('shelving.basicData.priority')"
                         :rules="validate('Shelving.priority')"
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
new file mode 100644
index 000000000..2b7059ea3
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -0,0 +1 @@
+<template>Supplier accounts</template>
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
new file mode 100644
index 000000000..dd82abe78
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -0,0 +1 @@
+<template>Supplier addresses</template>
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
new file mode 100644
index 000000000..2a0c341cf
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -0,0 +1 @@
+<template>Supplier agency term</template>
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
new file mode 100644
index 000000000..582da48f3
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -0,0 +1 @@
+<template>Supplier basic data</template>
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
new file mode 100644
index 000000000..849737fa7
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -0,0 +1 @@
+<template>Supplier billing data</template>
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index cf94c9e8d..5b44159df 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -2,6 +2,9 @@
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import SupplierDescriptor from './SupplierDescriptor.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -18,16 +21,15 @@ const { t } = useI18n();
     </template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit">
-            <!-- Aca iría left menu y descriptor -->
+            <SupplierDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
+
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
new file mode 100644
index 000000000..df1dead17
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -0,0 +1 @@
+<template>Supplier consumption</template>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
new file mode 100644
index 000000000..ca58d4ab7
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -0,0 +1 @@
+<template>Supplier contacts</template>
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 910d36489..43857fd1e 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -78,11 +78,11 @@ const setData = (entity) => {
             <VnLv label="Alias" :value="entity.nickname" />
             <VnLv
                 :label="t('supplier.summary.payMethod')"
-                :value="entity.payMethod.name"
+                :value="entity?.payMethod?.name"
             />
             <VnLv
                 :label="t('supplier.summary.payDeadline')"
-                :value="entity.payDem.payDem"
+                :value="entity?.payDem?.payDem"
             />
             <VnLv :label="t('supplier.summary.payDay')" :value="entity.payDay" />
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
new file mode 100644
index 000000000..dd018ac60
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -0,0 +1 @@
+<template>Supplier fiscal data</template>
diff --git a/src/pages/Supplier/Card/SupplierLog.vue b/src/pages/Supplier/Card/SupplierLog.vue
new file mode 100644
index 000000000..2733e958d
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierLog.vue
@@ -0,0 +1 @@
+<template>Supplier log</template>
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index e9fbffe96..29b0c18c4 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -3,11 +3,11 @@ import { onMounted, ref, computed, onUpdated } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { getUrl } from 'src/composables/getUrl';
 import { useRole } from 'src/composables/useRole';
 import { dashIfEmpty } from 'src/filters';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 onUpdated(() => summaryRef.value.fetch());
 
@@ -53,7 +53,7 @@ const isAdministrative = computed(() => {
     >
         <template #header-left>
             <a v-if="isAdministrative" class="header link" :href="supplierUrl">
-                <QIcon name="open_in_new" color="white" size="25px" />
+                <QIcon name="open_in_new" color="white" size="sm" />
             </a>
         </template>
         <template #header>
@@ -71,13 +71,10 @@ const isAdministrative = computed(() => {
                 <VnLv label="Alias" :value="supplier.nickname" />
                 <VnLv :label="t('supplier.summary.responsible')">
                     <template #value>
-                        <span class="link">
-                            {{ dashIfEmpty(supplier.worker?.user?.nickname) }}
-                            <WorkerDescriptorProxy
-                                v-if="supplier.worker?.user?.id"
-                                :id="supplier.worker?.user?.id"
-                            />
-                        </span>
+                        <VnUserLink
+                            :name="dashIfEmpty(supplier.worker?.user?.nickname)"
+                            :worker-id="supplier.worker?.user?.id"
+                        />
                     </template>
                 </VnLv>
                 <VnLv :label="t('supplier.summary.notes')" class="q-mb-xs">
diff --git a/src/pages/Supplier/SupplierCreate.vue b/src/pages/Supplier/SupplierCreate.vue
index 9b792483b..ebe0518f2 100644
--- a/src/pages/Supplier/SupplierCreate.vue
+++ b/src/pages/Supplier/SupplierCreate.vue
@@ -1,10 +1,13 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import { reactive } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
+import { useI18n } from 'vue-i18n';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -26,11 +29,7 @@ const newSupplierForm = reactive({
     </template>
 
     <QPage>
-        <QToolbar class="bg-vn-dark justify-end">
-            <div id="st-data"></div>
-            <QSpace />
-            <div id="st-actions"></div>
-        </QToolbar>
+        <VnSubToolbar />
         <FormModel
             url-create="Suppliers/newSupplier"
             model="supplier"
@@ -39,7 +38,7 @@ const newSupplierForm = reactive({
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <QInput
+                        <VnInput
                             v-model="data.name"
                             :label="t('supplier.create.supplierName')"
                         />
@@ -49,13 +48,3 @@ const newSupplierForm = reactive({
         </FormModel>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card {
-    display: flex;
-    justify-content: center;
-    width: 100%;
-    background-color: var(--vn-dark);
-    padding: 40px;
-}
-</style>
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 91921f827..35870946a 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -4,6 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import TicketDescriptor from './TicketDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -26,11 +27,8 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
+
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index d2a407874..37ed13c2e 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -8,7 +8,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: {
@@ -106,13 +106,10 @@ const setData = (entity) =>
             </VnLv>
             <VnLv :label="t('ticket.summary.salesPerson')">
                 <template #value>
-                    <span class="link">
-                        {{ entity.client.salesPersonUser.name }}
-                        <WorkerDescriptorProxy
-                            :id="entity.client.salesPersonFk"
-                            v-if="entity.client.salesPersonFk"
-                        />
-                    </span>
+                    <VnUserLink
+                        :name="entity.client.salesPersonUser?.name"
+                        :worker-id="entity.client.salesPersonFk"
+                    />
                 </template>
             </VnLv>
             <VnLv :label="t('ticket.card.warehouse')" :value="entity.warehouse?.name" />
diff --git a/src/pages/Ticket/Card/TicketSms.vue b/src/pages/Ticket/Card/TicketSms.vue
index b145be50e..ff7de6611 100644
--- a/src/pages/Ticket/Card/TicketSms.vue
+++ b/src/pages/Ticket/Card/TicketSms.vue
@@ -1,118 +1,16 @@
 <script setup>
-import { date } from 'quasar';
-import { computed } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
+import VnSms from 'src/components/ui/VnSms.vue';
 
-import { useSession } from 'src/composables/useSession';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
+const route = useRoute();
+const id = route.params.id;
 
-const router = useRouter();
-const session = useSession();
-const token = session.getToken();
-
-const entityId = computed(function () {
-    return router.currentRoute.value.params.id;
-});
-
-const filter = {
-    fields: ['ticketFk', 'smsFk'],
-    include: {
-        relation: 'sms',
-        scope: {
-            fields: [
-                'senderFk',
-                'sender',
-                'destination',
-                'message',
-                'statusCode',
-                'status',
-                'created',
-            ],
-            include: {
-                relation: 'sender',
-                scope: {
-                    fields: ['name'],
-                },
-            },
-        },
-    },
-    where: {
-        ticketFk: entityId,
-    },
+const where = {
+    ticketFk: id,
 };
-
-function formatNumer(number) {
-    if (number.length <= 10) return number;
-    return number.slice(0, 4) + ' ' + number.slice(4);
-}
 </script>
-
 <template>
     <div class="column items-center">
-        <div class="list">
-            <VnPaginate
-                data-key="TicketSms"
-                url="TicketSms"
-                :filter="filter"
-                order="smsFk DESC"
-                :offset="100"
-                :limit="5"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <QCard
-                        flat
-                        bordered
-                        class="card q-pa-md"
-                        v-for="row of rows"
-                        :key="row.smsFk"
-                    >
-                        <QItem>
-                            <QItmSection top avatar>
-                                <QItemLabel class="column items-center">
-                                    <QAvatar>
-                                        <QImg
-                                            :src="`/api/Images/user/160x160/${row.sms.senderFk}/download?access_token=${token}`"
-                                            spinner-color="white"
-                                        />
-                                    </QAvatar>
-                                    <span class="link">
-                                        {{ row.sms.sender.name }}
-                                        <WorkerDescriptorProxy :id="row.sms.senderFk" />
-                                    </span>
-                                </QItemLabel>
-                            </QItmSection>
-                            <QSeparator spaced inset="item" />
-                            <QItemSection>
-                                <QItemLabel caption>{{
-                                    formatNumer(row.sms.destination)
-                                }}</QItemLabel>
-                                <QItemLabel>{{ row.sms.message }}</QItemLabel>
-                            </QItemSection>
-                            <QItemSection side top>
-                                <QItemLabel caption>{{
-                                    date.formatDate(
-                                        row.sms.created,
-                                        'YYYY-MM-DD HH:mm:ss'
-                                    )
-                                }}</QItemLabel>
-                                <QItemLabel>
-                                    <QChip
-                                        :color="
-                                            row.sms.status == 'OK'
-                                                ? 'positive'
-                                                : 'negative'
-                                        "
-                                    >
-                                        {{ row.sms.status }}
-                                    </QChip>
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QCard>
-                </template>
-            </VnPaginate>
-        </div>
+        <VnSms url="clientSms" :where="where" />
     </div>
 </template>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 4114b0c8e..65523bb82 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -8,10 +8,10 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 onUpdated(() => summaryRef.value.fetch());
 
@@ -160,13 +160,10 @@ async function changeState(value) {
                 </VnLv>
                 <VnLv :label="t('ticket.summary.salesPerson')">
                     <template #value>
-                        <span class="link">
-                            {{ ticket.client?.salesPersonUser?.name }}
-                            <WorkerDescriptorProxy
-                                :id="ticket.client.salesPersonFk"
-                                v-if="ticket.client.salesPersonFk"
-                            />
-                        </span>
+                        <VnUserLink
+                            :name="ticket.client?.salesPersonUser?.name"
+                            :worker-id="ticket.client?.salesPersonFk"
+                        />
                     </template>
                 </VnLv>
                 <VnLv
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 69f0b1c11..b0b584257 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -1,10 +1,13 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
 import toDateString from 'filters/toDateString';
-import VnInputDate from "components/common/VnInputDate.vue";
+import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -53,29 +56,33 @@ const warehouses = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense>
+            <QList dense class="q-gutter-y-sm q-mt-sm">
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             v-model="params.clientFk"
                             :label="t('Customer ID')"
-                            lazy-rules
+                            is-outlined
                         />
                     </QItemSection>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             v-model="params.orderFk"
                             :label="t('Order ID')"
-                            lazy-rules
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <VnInputDate v-model="params.from" :label="t('From')" />
+                        <VnInputDate
+                            v-model="params.from"
+                            :label="t('From')"
+                            is-outlined
+                        />
                     </QItemSection>
                     <QItemSection>
-                        <VnInputDate v-model="params.to" :label="t('To')" />
+                        <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
                     </QItemSection>
                 </QItem>
                 <QItem>
@@ -92,6 +99,9 @@ const warehouses = ref();
                             emit-value
                             map-options
                             use-input
+                            dense
+                            outlined
+                            rounded
                             :input-debounce="0"
                         />
                     </QItemSection>
@@ -110,15 +120,18 @@ const warehouses = ref();
                             option-label="name"
                             emit-value
                             map-options
+                            dense
+                            outlined
+                            rounded
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             v-model="params.refFk"
                             :label="t('Invoice Ref.')"
-                            lazy-rules
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
@@ -184,6 +197,9 @@ const warehouses = ref();
                                 option-label="name"
                                 emit-value
                                 map-options
+                                dense
+                                outlined
+                                rounded
                             />
                         </QItemSection>
                     </QItem>
@@ -201,6 +217,9 @@ const warehouses = ref();
                                 option-label="name"
                                 emit-value
                                 map-options
+                                dense
+                                outlined
+                                rounded
                             />
                         </QItemSection>
                     </QItem>
@@ -218,6 +237,9 @@ const warehouses = ref();
                                 option-label="name"
                                 emit-value
                                 map-options
+                                dense
+                                outlined
+                                rounded
                             />
                         </QItemSection>
                     </QItem>
@@ -232,7 +254,7 @@ en:
     params:
         search: Contains
         clientFk: Customer
-        orderFK: Order
+        orderFk: Order
         from: From
         to: To
         salesPersonFk: Salesperson
@@ -249,7 +271,7 @@ es:
     params:
         search: Contiene
         clientFk: Cliente
-        orderFK: Pedido
+        orderFk: Pedido
         from: Desde
         to: Hasta
         salesPersonFk: Comercial
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 7d7429630..9186eb6ad 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -87,7 +87,7 @@ function viewSummary(id) {
                         v-for="row of rows"
                         :key="row.id"
                         :id="row.id"
-                        :title="`${row.nickname} (${row.id})`"
+                        :title="`${row.nickname}`"
                         @click="navigate(row.id)"
                     >
                         <template #list-items>
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 6309c14ab..34ecc25ee 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,21 +1,23 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
+import TravelDescriptor from './TravelDescriptor.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 </script>
 <template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit">
-            <!-- Aca iría left menu y descriptor -->
+            <TravelDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
+
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index ad4659b11..3bc5f0584 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -2,15 +2,17 @@
 import { onMounted, ref, computed, onUpdated } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+
+import { QCheckbox, QIcon } from 'quasar';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { getUrl } from 'src/composables/getUrl';
-import { toDate } from 'src/filters';
-import travelService from 'src/services/travel.service';
-import { QCheckbox, QIcon } from 'quasar';
-import { toCurrency } from 'filters/index';
 import VnRow from 'components/ui/VnRow.vue';
 
+import travelService from 'src/services/travel.service';
+import { toDate, toCurrency } from 'src/filters';
+import { getUrl } from 'src/composables/getUrl';
+import axios from 'axios';
+
 onUpdated(() => summaryRef.value.fetch());
 
 const route = useRoute();
@@ -40,9 +42,17 @@ const cloneTravel = () => {
     redirectToCreateView(stringifiedTravelData);
 };
 
+const cloneTravelWithEntries = () => {
+    try {
+        axios.post(`Travels/${$props.id}/cloneWithEntries`);
+    } catch (err) {
+        console.err('Error cloning travel with entries');
+    }
+};
+
 const headerMenuOptions = [
     { name: t('travel.summary.cloneShipping'), action: cloneTravel },
-    { name: t('travel.summary.CloneTravelAndEntries'), action: null },
+    { name: t('travel.summary.CloneTravelAndEntries'), action: cloneTravelWithEntries },
     { name: t('travel.summary.AddEntry'), action: null },
 ];
 
@@ -185,7 +195,7 @@ const openEntryDescriptor = () => {};
     >
         <template #header-left>
             <a class="header link" :href="travelUrl">
-                <QIcon name="open_in_new" color="white" size="25px" />
+                <QIcon name="open_in_new" color="white" size="sm" />
             </a>
         </template>
         <template #header>
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index cef3ed998..62292f115 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -8,6 +8,7 @@ import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorP
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import ExtraCommunityFilter from './ExtraCommunityFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toCurrency } from 'src/filters';
@@ -102,111 +103,109 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            label: 'id',
-            field: 'id',
-            name: 'id',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('supplier.pageTitles.supplier'),
-            field: 'cargoSupplierNickname',
-            name: 'cargoSupplierNickname',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.agency'),
-            field: 'agencyModeName',
-            name: 'agencyModeName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.amount'),
-            name: 'invoiceAmount',
-            field: 'entries',
-            align: 'left',
-            showValue: true,
-            format: (value) =>
-                toCurrency(
-                    value
-                        ? value.reduce((sum, entry) => {
-                              return sum + (entry.invoiceAmount || 0);
-                          }, 0)
-                        : 0
-                ),
-        },
-        {
-            label: t('globals.reference'),
-            field: 'ref',
-            name: 'ref',
-            align: 'left',
-            showValue: false,
-        },
-        {
-            label: t('globals.packages'),
-            field: 'stickers',
-            name: 'stickers',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('kg'),
-            field: 'kg',
-            name: 'kg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('physicKg'),
-            field: 'loadedKg',
-            name: 'loadedKg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: 'KG Vol.',
-            field: 'volumeKg',
-            name: 'volumeKg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.wareHouseOut'),
-            field: 'warehouseOutName',
-            name: 'warehouseOutName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('shipped'),
-            field: 'shipped',
-            name: 'shipped',
-            align: 'left',
-            format: (value) => toDate(value.substring(0, 10)),
-            showValue: true,
-        },
-        {
-            label: t('globals.wareHouseIn'),
-            field: 'warehouseInName',
-            name: 'warehouseInName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('landed'),
-            field: 'landed',
-            name: 'landed',
-            align: 'left',
-            format: (value) => toDate(value.substring(0, 10)),
-            showValue: true,
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        label: 'id',
+        field: 'id',
+        name: 'id',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('supplier.pageTitles.supplier'),
+        field: 'cargoSupplierNickname',
+        name: 'cargoSupplierNickname',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.agency'),
+        field: 'agencyModeName',
+        name: 'agencyModeName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.amount'),
+        name: 'invoiceAmount',
+        field: 'entries',
+        align: 'left',
+        showValue: true,
+        format: (value) =>
+            toCurrency(
+                value
+                    ? value.reduce((sum, entry) => {
+                          return sum + (entry.invoiceAmount || 0);
+                      }, 0)
+                    : 0
+            ),
+    },
+    {
+        label: t('globals.reference'),
+        field: 'ref',
+        name: 'ref',
+        align: 'left',
+        showValue: false,
+    },
+    {
+        label: t('globals.packages'),
+        field: 'stickers',
+        name: 'stickers',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('kg'),
+        field: 'kg',
+        name: 'kg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('physicKg'),
+        field: 'loadedKg',
+        name: 'loadedKg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: 'KG Vol.',
+        field: 'volumeKg',
+        name: 'volumeKg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.wareHouseOut'),
+        field: 'warehouseOutName',
+        name: 'warehouseOutName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('shipped'),
+        field: 'shipped',
+        name: 'shipped',
+        align: 'left',
+        format: (value) => toDate(value.substring(0, 10)),
+        showValue: true,
+    },
+    {
+        label: t('globals.wareHouseIn'),
+        field: 'warehouseInName',
+        name: 'warehouseInName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('landed'),
+        field: 'landed',
+        name: 'landed',
+        align: 'left',
+        format: (value) => toDate(value.substring(0, 10)),
+        showValue: true,
+    },
+]);
 
 async function getData() {
     await arrayData.fetch({ append: false });
@@ -314,7 +313,7 @@ onMounted(async () => {
                                     label-set="Save"
                                     label-cancel="Close"
                                 >
-                                    <QInput
+                                    <VnInput
                                         v-model="rows[props.pageIndex][col.field]"
                                         dense
                                         autofocus
@@ -394,7 +393,7 @@ onMounted(async () => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 
 .secondary-row {
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 2d3629de4..260b0fb42 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -1,9 +1,11 @@
 <script setup>
-import { reactive } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-import FetchData from 'components/FetchData.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
@@ -14,16 +16,10 @@ const props = defineProps({
     },
 });
 
-const filtersOptions = reactive({
-    warehouses: [],
-    continents: [],
-    agencies: [],
-    suppliers: [],
-});
-
-const updateFilterOptions = (data, optionKey) => {
-    filtersOptions[optionKey] = [...data];
-};
+const warehousesOptions = ref([]);
+const continentsOptions = ref([]);
+const agenciesOptions = ref([]);
+const suppliersOptions = ref([]);
 
 const add = (paramsObj, key) => {
     if (paramsObj[key] === undefined) {
@@ -43,22 +39,22 @@ const decrement = (paramsObj, key) => {
 <template>
     <FetchData
         url="Warehouses"
-        @on-fetch="(data) => updateFilterOptions(data, 'warehouses')"
+        @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
     />
     <FetchData
         url="Continents"
-        @on-fetch="(data) => updateFilterOptions(data, 'continents')"
+        @on-fetch="(data) => (continentsOptions = data)"
         auto-load
     />
     <FetchData
         url="AgencyModes"
-        @on-fetch="(data) => updateFilterOptions(data, 'agencies')"
+        @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
     <FetchData
         url="Suppliers"
-        @on-fetch="(data) => updateFilterOptions(data, 'suppliers')"
+        @on-fetch="(data) => (suppliersOptions = data)"
         auto-load
     />
 
@@ -70,24 +66,22 @@ const decrement = (paramsObj, key) => {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense style="max-width: 256px" class="list">
-                <QItem class="q-my-sm">
+            <QList dense class="list q-gutter-y-sm q-mt-sm">
+                <QItem>
                     <QItemSection>
-                        <QInput label="id" dense outlined rounded v-model="params.id" />
+                        <VnInput label="id" v-model="params.id" is-outlined />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-my-sm">
+                <QItem>
                     <QItemSection>
-                        <QInput
-                            :label="t('params.ref')"
-                            dense
-                            outlined
-                            rounded
+                        <VnInput
+                            :label="t('params.reference')"
                             v-model="params.reference"
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <QInput
                             v-model="params.totalEntries"
@@ -118,12 +112,12 @@ const decrement = (paramsObj, key) => {
                         </QInput>
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('params.agencyModeFk')"
                             v-model="params.agencyModeFk"
-                            :options="filtersOptions.agencies"
+                            :options="agenciesOptions"
                             option-value="agencyFk"
                             option-label="name"
                             hide-selected
@@ -133,34 +127,30 @@ const decrement = (paramsObj, key) => {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnInputDate
                             v-model="params.shippedFrom"
                             :label="t('params.shippedFrom')"
-                            dense
-                            outlined
-                            rounded
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnInputDate
                             v-model="params.landedTo"
                             :label="t('params.landedTo')"
-                            dense
-                            outlined
-                            rounded
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('params.warehouseOutFk')"
                             v-model="params.warehouseOutFk"
-                            :options="filtersOptions.warehouses"
+                            :options="warehousesOptions"
                             option-value="id"
                             option-label="name"
                             hide-selected
@@ -170,12 +160,12 @@ const decrement = (paramsObj, key) => {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('params.warehouseInFk')"
                             v-model="params.warehouseInFk"
-                            :options="filtersOptions.warehouses"
+                            :options="warehousesOptions"
                             option-value="id"
                             option-label="name"
                             hide-selected
@@ -185,12 +175,12 @@ const decrement = (paramsObj, key) => {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('supplier.pageTitles.supplier')"
                             v-model="params.cargoSupplierFk"
-                            :options="filtersOptions.suppliers"
+                            :options="suppliersOptions"
                             option-value="id"
                             option-label="name"
                             hide-selected
@@ -200,12 +190,12 @@ const decrement = (paramsObj, key) => {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('params.continent')"
                             v-model="params.continent"
-                            :options="filtersOptions.continents"
+                            :options="continentsOptions"
                             option-value="code"
                             option-label="name"
                             hide-selected
@@ -221,6 +211,9 @@ const decrement = (paramsObj, key) => {
 </template>
 
 <style scoped>
+.list {
+    width: 256px;
+}
 .list * {
     max-width: 100%;
 }
@@ -240,7 +233,8 @@ const decrement = (paramsObj, key) => {
 <i18n>
 en:
     params:
-        ref: Reference
+        id: Id
+        reference: Reference
         totalEntries: Total entries
         agencyModeFk: Agency
         warehouseInFk: Warehouse In
@@ -251,7 +245,8 @@ en:
         continent: Continent out
 es:
     params:
-        ref: Referencia
+        id: Id
+        reference: Referencia
         totalEntries: Ent. totales
         agencyModeFk: Agencia
         warehouseInFk: Alm. entrada
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 434bbb238..c8ac7e690 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -1,15 +1,16 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { reactive, ref } from 'vue';
-import FetchData from 'components/FetchData.vue';
+import { reactive, ref, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { toDate } from 'src/filters';
 
-import { onBeforeMount } from 'vue';
-
 const { t } = useI18n();
 const route = useRoute();
 
@@ -23,8 +24,8 @@ const newTravelForm = reactive({
 });
 
 const agenciesOptions = ref([]);
-const viewAction = ref();
 const warehousesOptions = ref([]);
+const viewAction = ref();
 
 onBeforeMount(() => {
     // Esto nos permite decirle a FormModel si queremos observar los cambios o no
@@ -42,25 +43,21 @@ onBeforeMount(() => {
         }
     }
 });
-
-const onFetchAgencies = (agencies) => {
-    agenciesOptions.value = [...agencies];
-};
-
-const onFetchWarehouses = (warehouses) => {
-    warehousesOptions.value = [...warehouses];
-};
 </script>
 
 <template>
-    <FetchData url="AgencyModes" @on-fetch="(data) => onFetchAgencies(data)" auto-load />
-    <FetchData url="Warehouses" @on-fetch="(data) => onFetchWarehouses(data)" auto-load />
+    <FetchData
+        url="AgencyModes"
+        @on-fetch="(data) => (agenciesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    />
     <QPage>
-        <QToolbar class="bg-vn-dark">
-            <div id="st-data"></div>
-            <QSpace />
-            <div id="st-actions"></div>
-        </QToolbar>
+        <VnSubToolbar />
         <FormModel
             url-update="Travels"
             model="travel"
@@ -70,7 +67,7 @@ const onFetchWarehouses = (warehouses) => {
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <QInput v-model="data.ref" :label="t('globals.reference')" />
+                        <VnInput v-model="data.ref" :label="t('globals.reference')" />
                     </div>
                     <div class="col">
                         <VnSelectFilter
@@ -169,11 +166,3 @@ const onFetchWarehouses = (warehouses) => {
         </FormModel>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
-    grid-gap: 20px;
-}
-</style>
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 2c2d80488..52a755c34 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -1,9 +1,12 @@
 <script setup>
-import { reactive } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
+
 import { toDate } from 'src/filters';
 
 const { t } = useI18n();
@@ -14,15 +17,9 @@ const props = defineProps({
     },
 });
 
-const filtersOptions = reactive({
-    warehouses: [],
-    continents: [],
-    agencies: [],
-});
-
-const updateFilterOptions = (data, optionKey) => {
-    filtersOptions[optionKey] = [...data];
-};
+const warehousesOptions = ref([]);
+const continentsOptions = ref([]);
+const agenciesOptions = ref([]);
 
 const add = (paramsObj, key) => {
     if (paramsObj[key] === undefined) {
@@ -42,17 +39,17 @@ const decrement = (paramsObj, key) => {
 <template>
     <FetchData
         url="Warehouses"
-        @on-fetch="(data) => updateFilterOptions(data, 'warehouses')"
+        @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
     />
     <FetchData
         url="Continents"
-        @on-fetch="(data) => updateFilterOptions(data, 'continents')"
+        @on-fetch="(data) => (continentsOptions = data)"
         auto-load
     />
     <FetchData
         url="AgencyModes"
-        @on-fetch="(data) => updateFilterOptions(data, 'agencies')"
+        @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
 
@@ -64,24 +61,22 @@ const decrement = (paramsObj, key) => {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense style="max-width: 256px" class="list">
-                <QItem class="q-my-sm">
+            <QList dense class="list q-gutter-y-sm q-mt-sm">
+                <QItem>
                     <QItemSection>
-                        <QInput
-                            :label="t('params.search')"
-                            dense
-                            outlined
-                            rounded
+                        <VnInput
                             v-model="params.search"
+                            :label="t('params.search')"
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('params.agencyModeFk')"
                             v-model="params.agencyModeFk"
-                            :options="filtersOptions.agencies"
+                            :options="agenciesOptions"
                             option-value="agencyFk"
                             option-label="name"
                             hide-selected
@@ -91,12 +86,12 @@ const decrement = (paramsObj, key) => {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('params.warehouseOutFk')"
                             v-model="params.warehouseOutFk"
-                            :options="filtersOptions.warehouses"
+                            :options="warehousesOptions"
                             option-value="id"
                             option-label="name"
                             hide-selected
@@ -106,12 +101,12 @@ const decrement = (paramsObj, key) => {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('params.warehouseInFk')"
                             v-model="params.warehouseInFk"
-                            :options="filtersOptions.warehouses"
+                            :options="warehousesOptions"
                             option-value="id"
                             option-label="name"
                             hide-selected
@@ -121,7 +116,7 @@ const decrement = (paramsObj, key) => {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <QInput
                             v-model="params.scopeDays"
@@ -151,7 +146,7 @@ const decrement = (paramsObj, key) => {
                         </QInput>
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <QInput
                             dense
@@ -184,7 +179,7 @@ const decrement = (paramsObj, key) => {
                         </QInput>
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <QInput
                             dense
@@ -217,12 +212,12 @@ const decrement = (paramsObj, key) => {
                         </QInput>
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('params.continent')"
                             v-model="params.continent"
-                            :options="filtersOptions.continents"
+                            :options="continentsOptions"
                             option-value="code"
                             option-label="name"
                             hide-selected
@@ -232,7 +227,7 @@ const decrement = (paramsObj, key) => {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
                         <QInput
                             v-model="params.totalEntries"
@@ -269,6 +264,9 @@ const decrement = (paramsObj, key) => {
 </template>
 
 <style scoped>
+.list {
+    width: 256px;
+}
 .list * {
     max-width: 100%;
 }
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index d62485a4c..889f096aa 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -8,9 +8,9 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelSummaryDialog from './Card/TravelSummaryDialog.vue';
+import TravelFilter from './TravelFilter.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import TravelFilter from './TravelFilter.vue';
 import { toDate } from 'src/filters/index';
 
 const router = useRouter();
@@ -31,6 +31,10 @@ const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
 };
 
+const redirectCreateEntryView = (travelData) => {
+    router.push({ name: 'EntryCreate', query: { travelFk: travelData.id } });
+};
+
 const viewSummary = (id) => {
     quasar.dialog({
         component: TravelSummaryDialog,
@@ -103,7 +107,7 @@ onMounted(async () => {
                             />
                             <QBtn
                                 :label="t('addEntry')"
-                                @click.stop="viewSummary(row.id)"
+                                @click.stop="redirectCreateEntryView(row)"
                                 class="bg-vn-dark"
                                 outline
                                 style="margin-top: 15px"
diff --git a/src/pages/Wagon/Type/WagonTypeCreate.vue b/src/pages/Wagon/Type/WagonTypeCreate.vue
index 50be4169c..bc9c1a40c 100644
--- a/src/pages/Wagon/Type/WagonTypeCreate.vue
+++ b/src/pages/Wagon/Type/WagonTypeCreate.vue
@@ -1,9 +1,12 @@
 <script setup>
-import axios from 'axios';
-import { useQuasar } from 'quasar';
 import { computed, ref, onMounted, onUpdated } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
+import { useQuasar } from 'quasar';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
 
 onMounted(() => fetch());
 onUpdated(() => fetch());
@@ -241,7 +244,7 @@ function exceedMaxHeight(pos) {
     <QPage class="q-pa-sm q-mx-xl">
         <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
             <QCard class="q-pa-md">
-                <QInput
+                <VnInput
                     filled
                     v-model="name"
                     :label="t('wagon.type.name')"
@@ -306,8 +309,8 @@ function exceedMaxHeight(pos) {
                     </div>
                 </div>
                 <div class="q-mb-sm wheels">
-                    <QIcon color="grey-6" name="trip_origin" size="3rem" />
-                    <QIcon color="grey-6" name="trip_origin" size="3rem" />
+                    <QIcon color="grey-6" name="trip_origin" size="xl" />
+                    <QIcon color="grey-6" name="trip_origin" size="xl" />
                 </div>
                 <QDialog
                     v-model="colorPickerActive"
diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
index 0bd6f87be..cf6bc3ff2 100644
--- a/src/pages/Wagon/WagonCreate.vue
+++ b/src/pages/Wagon/WagonCreate.vue
@@ -1,9 +1,12 @@
 <script setup>
-import axios from 'axios';
-import { QIcon, QInput, QItem, QItemSection, QSelect } from 'quasar';
 import { computed, onMounted, onUpdated, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { QIcon, QInput, QItem, QItemSection, QSelect } from 'quasar';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
 import { useRoute, useRouter } from 'vue-router';
+import axios from 'axios';
 
 onMounted(() => fetch());
 onUpdated(() => fetch());
@@ -100,7 +103,7 @@ function filterType(val, update) {
                         />
                     </div>
                     <div class="col">
-                        <QInput
+                        <VnInput
                             filled
                             v-model="wagon.plate"
                             :label="t('wagon.create.plate')"
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 972eb52ec..719831523 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -4,6 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import WorkerDescriptor from './WorkerDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -26,11 +27,8 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
+
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 970a0dee4..26328b9cd 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -2,12 +2,12 @@
 import { ref, onMounted, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import CardSummary from 'components/ui/CardSummary.vue';
+import { dashIfEmpty } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
-import WorkerDescriptorProxy from './WorkerDescriptorProxy.vue';
-import { dashIfEmpty } from 'src/filters';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -83,13 +83,11 @@ const filter = {
                 <VnLv :label="t('worker.list.email')" :value="worker.user.email" />
                 <VnLv :label="t('worker.summary.boss')" link>
                     <template #value>
-                        <span class="link">
-                            {{ dashIfEmpty(worker.boss?.name) }}
-                            <WorkerDescriptorProxy
-                                :id="worker.bossFk"
-                                v-if="worker.boss"
-                            />
-                        </span>
+                        <VnUserLink
+                            v-if="worker.boss"
+                            :name="dashIfEmpty(worker.boss?.name)"
+                            :worker-id="worker.bossFk"
+                        />
                     </template>
                 </VnLv>
                 <VnLv :value="worker.mobileExtension">
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
new file mode 100644
index 000000000..a476632bb
--- /dev/null
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -0,0 +1,363 @@
+<script setup>
+import { onMounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useUserConfig } from 'src/composables/useUserConfig';
+
+const { t } = useI18n();
+
+const workerConfigFilter = {
+    field: ['payMethodFk'],
+};
+
+const provincesFilter = {
+    fields: ['id', 'name', 'countryFk'],
+};
+
+const townsFilter = {
+    fields: ['id', 'name', 'provinceFk'],
+};
+
+const newWorkerForm = ref({
+    companyFk: null,
+    payMethodFk: null,
+    firstName: null,
+    lastNames: null,
+    birth: null,
+    fi: null,
+    code: null,
+    phone: null,
+    postcode: null,
+    provinceFk: null,
+    city: null,
+    street: null,
+    name: null,
+    email: null,
+    bossFk: null,
+    iban: null,
+    bankEntityFk: null,
+});
+
+const postcodeFetchDataRef = ref(null);
+const provincesOptions = ref([]);
+const townsOptions = ref([]);
+const companiesOptions = ref([]);
+const workersOptions = ref([]);
+const payMethodsOptions = ref([]);
+const bankEntitiesOptions = ref([]);
+const postcodesOptions = ref([]);
+
+const onFetchWorkerConfig = (workerConfig) => {
+    newWorkerForm.value.payMethodFk = workerConfig.payMethodFk;
+};
+
+const onBankEntityCreated = (data) => {
+    bankEntitiesOptions.value.push(data);
+};
+
+const onPostcodeCreated = async () => {
+    postcodeFetchDataRef.value.fetch();
+};
+
+onMounted(async () => {
+    const userInfo = await useUserConfig().fetch();
+    newWorkerForm.value = { companyFk: userInfo.companyFk };
+});
+</script>
+
+<template>
+    <FetchData
+        url="WorkerConfigs/findOne"
+        @on-fetch="(data) => onFetchWorkerConfig(data)"
+        :filter="workerConfigFilter"
+        auto-load
+    />
+    <FetchData
+        ref="postcodeFetchDataRef"
+        url="Postcodes/location"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Provinces/location"
+        @on-fetch="(data) => (provincesOptions = data)"
+        :filter="provincesFilter"
+        auto-load
+    />
+    <FetchData
+        url="Towns/location"
+        @on-fetch="(data) => (townsOptions = data)"
+        :filter="townsFilter"
+        auto-load
+    />
+    <FetchData
+        url="Companies"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Workers/search"
+        @on-fetch="(data) => (workersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Paymethods"
+        @on-fetch="(data) => (payMethodsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="BankEntities"
+        @on-fetch="(data) => (bankEntitiesOptions = data)"
+        auto-load
+    />
+
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            url-create="Workers/new"
+            model="worker"
+            :form-initial-data="newWorkerForm"
+        >
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInput
+                            v-model="data.firstName"
+                            :label="t('worker.create.name')"
+                            :rules="validate('Worker.firstName')"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            v-model="data.lastNames"
+                            :label="t('worker.create.lastName')"
+                            :rules="validate('Worker.lastNames')"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInputDate
+                            v-model="data.birth"
+                            :label="t('worker.create.birth')"
+                            :rules="validate('Worker.birth')"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInput
+                            v-model="data.fi"
+                            :label="t('worker.create.fi')"
+                            :rules="validate('Worker.fi')"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            v-model="data.code"
+                            :label="t('worker.create.code')"
+                            :rules="validate('Worker.code')"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            v-model="data.phone"
+                            :label="t('worker.create.phone')"
+                            :rules="validate('Worker.phone')"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectCreate
+                            v-model="data.postcode"
+                            :label="t('worker.create.postcode')"
+                            :rules="validate('Worker.postcode')"
+                            :roles-allowed-to-create="['deliveryAssistant']"
+                            :options="postcodesOptions"
+                            option-label="code"
+                            option-value="code"
+                            hide-selected
+                        >
+                            <template #form>
+                                <CreateNewPostcode
+                                    @on-data-saved="onPostcodeCreated($event)"
+                                />
+                            </template>
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection v-if="scope.opt">
+                                        <QItemLabel>{{ scope.opt.code }}</QItemLabel>
+                                        <QItemLabel caption
+                                            >{{ scope.opt.code }} -
+                                            {{ scope.opt.town.name }} ({{
+                                                scope.opt.town.province.name
+                                            }},
+                                            {{
+                                                scope.opt.town.province.country.country
+                                            }})</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectCreate>
+                    </div>
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('worker.create.province')"
+                            v-model="data.provinceFk"
+                            :options="provincesOptions"
+                            option-value="id"
+                            option-label="name"
+                            hide-selected
+                            :rules="validate('Worker.provinceFk')"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('worker.create.city')"
+                            v-model="data.city"
+                            :options="townsOptions"
+                            option-value="name"
+                            option-label="name"
+                            hide-selected
+                            :rules="validate('Worker.city')"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                        <QItemLabel caption
+                                            >{{ scope.opt.name }},
+                                            {{ scope.opt.province.name }} ({{
+                                                scope.opt.province.country.country
+                                            }})</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            :label="t('worker.create.street')"
+                            v-model="data.street"
+                            :rules="validate('Worker.street')"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInput
+                            v-model="data.name"
+                            :label="t('worker.create.webUser')"
+                            :rules="validate('Worker.name')"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            v-model="data.email"
+                            :label="t('worker.create.personalEmail')"
+                            :rules="validate('Worker.email')"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('worker.create.company')"
+                            v-model="data.companyFk"
+                            :options="companiesOptions"
+                            option-value="id"
+                            option-label="code"
+                            hide-selected
+                            :rules="validate('Worker.company')"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('worker.create.boss')"
+                            v-model="data.bossFk"
+                            :options="workersOptions"
+                            option-value="id"
+                            option-label="name"
+                            hide-selected
+                            :rules="validate('Worker.boss')"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                        <QItemLabel caption
+                                            >{{ scope.opt.nickname }},
+                                            {{ scope.opt.code }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('worker.create.payMethods')"
+                            v-model="data.payMethodFk"
+                            :options="payMethodsOptions"
+                            option-value="id"
+                            option-label="name"
+                            map-options
+                            hide-selected
+                            :rules="validate('Worker.payMethodFk')"
+                        />
+                    </div>
+
+                    <div class="col">
+                        <VnInput
+                            v-model="data.iban"
+                            :label="t('worker.create.iban')"
+                            :rules="validate('Worker.iban')"
+                        />
+                    </div>
+                    <VnSelectCreate
+                        :label="t('worker.create.bankEntity')"
+                        v-model="data.bankEntityFk"
+                        :options="bankEntitiesOptions"
+                        option-label="name"
+                        option-value="id"
+                        hide-selected
+                        :roles-allowed-to-create="['salesAssistant', 'hr']"
+                        :rules="validate('Worker.bankEntity')"
+                    >
+                        <template #form>
+                            <CreateBankEntityForm
+                                @on-data-saved="onBankEntityCreated($event)"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection v-if="scope.opt">
+                                    <QItemLabel
+                                        >{{ scope.opt.bic }}
+                                        {{ scope.opt.name }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectCreate>
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
diff --git a/src/pages/Worker/WorkerDepartment.vue b/src/pages/Worker/WorkerDepartment.vue
new file mode 100644
index 000000000..3c0e5fdd0
--- /dev/null
+++ b/src/pages/Worker/WorkerDepartment.vue
@@ -0,0 +1,15 @@
+<script setup>
+import VnTree from 'components/ui/VnTree.vue';
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <VnTree />
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Search worker: Buscar trabajador
+    You can search by worker id or name: Puedes buscar por id o nombre del trabajador
+</i18n>
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 079905c4f..680a17937 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -1,8 +1,10 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -25,40 +27,39 @@ const departments = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense>
+            <QList dense class="q-gutter-y-sm q-mt-sm">
                 <QItem>
                     <QItemSection>
-                        <QInput :label="t('FI')" v-model="params.fi" lazy-rules>
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </QInput>
+                        <VnInput :label="t('FI')" v-model="params.fi" is-outlined
+                            ><template #prepend>
+                                <QIcon name="badge" size="xs"></QIcon> </template
+                        ></VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('First Name')"
                             v-model="params.firstName"
-                            lazy-rules
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('Last Name')"
                             v-model="params.lastName"
-                            lazy-rules
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('User Name')"
                             v-model="params.userName"
-                            lazy-rules
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
@@ -77,16 +78,19 @@ const departments = ref();
                             emit-value
                             map-options
                             use-input
+                            dense
+                            outlined
+                            rounded
                             :input-debounce="0"
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-md">
+                <QItem>
                     <QItemSection>
-                        <QInput
+                        <VnInput
                             :label="t('Extension')"
                             v-model="params.extension"
-                            lazy-rules
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
@@ -104,6 +108,7 @@ en:
         lastName: Last name
         userName: User
         extension: Extension
+        departmentFk: Department
 es:
     params:
         search: Contiene
@@ -112,6 +117,7 @@ es:
         lastName: Apellidos
         userName: Usuario
         extension: Extensión
+        departmentFk: Departamento
     FI: NIF
     First Name: Nombre
     Last Name: Apellidos
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index a09c370ef..e7e86d16e 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -27,6 +27,10 @@ function viewSummary(id) {
         },
     });
 }
+
+const redirectToCreateView = () => {
+    router.push({ name: 'WorkerCreate' });
+};
 </script>
 
 <template>
@@ -101,6 +105,12 @@ function viewSummary(id) {
                 </template>
             </VnPaginate>
         </div>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+            <QTooltip>
+                {{ t('worker.list.newWorker') }}
+            </QTooltip>
+        </QPageSticky>
     </QPage>
 </template>
 
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 198a9581e..6ce1a7688 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -11,7 +11,17 @@ export default {
     redirect: { name: 'SupplierMain' },
     menus: {
         main: ['SupplierList'],
-        card: [],
+        card: [
+            'SupplierBasicData',
+            'SupplierFiscalData',
+            'SupplierBillingData',
+            'SupplierLog',
+            'SupplierAccounts',
+            'SupplierContacts',
+            'SupplierAddresses',
+            'SupplierConsumption',
+            'SupplierAgencyTerm',
+        ],
     },
     children: [
         {
@@ -55,6 +65,95 @@ export default {
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierSummary.vue'),
                 },
+                {
+                    path: 'basic-data',
+                    name: 'SupplierBasicData',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierBasicData.vue'),
+                },
+                {
+                    path: 'fiscal-data',
+                    name: 'SupplierFiscalData',
+                    meta: {
+                        title: 'fiscalData',
+                        icon: 'vn:dfiscales',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierFiscalData.vue'),
+                },
+                {
+                    path: 'billing-data',
+                    name: 'SupplierBillingData',
+                    meta: {
+                        title: 'billingData',
+                        icon: 'vn:payment',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierBillingData.vue'),
+                },
+                {
+                    path: 'log',
+                    name: 'SupplierLog',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:History',
+                    },
+                    component: () => import('src/pages/Supplier/Card/SupplierLog.vue'),
+                },
+                {
+                    path: 'account',
+                    name: 'SupplierAccounts',
+                    meta: {
+                        title: 'accounts',
+                        icon: 'vn:account',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAccounts.vue'),
+                },
+                {
+                    path: 'contact',
+                    name: 'SupplierContacts',
+                    meta: {
+                        title: 'contacts',
+                        icon: 'contact_phone',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierContacts.vue'),
+                },
+                {
+                    path: 'address',
+                    name: 'SupplierAddresses',
+                    meta: {
+                        title: 'addresses',
+                        icon: 'vn:delivery',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAddresses.vue'),
+                },
+                {
+                    path: 'consumption',
+                    name: 'SupplierConsumption',
+                    meta: {
+                        title: 'consumption',
+                        icon: 'show_chart',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierConsumption.vue'),
+                },
+                {
+                    path: 'agency-term',
+                    name: 'SupplierAgencyTerm',
+                    meta: {
+                        title: 'agencyTerm',
+                        icon: 'vn:agency-term',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAgencyTerm.vue'),
+                },
             ],
         },
     ],
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 832a1e0fd..3c8445f42 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -10,8 +10,29 @@ export default {
     component: RouterView,
     redirect: { name: 'CustomerMain' },
     menus: {
-        main: ['CustomerList', 'CustomerPayments'],
-        card: ['CustomerBasicData'],
+        main: [
+            'CustomerList',
+            'CustomerPayments',
+            'CustomerExtendedList',
+            'CustomerNotifications',
+            'CustomerDefaulter',
+        ],
+        card: [
+            'CustomerBasicData',
+            'CustomerFiscalData',
+            'CustomerBillingData',
+            'CustomerConsignees',
+            'CustomerNotes',
+            'CustomerCredits',
+            'CustomerGreuges',
+            'CustomerBalance',
+            'CustomerRecoveries',
+            'CustomerWebAccess',
+            'CustomerLog',
+            'CustomerSms',
+            'CustomerCreditManagement',
+            'CustomerOthers',
+        ],
     },
     children: [
         {
@@ -29,6 +50,14 @@ export default {
                     },
                     component: () => import('src/pages/Customer/CustomerList.vue'),
                 },
+                {
+                    path: 'create',
+                    name: 'CustomerCreate',
+                    meta: {
+                        title: 'create',
+                    },
+                    component: () => import('src/pages/Customer/CustomerCreate.vue'),
+                },
                 {
                     path: 'payments',
                     name: 'CustomerPayments',
@@ -36,7 +65,42 @@ export default {
                         title: 'webPayments',
                         icon: 'vn:onlinepayment',
                     },
-                    component: () => import('src/pages/Customer/CustomerPayments.vue'),
+                    component: () =>
+                        import('src/pages/Customer/Payments/CustomerPayments.vue'),
+                },
+                {
+                    path: 'extendedList',
+                    name: 'CustomerExtendedList',
+                    meta: {
+                        title: 'extendedList',
+                        icon: 'vn:client',
+                    },
+                    component: () =>
+                        import(
+                            'src/pages/Customer/ExtendedList/CustomerExtendedList.vue'
+                        ),
+                },
+                {
+                    path: 'notifications',
+                    name: 'CustomerNotifications',
+                    meta: {
+                        title: 'notifications',
+                        icon: 'notifications',
+                    },
+                    component: () =>
+                        import(
+                            'src/pages/Customer/Notifications/CustomerNotifications.vue'
+                        ),
+                },
+                {
+                    path: 'defaulter',
+                    name: 'CustomerDefaulter',
+                    meta: {
+                        title: 'defaulter',
+                        icon: 'vn:risk',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Defaulter/CustomerDefaulter.vue'),
                 },
             ],
         },
@@ -66,6 +130,132 @@ export default {
                     component: () =>
                         import('src/pages/Customer/Card/CustomerBasicData.vue'),
                 },
+                {
+                    path: 'fiscal-data',
+                    name: 'CustomerFiscalData',
+                    meta: {
+                        title: 'fiscalData',
+                        icon: 'vn:dfiscales',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerFiscalData.vue'),
+                },
+                {
+                    path: 'billing-data',
+                    name: 'CustomerBillingData',
+                    meta: {
+                        title: 'billingData',
+                        icon: 'vn:payment',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerBillingData.vue'),
+                },
+                {
+                    path: 'consignees',
+                    name: 'CustomerConsignees',
+                    meta: {
+                        title: 'consignees',
+                        icon: 'vn:delivery',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerConsignees.vue'),
+                },
+                {
+                    path: 'notes',
+                    name: 'CustomerNotes',
+                    meta: {
+                        title: 'notes',
+                        icon: 'vn:notes',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerNotes.vue'),
+                },
+                {
+                    path: 'credits',
+                    name: 'CustomerCredits',
+                    meta: {
+                        title: 'credits',
+                        icon: 'vn:credit',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerCredits.vue'),
+                },
+                {
+                    path: 'greuges',
+                    name: 'CustomerGreuges',
+                    meta: {
+                        title: 'greuges',
+                        icon: 'vn:greuge',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerGreuges.vue'),
+                },
+                {
+                    path: 'balance',
+                    name: 'CustomerBalance',
+                    meta: {
+                        title: 'balance',
+                        icon: 'vn:invoice',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerBalance.vue'),
+                },
+                {
+                    path: 'recoveries',
+                    name: 'CustomerRecoveries',
+                    meta: {
+                        title: 'recoveries',
+                        icon: 'vn:recovery',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerRecoveries.vue'),
+                },
+                {
+                    path: 'web-access',
+                    name: 'CustomerWebAccess',
+                    meta: {
+                        title: 'webAccess',
+                        icon: 'vn:web',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerWebAccess.vue'),
+                },
+                {
+                    path: 'log',
+                    name: 'CustomerLog',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:History',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerLog.vue'),
+                },
+                {
+                    path: 'sms',
+                    name: 'CustomerSms',
+                    meta: {
+                        title: 'sms',
+                        icon: 'sms',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerSms.vue'),
+                },
+                {
+                    path: 'credit-management',
+                    name: 'CustomerCreditManagement',
+                    meta: {
+                        title: 'creditManagement',
+                        icon: 'paid',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerCreditManagement.vue'),
+                },
+                {
+                    path: 'others',
+                    name: 'CustomerOthers',
+                    meta: {
+                        title: 'others',
+                        icon: 'pending',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerOthers.vue'),
+                },
             ],
         },
     ],
diff --git a/src/router/modules/department.js b/src/router/modules/department.js
new file mode 100644
index 000000000..aaffc3460
--- /dev/null
+++ b/src/router/modules/department.js
@@ -0,0 +1,46 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/department',
+    name: 'Department',
+    meta: {
+        title: 'department',
+        icon: 'vn:greuge',
+    },
+    component: RouterView,
+    redirect: { name: 'DepartmentCard' },
+    menus: {
+        main: [],
+        card: ['DepartmentBasicData'],
+    },
+    children: [
+        {
+            name: 'DepartmentCard',
+            path: 'department/:id',
+            component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
+            redirect: { name: 'DepartmentSummary' },
+            children: [
+                {
+                    name: 'DepartmentSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () =>
+                        import('src/pages/Department/Card/DepartmentSummary.vue'),
+                },
+                {
+                    name: 'DepartmentBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Department/Card/DepartmentBasicData.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
new file mode 100644
index 000000000..6a1cd6173
--- /dev/null
+++ b/src/router/modules/entry.js
@@ -0,0 +1,61 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/entry',
+    name: 'Entry',
+    meta: {
+        title: 'entries',
+        icon: 'vn:entry',
+    },
+    component: RouterView,
+    redirect: { name: 'EntryMain' },
+    menus: {
+        main: ['EntryList'],
+        card: [],
+    },
+    children: [
+        {
+            path: '',
+            name: 'EntryMain',
+            component: () => import('src/pages/Entry/EntryMain.vue'),
+            redirect: { name: 'EntryList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'EntryList',
+                    meta: {
+                        title: 'list',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Entry/EntryList.vue'),
+                },
+                {
+                    path: 'create',
+                    name: 'EntryCreate',
+                    meta: {
+                        title: 'create',
+                    },
+                    component: () => import('src/pages/Entry/EntryCreate.vue'),
+                },
+            ],
+        },
+        // {
+        //     name: 'EntryCard',
+        //     path: ':id',
+        //     component: () => import('src/pages/Entry/Card/EntryCard.vue'),
+        //     redirect: { name: 'EntrySummary' },
+        //     children: [
+        //         {
+        //             name: 'EntrySummary',
+        //             path: 'summary',
+        //             meta: {
+        //                 title: 'summary',
+        //                 icon: 'launch',
+        //             },
+        //             component: () =>
+        //                 import('src/pages/Entry/Card/EntrySummary.vue'),
+        //         },
+        //     ],
+        // },
+    ],
+};
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 0ab5bf2b2..cc5034959 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -9,6 +9,9 @@ import Wagon from './wagon';
 import Route from './route';
 import Supplier from './Supplier';
 import Travel from './travel';
+import Order from './order';
+import Department from './department';
+import Entry from './entry';
 
 export default [
     Customer,
@@ -21,5 +24,8 @@ export default [
     Route,
     Supplier,
     Travel,
+    Order,
     invoiceIn,
+    Department,
+    Entry,
 ];
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
new file mode 100644
index 000000000..4599394cd
--- /dev/null
+++ b/src/router/modules/order.js
@@ -0,0 +1,96 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/order',
+    name: 'Order',
+    meta: {
+        title: 'order',
+        icon: 'vn:basket',
+    },
+    component: RouterView,
+    redirect: { name: 'OrderMain' },
+    menus: {
+        main: ['OrderList'],
+        card: ['OrderBasicData', 'OrderCatalog', 'OrderVolume', 'OrderLines'],
+    },
+    children: [
+        {
+            path: '',
+            name: 'OrderMain',
+            component: () => import('src/pages/Order/OrderMain.vue'),
+            redirect: { name: 'OrderList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'OrderList',
+                    meta: {
+                        title: 'orderList',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Order/OrderList.vue'),
+                },
+                {
+                    path: 'create',
+                    name: 'OrderCreate',
+                    meta: {
+                        title: 'create',
+                    },
+                    component: () => import('src/pages/Order/Card/OrderForm.vue'),
+                },
+            ],
+        },
+        {
+            name: 'OrderCard',
+            path: ':id',
+            component: () => import('src/pages/Order/Card/OrderCard.vue'),
+            redirect: { name: 'OrderSummary' },
+            children: [
+                {
+                    name: 'OrderSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () => import('src/pages/Order/Card/OrderSummary.vue'),
+                },
+                {
+                    name: 'OrderBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Order/Card/OrderForm.vue'),
+                },
+                {
+                    name: 'OrderCatalog',
+                    path: 'catalog',
+                    meta: {
+                        title: 'catalog',
+                        icon: 'vn:basket',
+                    },
+                    component: () => import('src/pages/Order/OrderCatalog.vue'),
+                },
+                {
+                    name: 'OrderVolume',
+                    path: 'volume',
+                    meta: {
+                        title: 'volume',
+                        icon: 'vn:volume',
+                    },
+                    component: () => import('src/pages/Order/OrderVolume.vue'),
+                },
+                {
+                    name: 'OrderLines',
+                    path: 'line',
+                    meta: {
+                        title: 'lines',
+                        icon: 'vn:lines',
+                    },
+                    component: () => import('src/pages/Order/OrderLines.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js
index bd0a2067d..43c444ae2 100644
--- a/src/router/modules/travel.js
+++ b/src/router/modules/travel.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'TravelMain' },
     menus: {
         main: ['TravelList', 'ExtraCommunity'],
-        card: [],
+        card: ['TravelBasicData', 'TravelHistory', 'TravelThermographs'],
     },
     children: [
         {
@@ -42,7 +42,7 @@ export default {
                     path: 'create',
                     name: 'TravelCreate',
                     meta: {
-                        title: 'extraCommunity',
+                        title: 'travelCreate',
                         icon: '',
                     },
                     component: () => import('src/pages/Travel/TravelCreate.vue'),
@@ -63,6 +63,36 @@ export default {
                     },
                     component: () => import('src/pages/Travel/Card/TravelSummary.vue'),
                 },
+                {
+                    name: 'TravelBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                        // roles: [],
+                    },
+                    // component: () => import(),
+                },
+                {
+                    name: 'TravelHistory',
+                    path: 'history',
+                    meta: {
+                        title: 'history',
+                        icon: 'history',
+                        // roles: [],
+                    },
+                    // component: () => import(),
+                },
+                {
+                    name: 'TravelThermographs',
+                    path: 'thermographs',
+                    meta: {
+                        title: 'thermographs',
+                        icon: 'vn:thermometer',
+                        // roles: [],
+                    },
+                    // component: () => import(),
+                },
             ],
         },
     ],
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index e5ee7c1a2..27a6f19a9 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -10,8 +10,9 @@ export default {
     component: RouterView,
     redirect: { name: 'WorkerMain' },
     menus: {
-        main: ['WorkerList'],
+        main: ['WorkerList', 'WorkerDepartment'],
         card: ['WorkerNotificationsManager'],
+        departmentCard: ['BasicData'],
     },
     children: [
         {
@@ -29,6 +30,24 @@ export default {
                     },
                     component: () => import('src/pages/Worker/WorkerList.vue'),
                 },
+                {
+                    path: 'department',
+                    name: 'WorkerDepartment',
+                    meta: {
+                        title: 'department',
+                        icon: 'vn:greuge',
+                    },
+                    component: () => import('src/pages/Worker/WorkerDepartment.vue'),
+                },
+                {
+                    path: 'create',
+                    name: 'WorkerCreate',
+                    meta: {
+                        title: 'workerCreate',
+                        icon: '',
+                    },
+                    component: () => import('src/pages/Worker/WorkerCreate.vue'),
+                },
             ],
         },
         {
diff --git a/src/router/routes.js b/src/router/routes.js
index 550fcf64e..6a2fa6a97 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -8,7 +8,10 @@ import wagon from './modules/wagon';
 import supplier from './modules/Supplier';
 import route from './modules/route';
 import travel from './modules/travel';
+import department from './modules/department';
 import shelving from 'src/router/modules/shelving';
+import order from 'src/router/modules/order';
+import entry from 'src/router/modules/entry';
 
 const routes = [
     {
@@ -56,9 +59,12 @@ const routes = [
             invoiceOut,
             invoiceIn,
             wagon,
+            order,
             route,
             supplier,
             travel,
+            department,
+            entry,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',
diff --git a/src/services/invoiceOut.service.js b/src/services/invoiceOut.service.js
deleted file mode 100644
index 6232f319d..000000000
--- a/src/services/invoiceOut.service.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import axios from 'axios';
-
-const request = async (method, url, params = {}) => {
-    try {
-        let response;
-
-        if (method === 'GET') {
-            response = await axios.get(url, { params });
-        } else if (method === 'POST') {
-            response = await axios.post(url, params);
-        }
-        return response.data;
-    } catch (err) {
-        console.error(`Error with ${method} request to ${url}`, err);
-        return err.response;
-    }
-};
-
-const invoiceOutService = {
-    getNegativeBases: async (params) => {
-        return await request('GET', 'InvoiceOuts/negativeBases', params);
-    },
-
-    getNegativeBasesCsv: async (params) => {
-        return await request('GET', 'InvoiceOuts/negativeBasesCsv', params);
-    },
-
-    getInvoiceDate: async (params) => {
-        return await request('GET', 'InvoiceOuts/getInvoiceDate', params);
-    },
-
-    getFindOne: async (params) => {
-        return await request('GET', 'InvoiceOutConfigs/findOne', params);
-    },
-
-    getClientsToInvoice: async (params) => {
-        return await request('POST', 'InvoiceOuts/clientsToInvoice', params);
-    },
-
-    invoiceClient: async (params) => {
-        return await request('POST', 'InvoiceOuts/invoiceClient', params);
-    },
-
-    makePdfAndNotify: async (invoiceId, params) => {
-        return await request('POST', `InvoiceOuts/${invoiceId}/makePdfAndNotify`, params);
-    },
-};
-
-export default invoiceOutService;
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index 71e4c3537..7151aac5f 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -1,8 +1,10 @@
 import { defineStore } from 'pinia';
 import { useUserConfig } from 'src/composables/useUserConfig';
-import invoiceOutService from 'src/services/invoiceOut.service';
-import useNotify from 'src/composables/useNotify.js';
 import { exportFile } from 'quasar';
+import { useArrayData } from 'composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+
+import axios from 'axios';
 
 const { notify } = useNotify();
 
@@ -60,18 +62,29 @@ export const useInvoiceOutGlobalStore = defineStore({
         },
 
         async fetchInvoiceOutConfig(companyFk) {
-            this.formInitialData.companyFk = companyFk;
-            const params = { companyFk: companyFk };
-            const { issued } = await invoiceOutService.getInvoiceDate(params);
-            const stringDate = issued.substring(0, 10);
-            this.minInvoicingDate = stringDate;
-            this.formInitialData.invoiceDate = stringDate;
+            try {
+                this.formInitialData.companyFk = companyFk;
+                const params = { companyFk: companyFk };
+
+                const { data } = await axios.get('InvoiceOuts/getInvoiceDate', {
+                    params,
+                });
+
+                const stringDate = data.issued.substring(0, 10);
+                this.minInvoicingDate = stringDate;
+                this.formInitialData.invoiceDate = stringDate;
+            } catch (err) {
+                console.error('Error fetching invoice out global initial data');
+                throw new Error();
+            }
         },
 
         async fetchParallelism() {
             const filter = { fields: ['parallelism'] };
-            const { parallelism } = await invoiceOutService.getFindOne(filter);
-            this.parallelism = parallelism;
+            const { data } = await axios.get('InvoiceOutConfigs/findOne', {
+                filter,
+            });
+            this.parallelism = data.parallelism;
         },
 
         async makeInvoice(formData, clientsToInvoice) {
@@ -90,11 +103,12 @@ export const useInvoiceOutGlobalStore = defineStore({
 
                 if (clientsToInvoice == 'all') params.clientId = undefined;
 
-                const addressesResponse = await invoiceOutService.getClientsToInvoice(
+                const addressesResponse = await await axios.post(
+                    'InvoiceOuts/clientsToInvoice',
                     params
                 );
 
-                this.addresses = addressesResponse;
+                this.addresses = addressesResponse.data;
 
                 if (!this.addresses || !this.addresses.length > 0) {
                     notify(
@@ -151,31 +165,45 @@ export const useInvoiceOutGlobalStore = defineStore({
         },
 
         async invoiceClient(address, formData) {
-            if (this.nRequests === this.parallelism || this.isInvoicing) return;
+            try {
+                if (this.nRequests === this.parallelism || this.isInvoicing) return;
 
-            if (this.status === 'stopping') {
-                if (this.nRequests) return;
-                this.invoicing = false;
-                this.status = 'done';
-                return;
-            }
+                if (this.status === 'stopping') {
+                    if (this.nRequests) return;
+                    this.invoicing = false;
+                    this.status = 'done';
+                    return;
+                }
 
-            const params = {
-                clientId: address.clientId,
-                addressId: address.id,
-                invoiceDate: new Date(formData.invoiceDate),
-                maxShipped: new Date(formData.maxShipped),
-                companyFk: formData.companyFk,
-            };
+                const params = {
+                    clientId: address.clientId,
+                    addressId: address.id,
+                    invoiceDate: new Date(formData.invoiceDate),
+                    maxShipped: new Date(formData.maxShipped),
+                    companyFk: formData.companyFk,
+                };
 
-            this.status = 'invoicing';
-            this.invoicing = true;
+                this.status = 'invoicing';
+                this.invoicing = true;
 
-            const invoiceResponse = await invoiceOutService.invoiceClient(params);
+                const invoiceResponse = await axios.post(
+                    'InvoiceOuts/invoiceClient',
+                    params
+                );
 
-            if (invoiceResponse.data.error) {
-                if (invoiceResponse.status >= 400 && invoiceResponse.status < 500) {
-                    this.invoiceClientError(address, invoiceResponse);
+                if (invoiceResponse.data) {
+                    this.makePdfAndNotify(invoiceResponse.data, address);
+                }
+
+                this.isInvoicing = false;
+            } catch (err) {
+                if (
+                    err &&
+                    err.response &&
+                    err.response.status >= 400 &&
+                    err.response.status < 500
+                ) {
+                    this.invoiceClientError(address, err.response);
                     this.addressIndex++;
                     return;
                 } else {
@@ -187,11 +215,6 @@ export const useInvoiceOutGlobalStore = defineStore({
                     );
                     throw new Error('Critical invoicing error, process stopped');
                 }
-            } else {
-                this.isInvoicing = false;
-                if (invoiceResponse.data) {
-                    this.makePdfAndNotify(invoiceResponse.data, address);
-                }
             }
         },
 
@@ -200,7 +223,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                 this.nRequests++;
                 this.totalPdfs++;
                 const params = { printerFk: this.printer };
-                await invoiceOutService.makePdfAndNotify(invoiceId, params);
+                await axios.post(`InvoiceOuts/${invoiceId}/makePdfAndNotify`, params);
                 this.nPdfs++;
                 this.nRequests--;
             } catch (err) {
@@ -219,14 +242,18 @@ export const useInvoiceOutGlobalStore = defineStore({
             throw err;
         },
 
-        async getNegativeBasesCsv(from, to, filter = {}) {
+        async getNegativeBasesCsv() {
             try {
-                const params = { from: from, to: to, filter };
-                const CSVResponse = await invoiceOutService.getNegativeBasesCsv(params);
+                const arrayData = useArrayData('InvoiceOutNegative');
+                const params = arrayData.store.currentFilter;
 
-                if (CSVResponse.data && CSVResponse.data.error) throw new Error();
+                const { data } = await axios.get('InvoiceOuts/negativeBasesCsv', {
+                    params,
+                });
 
-                const status = exportFile('negativeBases.csv', CSVResponse, {
+                if (data.data && data.data.error) throw new Error();
+
+                const status = exportFile('negativeBases.csv', data, {
                     encoding: 'windows-1252',
                     mimeType: 'text/csv;charset=windows-1252;',
                 });
@@ -236,6 +263,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                 }
             } catch (err) {
                 notify('invoiceOut.negativeBases.errors.downloadCsvFailed', 'negative');
+                throw new Error();
             }
         },
 
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index 223406a33..115c161dd 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -19,6 +19,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
             order: '',
             data: ref(),
             isLoading: false,
+            userParamsChanged: false,
             exprBuilder: null,
         };
     }
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 5daa618d5..2eda6f686 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -14,10 +14,12 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'invoiceIn',
         'worker',
         'shelving',
+        'order',
         'wagon',
         'route',
         'supplier',
         'travel',
+        'entry',
     ];
     const pinnedModules = ref([]);
     const role = useRole();
diff --git a/src/stores/useStateStore.js b/src/stores/useStateStore.js
index 74b65e71f..328df9978 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -5,6 +5,7 @@ export const useStateStore = defineStore('stateStore', () => {
     const isMounted = ref(false);
     const leftDrawer = ref(false);
     const rightDrawer = ref(false);
+    const subToolbar = ref(false);
 
     function toggleLeftDrawer() {
         leftDrawer.value = !leftDrawer.value;
@@ -14,6 +15,10 @@ export const useStateStore = defineStore('stateStore', () => {
         rightDrawer.value = !rightDrawer.value;
     }
 
+    function toggleSubToolbar() {
+        subToolbar.value = !subToolbar.value;
+    }
+
     function setMounted() {
         isMounted.value = true;
     }
@@ -31,10 +36,7 @@ export const useStateStore = defineStore('stateStore', () => {
     }
 
     function isSubToolbarShown() {
-        return (
-            !!document.querySelector('#st-data') &&
-            !!document.querySelector('#st-actions')
-        );
+        return subToolbar.value;
     }
 
     return {
@@ -47,5 +49,6 @@ export const useStateStore = defineStore('stateStore', () => {
         isLeftDrawerShown,
         isRightDrawerShown,
         isSubToolbarShown,
+        toggleSubToolbar,
     };
 });
diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index 60d8c5be1..9d3adbc73 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -9,6 +9,7 @@ describe('InvoiceInList', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/invoice-in`);
+        cy.clickFilterSearchBtn();
     });
 
     it('should redirect on clicking a invoice', () => {
diff --git a/test/cypress/integration/vnSearchBar.spec.js b/test/cypress/integration/vnSearchBar.spec.js
new file mode 100644
index 000000000..d6dea0780
--- /dev/null
+++ b/test/cypress/integration/vnSearchBar.spec.js
@@ -0,0 +1,19 @@
+/// <reference types="cypress" />
+describe('VnSearchBar', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit('/');
+    });
+
+        it('should redirect to new customer', () => {
+            cy.visit('#/customer/1112/basic-data')
+            cy.openLeftMenu();
+            cy.get('.q-item > .q-item__label').should('have.text',' #1112')
+            cy.closeLeftMenu();
+            cy.clearSearchbar();
+            cy.writeSearchbar('1{enter}');
+            cy.openLeftMenu();
+            cy.get('.q-item > .q-item__label').should('have.text',' #1')
+            cy.closeLeftMenu();
+        });
+});
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 4dfde6e21..e4d1cebe1 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -138,23 +138,20 @@ Cypress.Commands.add('validateRow', (rowSelector, expectedValues) => {
 
 Cypress.Commands.add('removeRow', (rowIndex) => {
     let rowsBefore;
-    let rowsAfter;
-
-    cy.get('tr')
+    cy.get('tbody > tr:visible')
         .its('length')
         .then((length) => {
-            rowsBefore = length;
             cy.get('.q-checkbox').eq(rowIndex).click();
             cy.removeCard();
             cy.get('.q-dialog button').eq(2).click();
+            rowsBefore = length;
         })
         .then(() => {
-            cy.get('tr')
-                .its('length')
-                .then((length) => {
-                    rowsAfter = length;
-                    expect(rowsBefore).to.eq(rowsAfter + 1);
-                });
+            // Check the existence of tbody before performing the second assertion.
+            cy.get('tbody').then(($tbody) => {
+                if ($tbody.length > 0)
+                    cy.get('tbody > tr:visible').should('have.length', rowsBefore - 1);
+            });
         });
 });
 Cypress.Commands.add('openListSummary', (row) => {
@@ -166,7 +163,28 @@ Cypress.Commands.add('openRightMenu', (element) => {
     cy.get('#actions-append').click();
 });
 
+Cypress.Commands.add('openLeftMenu', (element) => {
+    if (element) cy.waitForElement(element);
+    cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
+});
+Cypress.Commands.add('closeLeftMenu', (element) => {
+    if (element) cy.waitForElement(element);
+    cy.get('.fullscreen').click();
+});
+
+Cypress.Commands.add('clearSearchbar', (element) => {
+    if (element) cy.waitForElement(element);
+    cy.get('#searchbar > form > label > div:nth-child(1) input').clear();
+});
+
+Cypress.Commands.add('writeSearchbar', (value) => {
+    cy.get('#searchbar > form > label > div:nth-child(1) input').type(value);
+});
 Cypress.Commands.add('validateContent', (selector, expectedValue) => {
     cy.get(selector).should('have.text', expectedValue);
 });
+
+Cypress.Commands.add('clickFilterSearchBtn', () => {
+    cy.get('.q-item__section > .q-btn > .q-btn__content > .q-icon').click();
+});
 // registerCommands();
diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/test/vitest/__tests__/components/Paginate.spec.js
index af9fb41a1..2a22ce438 100644
--- a/test/vitest/__tests__/components/Paginate.spec.js
+++ b/test/vitest/__tests__/components/Paginate.spec.js
@@ -119,7 +119,7 @@ describe('VnPaginate', () => {
             await vm.onLoad(index, done);
 
             expect(vm.pagination.page).toEqual(2);
-            expect(done).toHaveBeenCalledWith(true);
+            expect(done).toHaveBeenCalledWith(false);
         });
     });
 });
diff --git a/test/vitest/__tests__/components/common/VnSearchBar.spec.js b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
new file mode 100644
index 000000000..fd0a026ef
--- /dev/null
+++ b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
@@ -0,0 +1,53 @@
+import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+
+
+describe('VnSearchBar', () => {
+    let vm;
+    let wrapper;
+
+    beforeAll(() => {
+        wrapper = createWrapper(VnSearchbar, {
+            propsData: {
+                dataKey: 'CustomerList',
+                label: 'Search customer',
+                info: 'Info customer',
+            },
+        });
+        vm = wrapper.vm;
+        vm.route.matched = [
+            {
+                path: '/',
+            },
+            {
+                path: '/customer',
+            },
+            {
+                path: '/customer/:id',
+            },
+            {
+                path: '/customer/:id/basic-data',
+            },
+        ];
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+    it('should be defined', async () => {
+        expect(vm.searchText).toBeDefined();
+        expect(vm.searchText).toEqual('');
+    });
+    it('should redirect', async () => {
+        vi.spyOn(vm.router,'push');
+        vm.searchText = '1';
+        await vm.search();
+        expect(vm.router.push).toHaveBeenCalledWith('/customer/1/basic-data');
+        vm.searchText = '1112';
+        expect(vm.searchText).toEqual('1112');
+        vi.spyOn(vm.router,'push');
+        await vm.search();
+        expect(vm.router.push).toHaveBeenCalledWith('/customer/1112/basic-data');
+     });
+});
diff --git a/test/vitest/__tests__/components/common/VnSms.spec.js b/test/vitest/__tests__/components/common/VnSms.spec.js
new file mode 100644
index 000000000..e0f8c1868
--- /dev/null
+++ b/test/vitest/__tests__/components/common/VnSms.spec.js
@@ -0,0 +1,25 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import VnSms from 'src/components/ui/VnSms.vue';
+
+describe('VnSms', () => {
+    let vm;
+
+    beforeAll(() => {
+        vm = createWrapper(VnSms, {
+            global: {
+                stubs: ['VnPaginate'],
+                mocks: {},
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should format number correctly', () => {
+        const formattedNumber = vm.formatNumber('123456789012');
+        expect(formattedNumber).toBe('1234 56789012');
+    });
+});
diff --git a/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js b/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
index 5d096f113..13293f596 100644
--- a/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
+++ b/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
@@ -1,11 +1,10 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
-import CustomerPayments from 'pages/Customer/CustomerPayments.vue';
+import CustomerPayments from 'src/pages/Customer/Payments/CustomerPayments.vue';
 
 describe('CustomerPayments', () => {
     let vm;
 
-
     beforeAll(() => {
         vm = createWrapper(CustomerPayments, {
             global: {
@@ -13,7 +12,7 @@ describe('CustomerPayments', () => {
                 mocks: {
                     fetch: vi.fn(),
                 },
-            }
+            },
         }).vm;
     });
 
@@ -28,11 +27,10 @@ describe('CustomerPayments', () => {
 
             await vm.confirmTransaction({ id: 1 });
 
-
             expect(vm.quasar.notify).toHaveBeenCalledWith(
                 expect.objectContaining({
                     message: 'Payment confirmed',
-                    type: 'positive'
+                    type: 'positive',
                 })
             );
         });