fix: refs #6242 merge conflicts

2024-10-24 12:56:33 +02:00 · 2024-10-24 12:56:33 +02:00 · e18d129b32
parent f6051ae15c 32b4636706
commit e18d129b32
183 changed files with 3894 additions and 1581 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,183 @@
+# Version 24.40 - 2024-10-02
+
+### Added 🆕
+
+-   chore: refs #4074 admit several acls by:jorgep
+-   chore: refs #4074 drop workerCreate by:jorgep
+-   chore: refs #4074 fix tests by:jorgep
+-   chore: refs #4074 wip replace useRole for useAcl by:jorgep
+-   chore: refs #7155 remove console.log by:alexm
+-   chore: refs #7155 typo by:alexm
+-   chore: refs #7663 add test by:jorgep
+-   chore: refs #7663 create test wip by:jorgep
+-   chore: refs #7663 drop useless code (origin/7663-setWeight) by:jorgep
+-   chore: refs #7828 fix e2e by:jorgep
+-   feat(AccountBasicData): add twoFactorFk by:alexm
+-   feat: add max rule by:Javier Segarra
+-   feat: add shortcut add event in some subSections by:Javier Segarra
+-   feat: add shortcut more buttons (origin/add_shortcut_add_subSections) by:Javier Segarra
+-   feat: add tooltip CustomerNewCustomAgent by:Javier Segarra
+-   feat: apply color when today by:Javier Segarra
+-   feat: change label because its more natural by:Javier Segarra
+-   feat: change order by:Javier Segarra
+-   feat: change QBadge color by:Javier Segarra
+-   feat: change url CustomerList by:Javier Segarra
+-   feat: copy customer countryFk by:Javier Segarra
+-   feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData by:alexm
+-   feat: CustomerBalance by:Javier Segarra
+-   feat: CustomerConsumptionFilter by:Javier Segarra
+-   feat: customer consumption (origin/7830-customerDesplegables, 7830-customerDesplegables) by:alexm
+-   feat: CustomerCreateTicket by:Javier Segarra
+-   feat: CustomerCredit section by:Javier Segarra
+-   feat: CustomerGreuges by:Javier Segarra
+-   feat: CustomerSample to VnTable by:Javier Segarra
+-   feat: global handler (origin/fix_global_handler, fix_global_handler) by:alexm
+-   feat: goToSupplier by:Javier Segarra
+-   feat: handle newValue by:Javier Segarra
+-   feat: handle same multiple CP by:Javier Segarra
+-   feat: hide menus on small view (origin/hideMenu) by:jorgep
+-   feat: minor changes by:Javier Segarra
+-   feat: orderCreateDialog by:Javier Segarra
+-   feat: refs #4074 drop useless code by:jorgep
+-   feat: refs #4074 useAcl in vnSelectDialog by:jorgep
+-   feat: refs #6346 new wagon type section by:Jon
+-   feat: refs #7404 add m3 and fix detail by:pablone
+-   feat: refs #7404 add some style to the form and reorganize fields by:pablone
+-   feat: refs #7404 add travel m3 to reserves form by:pablone
+-   feat: refs #7404 style dynamic text color by:pablone
+-   feat: refs #7404 travel m3 form by:pablone
+-   feat: refs #7500 added VnImg to show files by:Jon
+-   feat: refs #7663 add setWeight menu opt (wip) by:jorgep
+-   feat: refs #7663 fine tunning by:jorgep
+-   feat: refs #7828 create axios instance which no manage errors (origin/7828-makeCorrectCalls) by:jorgep
+-   feat: refs #7828 useAcl & cherry pick mail data worker by:jorgep
+-   feat: remove cli warnings by:Javier Segarra
+-   feat: show preparation field by:Javier Segarra
+-   feat: stateGroupedFilter by:Javier Segarra
+-   feat: translations fixed by:jgallego
+-   feat(TravelList): add daysOnward by:alexm
+-   feat: travel m3 by:pablone
+-   feat: use disableInifiniteScroll property by:Javier Segarra
+-   feat: VnImg draggable by:Javier Segarra
+-   feat: vnLocation changes by:Javier Segarra
+-   feat: vnSelect exprBuilder by:Javier Segarra
+-   fix: refs #7404 remove some style by:pablone
+-   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
+-   fix: refs #7404 translates and some minor style fixes by:pablone
+-   fix: styles by:Javier Segarra
+-   perf: improve style by:Javier Segarra
+
+### Changed 📦
+
+-   perf: CustomerBalance by:Javier Segarra
+-   perf: CustomerBasicData by:Javier Segarra
+-   perf: CustomerBasicData.salesPersonFk by:Javier Segarra
+-   perf: CustomerSummary by:Javier Segarra
+-   perf: customerSummaryTable by:Javier Segarra
+-   perf: disable card option by:Javier Segarra
+-   perf: i18n by:Javier Segarra
+-   perf: improve by:Javier Segarra
+-   perf: improve style by:Javier Segarra
+-   perf: imrpove exprBuilder by:Javier Segarra
+-   perf: minor comments by:Javier Segarra
+-   perf: refs #6346 previous changes by:Jon
+-   perf: sendEmail customerConsumption by:Javier Segarra
+-   perf: solve reload CardSummary component by:Javier Segarra
+-   perf: update CustommerDescriptor by:Javier Segarra
+-   refactor: refs #4074 accept array by:jorgep
+-   refactor: refs #4074 rollback by:jorgep
+-   refactor: refs #4074 use acl & drop useless roles by:jorgep
+-   refactor: refs #4074 useAcl in navigationStore & router by:jorgep
+-   refactor: refs #4074 use fn (origin/4074-useAcls) by:jorgep
+-   refactor: refs #4074 use VnTitle by:jorgep
+-   refactor: refs #6346 deleted front error checking by:Jon
+-   refactor: refs #6346 requested changes by:Jon
+-   refactor: refs #6346 wagons to VnTable by:Jon
+-   refactor: refs #7500 deleted useless code by:Jon
+-   refactor: refs #7500 refactor vnimg when storage is dms by:Jon
+-   refactor: refs #7828 wip by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #4074 fix tests by:jorgep
+-   chore: refs #7828 fix e2e by:jorgep
+-   feat: refs #7404 add m3 and fix detail by:pablone
+-   feat: translations fixed by:jgallego
+-   fix: #5938 grouped filter by:Javier Segarra
+-   fix: #6943 fix customerSummaryTable by:Javier Segarra
+-   fix: #6943 show nickname salesPerson by:Javier Segarra
+-   fix: address-create i18n by:Javier Segarra
+-   fix: comments (origin/6943_fix_customer_module, 6943_fix_customer_module) by:Javier Segarra
+-   fix: CusomerSummary to Address by:Javier Segarra
+-   fix: CustomerAddress mobile by:Javier Segarra
+-   fix: CustomerBillingData by:Javier Segarra
+-   fix: Customerconsumption by:Javier Segarra
+-   fix: customer credit opinion by:alexm
+-   fix: CustomerCreditOpinion workerDescriptor by:Javier Segarra
+-   fix: CustomerDescriptorAccount by:Javier Segarra
+-   fix: CustomerDescriptor.bussinessTypeFk by:Javier Segarra
+-   fix: CustomerFilter by:Javier Segarra
+-   fix: CustomerGreuges by:Javier Segarra
+-   fix: CustomerMandates by:Javier Segarra
+-   fix: Customer module find salesPersons out of first get by:Javier Segarra
+-   fix: CustomerRecovery transalate label by:Javier Segarra
+-   fix: CustomerSamples by:Javier Segarra
+-   fix: customerSummaryToTicketList button by:Javier Segarra
+-   fix: CustomerWebPayment by:Javier Segarra
+-   fix: CustommerSummaryTable Proxy by:Javier Segarra
+-   fix: deleted code by:Jon
+-   fix: duplicate code by:alexm
+-   fix: emit:updateModelValue by:Javier Segarra
+-   fix: fixed wagon tests by:Jon
+-   fix: fix wagon list reload by:Jon
+-   fix: i18n en preparation label by:Javier Segarra
+-   fix: infiniteScroll by:Javier Segarra
+-   fix: isFullMovable checkbox by:Javier Segarra
+-   fix: merge conflicts by:Javier Segarra
+-   fix: merge in dev by:alexm
+-   fix: missing code by:Jon
+-   fix: Options VnSelect properties by:Javier Segarra
+-   fix: refs #4074 await to watch by:jorgep
+-   fix: refs #4074 drop wrong acl by:jorgep
+-   fix: refs #4074 workerCard data-key by:jorgep
+-   fix: refs #6346 fix list and create by:pablone
+-   fix: refs #6943 prevent null (origin/6943-warmfix-preventNull) by:jorgep
+-   fix: refs #7155 remove userParams in watcher (7155-travel_daysOnward) by:alexm
+-   fix: refs #7155 use chip-locale (origin/7155-travel_daysOnward_2, 7155-travel_daysOnward_2) by:alexm
+-   fix: refs #7404 remove console.log by:pablone
+-   fix: refs #7404 remove from test by:pablone
+-   fix: refs #7404 remove some style by:pablone
+-   fix: refs #7404 revert commit prevent production access by:pablone
+-   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
+-   fix: refs #7404 translates and some minor style fixes by:pablone
+-   fix: refs #7500 fixed e2e test by:Jon
+-   fix: refs #7500 fixed showing images wrongly by:Jon
+-   fix: refs #7830 customer credit by:pablone
+-   fix: refs #7830 remove console.log by:pablone
+-   fix: remove console.log by:pablone
+-   fix: remove FetchData by:Javier Segarra
+-   fix: remove FIXME (origin/6943_fix_customerSummaryTable) by:Javier Segarra
+-   fix: remove print variable by:Javier Segarra
+-   fix: remove promise execution by:Javier Segarra
+-   fix: reset VnTable scroll properties by:Javier Segarra
+-   fix: rule by:Javier Segarra
+-   fix: solve conflicts from master to test by:Javier Segarra
+-   fix: split params (origin/warmfix-addSearchUrl) by:jorgep
+-   fix: state cell by:Javier Segarra
+-   fix: stop call back event hasMoreData by:Javier Segarra
+-   fix: styles by:Javier Segarra
+-   fix: SupplierFiscalData VnLocation (origin/fix_supplierFD_location) by:Javier Segarra
+-   fix: VnLocation test by:Javier Segarra
+-   fix(VnTable): header background-color by:alexm
+-   fix(VnTable): sanitizer value is defined by:carlossa
+-   fix: wagon reload (origin/FixWagonRedirect) by:Jon
+-   fix: workerDms filter workerFk by:alexm
+-   fix(WorkerList): add type email by:alexm
+-   Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable by:Javier Segarra
+-   refs #7155 scopeDays fix (origin/7155-scopeDays) by:carlossa
+-   revert: vnUSerLink change by:Javier Segarra
+-   test: fix test (7677_vnLocation_perf) by:Javier Segarra
+
 # Version 24.38 - 2024-09-17

 ### Added 🆕
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-front",
-    "version": "24.42.0",
+    "version": "24.44.0",
    "description": "Salix frontend",
    "productName": "Salix",
    "author": "Verdnatura",
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@ -2,9 +2,11 @@ import axios from 'axios';
 import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
 import useNotify from 'src/composables/useNotify.js';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';

 const session = useSession();
 const { notify } = useNotify();
+const stateQuery = useStateQueryStore();
 const baseUrl = '/api/';

 axios.defaults.baseURL = baseUrl;
@ -15,7 +17,7 @@ const onRequest = (config) => {
    if (token.length && !config.headers.Authorization) {
        config.headers.Authorization = token;
    }
-
+    stateQuery.add(config);
    return config;
 };

@ -24,10 +26,10 @@ const onRequestError = (error) => {
 };

 const onResponse = (response) => {
-    const { method } = response.config;
+    const config = response.config;
+    stateQuery.remove(config);

-    const isSaveRequest = method === 'patch';
-    if (isSaveRequest) {
+    if (config.method === 'patch') {
        notify('globals.dataSaved', 'positive');
    }

@ -35,6 +37,8 @@ const onResponse = (response) => {
 };

 const onResponseError = (error) => {
+    stateQuery.remove(error.config);
+
    let message = '';

    const response = error.response;
--- a/src/boot/defaults/qInput.js
+++ b/src/boot/defaults/qInput.js
@ -0,0 +1,4 @@
+import { QInput } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QInput, 'dense', true);
--- a/src/boot/defaults/qSelect.js
+++ b/src/boot/defaults/qSelect.js
@ -0,0 +1,4 @@
+import { QSelect } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QSelect, 'dense', true);
--- a/src/boot/quasar.defaults.js
+++ b/src/boot/quasar.defaults.js
@ -1 +1,3 @@
 export * from './defaults/qTable';
+export * from './defaults/qInput';
+export * from './defaults/qSelect';
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@ -21,7 +21,7 @@ const customer = computed(() => state.get('customer'));
 const bankEntityFormData = reactive({
    name: null,
    bic: null,
-    countryFk: customer.value.countryFk,
+    countryFk: customer.value?.countryFk,
    id: null,
 });

@ -31,8 +31,8 @@ const countriesFilter = {

 const countriesOptions = ref([]);

-const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
+const onDataSaved = (...args) => {
+    emit('onDataSaved', ...args);
 };

 onMounted(async () => {
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@ -1,35 +1,42 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';

-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectProvince from 'components/VnSelectProvince.vue';
 import VnInput from 'components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';

 const emit = defineEmits(['onDataSaved']);
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const { t } = useI18n();

-const cityFormData = reactive({
+const cityFormData = ref({
    name: null,
    provinceFk: null,
 });
-
-const provincesOptions = ref([]);
-
+onMounted(() => {
+    cityFormData.value.provinceFk = $props.provinceSelected;
+});
 const onDataSaved = (...args) => {
    emit('onDataSaved', ...args);
 };
 </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!')"
@ -41,11 +48,16 @@ const onDataSaved = (...args) => {
        <template #form-inputs="{ data, validate }">
            <VnRow>
                <VnInput
-                    :label="t('Name')"
+                    :label="t('Names')"
                    v-model="data.name"
                    :rules="validate('city.name')"
                />
-                <VnSelectProvince v-model="data.provinceFk" />
+                <VnSelectProvince
+                    :province-selected="$props.provinceSelected"
+                    :country-fk="$props.countryFk"
+                    v-model="data.provinceFk"
+                    :provinces="$props.provinces"
+                />
            </VnRow>
        </template>
    </FormModelPopup>
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { reactive, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';

 import FetchData from 'components/FetchData.vue';
@ -22,9 +22,11 @@ const postcodeFormData = reactive({
    townFk: null,
 });

+const townsFetchDataRef = ref(null);
 const provincesFetchDataRef = ref(null);
 const countriesOptions = ref([]);
 const provincesOptions = ref([]);
+const townsOptions = ref([]);
 const town = ref({});

 function onDataSaved(formData) {
@ -61,23 +63,94 @@ function setTown(newTown, data) {
 }

 async function setProvince(id, data) {
-    await provincesFetchDataRef.value.fetch();
    const newProvince = provincesOptions.value.find((province) => province.id == id);
    if (!newProvince) return;

    data.countryFk = newProvince.countryFk;
 }
+
+async function onProvinceCreated(data) {
+    await provincesFetchDataRef.value.fetch({
+        where: { countryFk: postcodeFormData.countryFk },
+    });
+    postcodeFormData.provinceFk.value = data.id;
+}
+
+watch(
+    () => [postcodeFormData.countryFk],
+    async (newCountryFk, oldValueFk) => {
+        if (Array.isArray(newCountryFk)) {
+            newCountryFk = newCountryFk[0];
+        }
+        if (Array.isArray(oldValueFk)) {
+            oldValueFk = oldValueFk[0];
+        }
+        if (!!oldValueFk && newCountryFk !== oldValueFk) {
+            postcodeFormData.provinceFk = null;
+            postcodeFormData.townFk = null;
+        }
+        if (oldValueFk !== newCountryFk) {
+            await provincesFetchDataRef.value.fetch({
+                where: {
+                    countryFk: newCountryFk,
+                },
+            });
+            await townsFetchDataRef.value.fetch({
+                where: {
+                    provinceFk: {
+                        inq: provincesOptions.value.map(({ id }) => id),
+                    },
+                },
+            });
+        }
+    }
+);
+
+watch(
+    () => postcodeFormData.provinceFk,
+    async (newProvinceFk) => {
+        if (Array.isArray(newProvinceFk)) {
+            newProvinceFk = newProvinceFk[0];
+        }
+        if (newProvinceFk !== postcodeFormData.provinceFk) {
+            await townsFetchDataRef.value.fetch({
+                where: { provinceFk: newProvinceFk },
+            });
+        }
+    }
+);
+async function handleProvinces(data) {
+    provincesOptions.value = data;
+}
+async function handleTowns(data) {
+    townsOptions.value = data;
+}
+async function handleCountries(data) {
+    countriesOptions.value = data;
+}
 </script>

 <template>
    <FetchData
        ref="provincesFetchDataRef"
-        @on-fetch="(data) => (provincesOptions = data)"
+        @on-fetch="handleProvinces"
+        :sort-by="['name ASC']"
+        :limit="30"
        auto-load
        url="Provinces/location"
    />
    <FetchData
-        @on-fetch="(data) => (countriesOptions = data)"
+        ref="townsFetchDataRef"
+        :sort-by="['name ASC']"
+        :limit="30"
+        @on-fetch="handleTowns"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData
+        @on-fetch="handleCountries"
+        :sort-by="['name ASC']"
+        :limit="30"
        auto-load
        url="Countries"
    />
@ -96,18 +169,20 @@ async function setProvince(id, data) {
                    :label="t('Postcode')"
                    v-model="data.code"
                    :rules="validate('postcode.code')"
+                    clearable
                />
                <VnSelectDialog
                    :label="t('City')"
-                    url="Towns/location"
                    @update:model-value="(value) => setTown(value, data)"
+                    :tooltip="t('Create city')"
                    v-model="data.townFk"
+                    :options="townsOptions"
                    option-label="name"
                    option-value="id"
                    :rules="validate('postcode.city')"
                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                    :emit-value="false"
-                    clearable
+                    :clearable="true"
                >
                    <template #option="{ itemProps, opt }">
                        <QItem v-bind="itemProps">
@ -122,6 +197,9 @@ async function setProvince(id, data) {
                    </template>
                    <template #form>
                        <CreateNewCityForm
+                            :country-fk="data.countryFk"
+                            :province-selected="data.provinceFk"
+                            :provinces="provincesOptions"
                            @on-data-saved="
                                (_, requestResponse) =>
                                    onCityCreated(requestResponse, data)
@ -132,8 +210,13 @@ async function setProvince(id, data) {
            </VnRow>
            <VnRow>
                <VnSelectProvince
+                    :country-fk="data.countryFk"
+                    :province-selected="data.provinceFk"
                    @update:model-value="(value) => setProvince(value, data)"
                    v-model="data.provinceFk"
+                    :clearable="true"
+                    :provinces="provincesOptions"
+                    @on-province-created="onProvinceCreated"
                />
                <VnSelect
                    :label="t('Country')"
@ -152,6 +235,7 @@ async function setProvince(id, data) {
 <i18n>
 es:
    New postcode: Nuevo código postal
+    Create city: Crear población
    Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
    City: Población
    Province: Provincia
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@ -16,7 +16,16 @@ const provinceFormData = reactive({
    name: null,
    autonomyFk: null,
 });
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const autonomiesOptions = ref([]);

 const onDataSaved = (dataSaved, requestResponse) => {
@ -31,7 +40,14 @@ const onDataSaved = (dataSaved, requestResponse) => {
    <FetchData
        @on-fetch="(data) => (autonomiesOptions = data)"
        auto-load
+        :filter="{
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
        url="Autonomies/location"
+        :sort-by="['name ASC']"
+        :limit="30"
    />
    <FormModelPopup
        :title="t('New province')"
--- a/src/components/CreateThermographForm.vue
+++ b/src/components/CreateThermographForm.vue
@ -50,7 +50,7 @@ const onDataSaved = (dataSaved) => {
        model="thermograph"
        :title="t('New thermograph')"
        :form-initial-data="thermographFormData"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="(_, response) => onDataSaved(response)"
    >
        <template #form-inputs="{ data, validate }">
            <VnRow>
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@ -44,7 +44,6 @@ const itemComputed = computed(() => {
        </QItemSection>
    </QItem>
 </template>
-
 <style lang="scss" scoped>
 .q-item {
    min-height: 5vh;
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@ -3,6 +3,7 @@ import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 import { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
 import UserPanel from 'components/UserPanel.vue';
@ -12,6 +13,7 @@ import VnAvatar from './ui/VnAvatar.vue';
 const { t } = useI18n();
 const stateStore = useStateStore();
 const quasar = useQuasar();
+const stateQuery = useStateQueryStore();
 const state = useState();
 const user = state.getUser();
 const appName = 'Lilium';
@ -50,6 +52,14 @@ const pinnedModulesRef = ref();
                </QBtn>
            </RouterLink>
            <VnBreadcrumbs v-if="$q.screen.gt.sm" />
+            <QSpinner
+                color="primary"
+                class="q-ml-md"
+                :class="{
+                    'no-visible': !stateQuery.isLoading().value,
+                }"
+                size="xs"
+            />
            <QSpace />
            <div id="searchbar" class="searchbar"></div>
            <QSpace />
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@ -24,9 +24,9 @@ const { notify } = useNotify();

 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
    id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);

@ -138,7 +138,7 @@ const refund = async () => {
                    <div>
                        <QCheckbox
                            :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                        />
                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                            <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@ -13,12 +13,14 @@ import FetchData from 'components/FetchData.vue';
 import { useClipboard } from 'src/composables/useClipboard';
 import { useRole } from 'src/composables/useRole';
 import VnAvatar from './ui/VnAvatar.vue';
+import useNotify from 'src/composables/useNotify';

 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
 const { copyText } = useClipboard();
+const { notify } = useNotify();

 const userLocale = computed({
    get() {
@ -53,6 +55,7 @@ const user = state.getUser();
 const warehousesData = ref();
 const companiesData = ref();
 const accountBankData = ref();
+const isEmployee = computed(() => useRole().isEmployee());

 onMounted(async () => {
    updatePreferences();
@ -70,18 +73,28 @@ function updatePreferences() {

 async function saveDarkMode(value) {
    const query = `/UserConfigs/${user.value.id}`;
+    try {
        await axios.patch(query, {
            darkMode: value,
        });
        user.value.darkMode = value;
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
 }

 async function saveLanguage(value) {
    const query = `/VnUsers/${user.value.id}`;
+    try {
        await axios.patch(query, {
            lang: value,
        });
        user.value.lang = value;
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
 }

 function logout() {
@ -97,11 +110,23 @@ function localUserData() {
    state.setUser(user.value);
 }

-function saveUserData(param, value) {
-    axios.post('UserConfigs/setUserConfig', { [param]: value });
+async function saveUserData(param, value) {
+    try {
+        await axios.post('UserConfigs/setUserConfig', { [param]: value });
        localUserData();
+        onDataSaved();
+    } catch (error) {
+        onDataError();
    }
-const isEmployee = computed(() => useRole().isEmployee());
+}
+
+const onDataSaved = () => {
+    notify('globals.dataSaved', 'positive');
+};
+
+const onDataError = () => {
+    notify('errors.updateUserConfig', 'negative');
+};
 </script>

 <template>
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch } from 'vue';
+import { ref } from 'vue';
 import { useValidator } from 'src/composables/useValidator';
 import { useI18n } from 'vue-i18n';

@ -8,33 +8,55 @@ import FetchData from 'components/FetchData.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';

 const emit = defineEmits(['onProvinceCreated']);
-const provinceFk = defineModel({ type: Number });
-watch(provinceFk, async () => await provincesFetchDataRef.value.fetch());
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
+const provinceFk = defineModel({ type: Number, default: null });

 const { validate } = useValidator();
 const { t } = useI18n();

-const provincesOptions = ref();
+const provincesOptions = ref($props.provinces);
+provinceFk.value = $props.provinceSelected;
 const provincesFetchDataRef = ref();

 async function onProvinceCreated(_, data) {
-    await provincesFetchDataRef.value.fetch();
+    await provincesFetchDataRef.value.fetch({ where: { countryFk: $props.countryFk } });
    provinceFk.value = data.id;
    emit('onProvinceCreated', data);
 }
+async function handleProvinces(data) {
+    provincesOptions.value = data;
+}
 </script>

 <template>
    <FetchData
        ref="provincesFetchDataRef"
-        :filter="{ include: { relation: 'country' } }"
-        @on-fetch="(data) => (provincesOptions = data)"
-        auto-load
+        :filter="{
+            include: { relation: 'country' },
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
+        @on-fetch="handleProvinces"
        url="Provinces"
    />
    <VnSelectDialog
        :label="t('Province')"
-        :options="provincesOptions"
+        :options="$props.provinces"
+        :tooltip="t('Create province')"
        hide-selected
        v-model="provinceFk"
        :rules="validate && validate('postcode.provinceFk')"
@ -49,11 +71,15 @@ async function onProvinceCreated(_, data) {
            </QItem>
        </template>
        <template #form>
-            <CreateNewProvinceForm @on-data-saved="onProvinceCreated" />
+            <CreateNewProvinceForm
+                :country-fk="$props.countryFk"
+                @on-data-saved="onProvinceCreated"
+            />
        </template>
    </VnSelectDialog>
 </template>
 <i18n>
    es:
        Province: Provincia
+        Create province: Crear provincia
 </i18n>
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@ -10,8 +10,6 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';

-defineExpose({ addFilter });
-
 const $props = defineProps({
    column: {
        type: Object,
@ -30,6 +28,9 @@ const $props = defineProps({
        default: 'params',
    },
 });
+
+defineExpose({ addFilter, props: $props });
+
 const model = defineModel(undefined, { required: true });
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
 const columnFilter = computed(() => $props.column?.columnFilter);
@ -115,11 +116,11 @@ const components = {
    rawSelect: selectComponent,
 };

-async function addFilter(value) {
+async function addFilter(value, name) {
    value ??= undefined;
    if (value && typeof value === 'object') value = model.value;
    value = value === '' ? undefined : value;
-    let field = columnFilter.value?.name ?? $props.column.name;
+    let field = columnFilter.value?.name ?? $props.column.name ?? name;

    if (columnFilter.value?.inWhere) {
        if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -10,7 +10,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';

 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
-import VnTableFilter from 'components/VnTable/VnFilter.vue';
+import VnFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
@ -73,7 +73,6 @@ const $props = defineProps({
        type: Boolean,
        default: false,
    },
-
    hasSubToolbar: {
        type: Boolean,
        default: null,
@ -102,6 +101,10 @@ const $props = defineProps({
        type: String,
        default: '90vh',
    },
+    chipLocale: {
+        type: String,
+        default: null,
+    },
    footer: {
        type: Boolean,
        default: false,
@ -130,6 +133,8 @@ const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
+const tableFilterRef = ref([]);
+const tableRef = ref();

 const tableModes = [
    {
@ -232,7 +237,7 @@ function splitColumns(columns) {
        if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
        if ($props.isEditable && col.disable == null) col.disable = false;
        if ($props.useModel && col.columnFilter != false)
-            col.columnFilter = { ...col.columnFilter, inWhere: true };
+            col.columnFilter = { inWhere: true, ...col.columnFilter };
        splittedColumns.value.columns.push(col);
    }
    // Status column
@ -311,12 +316,20 @@ defineExpose({
    selected,
    CrudModelRef,
    params,
+    tableRef,
 });

 function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved(this);
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
    else $props.create.onDataSaved(_);
 }
+
+function handleScroll() {
+    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
+    const { scrollHeight, scrollTop, clientHeight } = tMiddle;
+    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
+    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
+}
 </script>
 <template>
    <QDrawer
@ -334,6 +347,13 @@ function handleOnDataSaved(_) {
                :search-url="searchUrl"
                :redirect="!!redirect"
                @set-user-params="setUserParams"
+                :disable-submit-event="true"
+                @remove="
+                    (key) =>
+                        tableFilterRef
+                            .find((f) => f.props?.column.name == key)
+                            ?.addFilter()
+                "
            >
                <template #body>
                    <div
@ -343,7 +363,8 @@ function handleOnDataSaved(_) {
                        )"
                        :key="col.id"
                    >
-                        <VnTableFilter
+                        <VnFilter
+                            ref="tableFilterRef"
                            :column="col"
                            :data-key="$attrs['data-key']"
                            v-model="params[columnName(col)]"
@ -367,10 +388,15 @@ function handleOnDataSaved(_) {
                        :columns="splittedColumns.columns"
                    />
                </template>
+                <template #tags="{ tag, formatFn }" v-if="chipLocale">
+                    <div class="q-gutter-x-xs">
+                        <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
+                        <span>{{ formatFn(tag.value) }}</span>
+                    </div>
+                </template>
            </VnFilterPanel>
        </QScrollArea>
    </QDrawer>
-    <!-- class in div to fix warn-->
    <CrudModel
        v-bind="$attrs"
        :class="$attrs['class'] ?? 'q-px-md'"
@ -388,8 +414,10 @@ function handleOnDataSaved(_) {
        </template>
        <template #body="{ rows }">
            <QTable
+                ref="tableRef"
                v-bind="table"
                class="vnTable"
+                :class="{ 'last-row-sticky': $props.footer }"
                :columns="splittedColumns.columns"
                :rows="rows"
                v-model:selected="selected"
@ -399,12 +427,7 @@ function handleOnDataSaved(_) {
                flat
                :style="isTableMode && `max-height: ${tableHeight}`"
                :virtual-scroll="isTableMode"
-                @virtual-scroll="
-                    (event) =>
-                        event.index > rows.length - 2 &&
-                        ($props.crudModel?.paginate ?? true) &&
-                        CrudModelRef.vnPaginateRef.paginate()
-                "
+                @virtual-scroll="handleScroll"
                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                @update:selected="emit('update:selected', $event)"
            >
@ -450,7 +473,7 @@ function handleOnDataSaved(_) {
                                    :search-url="searchUrl"
                                />
                            </div>
-                            <VnTableFilter
+                            <VnFilter
                                v-if="$props.columnSearch"
                                :column="col"
                                :show-title="true"
@ -480,6 +503,7 @@ function handleOnDataSaved(_) {
                        auto-width
                        class="no-margin q-px-xs"
                        :class="[getColAlign(col), col.columnClass]"
+                        :style="col.style"
                        v-if="col.visible ?? true"
                        @click.ctrl="
                            ($event) =>
@ -508,6 +532,7 @@ function handleOnDataSaved(_) {
                        :class="getColAlign(col)"
                        class="sticky no-padding"
                        @click="stopEventPropagation($event)"
+                        :style="col.style"
                    >
                        <QBtn
                            v-for="(btn, index) of col.actions"
@ -667,17 +692,15 @@ function handleOnDataSaved(_) {
                        </QCard>
                    </component>
                </template>
-                <template #bottom-row="{ cols }" v-if="footer">
-                    <QTr v-if="rows.length" class="bg-header" style="height: 30px">
+                <template #bottom-row="{ cols }" v-if="$props.footer">
+                    <QTr v-if="rows.length" style="height: 30px">
                        <QTh
                            v-for="col of cols.filter((cols) => cols.visible ?? true)"
                            :key="col?.id"
                            class="text-center"
-                        >
-                            <slot
-                                :name="`column-footer-${col.name}`"
                            :class="getColAlign(col)"
-                            />
+                        >
+                            <slot :name="`column-footer-${col.name}`" />
                        </QTh>
                    </QTr>
                </template>
@ -695,7 +718,7 @@ function handleOnDataSaved(_) {
            icon="add"
            shortcut="+"
        />
-        <QTooltip>
+        <QTooltip self="top right">
            {{ createForm?.title }}
        </QTooltip>
    </QPageSticky>
@ -756,16 +779,6 @@ es:
    color: var(--vn-text-color);
 }

-.q-table--dark .q-table__bottom,
-.q-table--dark thead,
-.q-table--dark tr {
-    border-color: var(--vn-section-color);
-}
-
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
    display: grid;
    grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
@ -804,6 +817,7 @@ es:
        top: 0;
    }
 }
+
 .vnTable {
    thead tr th {
        position: sticky;
@ -839,6 +853,18 @@ es:
        background-color: var(--vn-section-color);
        z-index: 1;
    }
+    table tbody th {
+        position: relative;
+    }
+}
+
+.last-row-sticky {
+    tbody:nth-last-child(1) {
+        @extend .bg-header;
+        position: sticky;
+        z-index: 2;
+        bottom: 0;
+    }
 }

 .vn-label-value {
@ -885,12 +911,11 @@ es:
    user-select: all;
 }

-.full-width-slot {
-    width: 100%;
-    display: flex;
-    text-align: center;
-    color: var(--vn-text-color);
-    margin-bottom: -1%;
-    background-color: var(--vn-header-color);
+.q-table__container {
+    background-color: transparent;
+}
+
+.q-table__middle.q-virtual-scroll.q-virtual-scroll--vertical.scroll {
+    background-color: var(--vn-section-color);
 }
 </style>
--- a/src/components/common/VnBtnSelect.vue
+++ b/src/components/common/VnBtnSelect.vue
@ -0,0 +1,19 @@
+<script setup>
+import VnSelect from './VnSelect.vue';
+
+defineProps({
+    selectProps: { type: Object, required: true },
+    promise: { type: Function, default: () => {} },
+});
+</script>
+<template>
+    <QBtnDropdown v-bind="$attrs" color="primary">
+        <VnSelect
+            v-bind="selectProps"
+            hide-selected
+            hide-dropdown-icon
+            focus-on-mount
+            @update:model-value="promise"
+        />
+    </QBtnDropdown>
+</template>
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@ -0,0 +1,136 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnRow from '../ui/VnRow.vue';
+import VnInput from './VnInput.vue';
+import FetchData from '../FetchData.vue';
+import useNotify from 'src/composables/useNotify';
+
+const props = defineProps({
+    submitFn: { type: Function, default: () => {} },
+    askOldPass: { type: Boolean, default: false },
+});
+const emit = defineEmits(['onSubmit']);
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const form = ref();
+const changePassDialog = ref();
+const passwords = ref({ newPassword: null, repeatPassword: null });
+const requirements = ref([]);
+const isLoading = ref(false);
+
+const validate = async () => {
+    const { newPassword, repeatPassword, oldPassword } = passwords.value;
+
+    if (!newPassword) {
+        notify(t('You must enter a new password'), 'negative');
+        return;
+    }
+    if (newPassword !== repeatPassword) {
+        notify(t("Passwords don't match"), 'negative');
+        return;
+    }
+
+    try {
+        isLoading.value = true;
+        await props.submitFn(newPassword, oldPassword);
+        emit('onSubmit');
+    } catch (e) {
+        notify('errors.writeRequest', 'negative');
+    } finally {
+        changePassDialog.value.hide();
+        isLoading.value = false;
+    }
+};
+
+defineExpose({ show: () => changePassDialog.value.show() });
+</script>
+<template>
+    <FetchData
+        url="UserPasswords/findOne"
+        auto-load
+        @on-fetch="(data) => (requirements = data)"
+    />
+    <QDialog ref="changePassDialog">
+        <QCard style="width: 350px">
+            <QCardSection>
+                <slot name="header">
+                    <VnRow class="items-center" style="flex-direction: row">
+                        <span class="text-h6" v-text="t('globals.changePass')" />
+                        <QIcon
+                            class="cursor-pointer"
+                            name="close"
+                            size="xs"
+                            style="flex: 0"
+                            v-close-popup
+                        />
+                    </VnRow>
+                </slot>
+            </QCardSection>
+            <QForm ref="form">
+                <QCardSection>
+                    <VnInput
+                        v-if="props.askOldPass"
+                        :label="t('Old password')"
+                        v-model="passwords.oldPassword"
+                        type="password"
+                        :required="true"
+                        autofocus
+                    />
+                    <VnInput
+                        :label="t('New password')"
+                        v-model="passwords.newPassword"
+                        type="password"
+                        :required="true"
+                        :info="
+                            t('passwordRequirements', {
+                                length: requirements.length,
+                                nAlpha: requirements.nAlpha,
+                                nUpper: requirements.nUpper,
+                                nDigits: requirements.nDigits,
+                                nPunct: requirements.nPunct,
+                            })
+                        "
+                        autofocus
+                    />
+
+                    <VnInput
+                        :label="t('Repeat password')"
+                        v-model="passwords.repeatPassword"
+                        type="password"
+                    />
+                </QCardSection>
+            </QForm>
+            <QCardActions>
+                <slot name="actions">
+                    <QBtn
+                        :disabled="isLoading"
+                        :loading="isLoading"
+                        :label="t('globals.cancel')"
+                        class="q-ml-sm"
+                        color="primary"
+                        flat
+                        type="reset"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :disabled="isLoading"
+                        :loading="isLoading"
+                        :label="t('globals.confirm')"
+                        color="primary"
+                        @click="validate"
+                    />
+                </slot>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+</template>
+
+<i18n>
+es:
+    New password: Nueva contraseña
+    Repeat password: Repetir contraseña
+    You must enter a new password: Debes introducir la nueva contraseña
+    Passwords don't match: Las contraseñas no coinciden
+</i18n>
--- a/src/components/common/VnDate.vue
+++ b/src/components/common/VnDate.vue
@ -0,0 +1,29 @@
+<script setup>
+const model = defineModel({ type: [String, Number], required: true });
+</script>
+<template>
+    <QDate v-model="model" :today-btn="true" :options="$attrs.options" />
+</template>
+<style lang="scss" scoped>
+.q-date {
+    width: 245px;
+    min-width: unset;
+
+    :deep(.q-date__calendar) {
+        padding-bottom: 0;
+    }
+    :deep(.q-date__view) {
+        min-height: 245px;
+        padding: 8px;
+    }
+    :deep(.q-date__calendar-days-container) {
+        min-height: 160px;
+        height: unset;
+    }
+
+    :deep(.q-date__header) {
+        padding: 2px 2px 5px 12px;
+        height: 60px;
+    }
+}
+</style>
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@ -3,6 +3,7 @@ import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useAttrs } from 'vue';
+import VnDate from './VnDate.vue';

 const model = defineModel({ type: [String, Date] });
 const $props = defineProps({
@ -87,6 +88,11 @@ const styleAttrs = computed(() => {
          }
        : {};
 });
+
+const manageDate = (date) => {
+    formattedDate.value = date;
+    isPopupOpen.value = false;
+};
 </script>

 <template>
@ -129,6 +135,7 @@ const styleAttrs = computed(() => {
                />
            </template>
            <QMenu
+                v-if="$q.screen.gt.xs"
                transition-show="scale"
                transition-hide="scale"
                v-model="isPopupOpen"
@ -137,19 +144,11 @@ const styleAttrs = computed(() => {
                :no-focus="true"
                :no-parent-event="true"
            >
-                <QDate
-                    v-model="popupDate"
-                    :landscape="true"
-                    :today-btn="true"
-                    :options="$attrs.options"
-                    @update:model-value="
-                        (date) => {
-                            formattedDate = date;
-                            isPopupOpen = false;
-                        }
-                    "
-                />
+                <VnDate v-model="popupDate" @update:model-value="manageDate" />
            </QMenu>
+            <QDialog v-else v-model="isPopupOpen">
+                <VnDate v-model="popupDate" @update:model-value="manageDate" />
+            </QDialog>
        </QInput>
    </div>
 </template>
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@ -3,6 +3,8 @@ import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
+import VnTime from './VnTime.vue';
+
 const { validations } = useValidator();
 const $attrs = useAttrs();
 const model = defineModel({ type: String });
@ -107,6 +109,7 @@ function dateToTime(newDate) {
                />
            </template>
            <QMenu
+                v-if="$q.screen.gt.xs"
                transition-show="scale"
                transition-hide="scale"
                v-model="isPopupOpen"
@ -115,8 +118,11 @@ function dateToTime(newDate) {
                :no-focus="true"
                :no-parent-event="true"
            >
-                <QTime v-model="formattedTime" mask="HH:mm" landscape now-btn />
+                <VnTime v-model="formattedTime" />
            </QMenu>
+            <QDialog v-else v-model="isPopupOpen">
+                <VnTime v-model="formattedTime" />
+            </QDialog>
        </QInput>
    </div>
 </template>
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@ -12,14 +12,46 @@ const props = defineProps({
        default: null,
    },
 });
-const modelValue = ref(
-    props.location
-        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
-        : null
-);
-function showLabel(data) {
-    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
+
+const locationProperties = [
+    'postcode',
+    (obj) =>
+        obj.city
+            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
+            : null,
+    (obj) => obj.country?.name,
+];
+
+const formatLocation = (obj, properties) => {
+    const parts = properties.map((prop) => {
+        if (typeof prop === 'string') {
+            return obj[prop];
+        } else if (typeof prop === 'function') {
+            return prop(obj);
        }
+        return null;
+    });
+
+    const filteredParts = parts.filter(
+        (part) => part !== null && part !== undefined && part !== ''
+    );
+
+    return filteredParts.join(', ');
+};
+
+const modelValue = ref(
+    props.location ? formatLocation(props.location, locationProperties) : null
+);
+
+function showLabel(data) {
+    const dataProperties = [
+        'code',
+        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
+        'country',
+    ];
+    return formatLocation(data, dataProperties);
+}
+
 const handleModelValue = (data) => {
    emit('update:model-value', data);
 };
@ -41,6 +73,7 @@ const handleModelValue = (data) => {
        v-bind="$attrs"
        clearable
        :emit-value="false"
+        :tooltip="t('Create new location')"
    >
        <template #form>
            <CreateNewPostcode
@ -73,7 +106,9 @@ const handleModelValue = (data) => {
 <i18n>
 en:
    search_by_postalcode: Search by postalcode, town, province or country
+    Create new location: Create new location
 es:
    Location: Ubicación
+    Create new location: Crear nueva ubicación
    search_by_postalcode: Buscar por código postal, ciudad o país
 </i18n>
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@ -406,6 +406,7 @@ watch(
        :skeleton="false"
        auto-load
        @on-fetch="setLogTree"
+        search-url="logs"
    >
        <template #body>
            <div
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@ -141,6 +141,7 @@ function findKeyInOptions() {
 function setOptions(data) {
    myOptions.value = JSON.parse(JSON.stringify(data));
    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+    emit('update:options', data);
 }

 function filter(val, options) {
@ -227,6 +228,8 @@ function nullishToTrue(value) {
 }

 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+
+defineExpose({ opts: myOptions });
 </script>

 <template>
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';

--- a/src/components/common/VnTime.vue
+++ b/src/components/common/VnTime.vue
@ -0,0 +1,16 @@
+<script setup>
+const model = defineModel({ type: [String, Number], required: true });
+</script>
+<template>
+    <QTime v-model="model" now-btn mask="HH:mm" />
+</template>
+<style lang="scss" scoped>
+.q-time {
+    width: 230px;
+    min-width: unset;
+    :deep(.q-time__header) {
+        min-height: unset;
+        height: 50px;
+    }
+}
+</style>
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@ -31,7 +31,7 @@ const dialog = ref(null);
    <div class="container order-catalog-item overflow-hidden">
        <QCard class="card shadow-6">
            <div class="img-wrapper">
-                <VnImg :id="item.id" class="image" />
+                <VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
                <div v-if="item.hex && isCatalog" class="item-color-container">
                    <div
                        class="item-color"
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@ -3,7 +3,6 @@ import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
-import { date } from 'quasar';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';

@ -59,7 +58,6 @@ const $props = defineProps({
 });

 defineExpose({ search, sanitizer });
-
 const emit = defineEmits([
    'update:modelValue',
    'refresh',
@ -187,7 +185,6 @@ async function remove(key) {
 }

 function formatValue(value) {
-    if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY');
    if (typeof value === 'boolean') return value ? t('Yes') : t('No');
    if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);

@ -214,7 +211,7 @@ function sanitizer(params) {
        icon="search"
        @click="search()"
    ></QBtn>
-    <QForm @submit="search" id="filterPanelForm">
+    <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
        <QList dense>
            <QItem class="q-mt-xs">
                <QItemSection top>
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@ -58,7 +58,7 @@ defineExpose({
        :class="{ zoomIn: zoom }"
        :src="getUrl()"
        v-bind="$attrs"
-        @click.stop="show = $props.zoom ? true : false"
+        @click.stop="show = $props.zoom"
        spinner-color="primary"
    />
    <QDialog v-if="$props.zoom" v-model="show">
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref } from 'vue';
+import { ref, reactive } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@ -12,36 +12,40 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnAvatar from 'components/ui/VnAvatar.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInput from 'components/common/VnInput.vue';

 const $props = defineProps({
    url: { type: String, default: null },
    filter: { type: Object, default: () => {} },
    body: { type: Object, default: () => {} },
    addNote: { type: Boolean, default: false },
+    selectType: { type: Boolean, default: false },
 });

 const { t } = useI18n();
 const state = useState();
 const quasar = useQuasar();
 const currentUser = ref(state.getUser());
-const newNote = ref('');
+const newNote = reactive({ text: null, observationTypeFk: null });
+const observationTypes = ref([]);
 const vnPaginateRef = ref();
-function handleKeyUp(event) {
-    if (event.key === 'Enter') {
-        event.preventDefault();
-        if (!event.shiftKey) insert();
-    }
-}
+
 async function insert() {
+    if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
+
    const body = $props.body;
-    const newBody = { ...body, ...{ text: newNote.value } };
+    const newBody = {
+        ...body,
+        ...{ text: newNote.text, observationTypeFk: newNote.observationTypeFk },
+    };
    await axios.post($props.url, newBody);
    await vnPaginateRef.value.fetch();
-    newNote.value = '';
 }
-
 onBeforeRouteLeave((to, from, next) => {
-    if (newNote.value)
+    if (newNote.text)
        quasar.dialog({
            component: VnConfirm,
            componentProps: {
@ -54,6 +58,13 @@ onBeforeRouteLeave((to, from, next) => {
 });
 </script>
 <template>
+    <FetchData
+        v-if="selectType"
+        url="ObservationTypes"
+        :filter="{ fields: ['id', 'description'] }"
+        auto-load
+        @on-fetch="(data) => (observationTypes = data)"
+    />
    <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
        <QCardSection horizontal>
            <VnAvatar :worker-id="currentUser.id" size="md" />
@ -62,18 +73,28 @@ onBeforeRouteLeave((to, from, next) => {
                {{ t('globals.now') }}
            </div>
        </QCardSection>
-        <QCardSection class="q-pa-xs q-my-none q-py-none" horizontal>
-            <QInput
-                v-model="newNote"
-                class="full-width"
+        <QCardSection class="q-px-xs q-my-none q-py-none">
+            <VnRow class="full-width">
+                <VnSelect
+                    :label="t('Observation type')"
+                    v-if="selectType"
+                    url="ObservationTypes"
+                    v-model="newNote.observationTypeFk"
+                    option-label="description"
+                    style="flex: 0.15"
+                    :required="true"
+                    @keyup.enter.stop="insert"
+                />
+                <VnInput
+                    v-model.trim="newNote.text"
                    type="textarea"
                    :label="t('Add note here...')"
                    filled
                    size="lg"
                    autogrow
-                autofocus
-                @keyup="handleKeyUp"
+                    @keyup.enter.stop="insert"
                    clearable
+                    :required="true"
                >
                    <template #append>
                        <QBtn
@ -82,9 +103,12 @@ onBeforeRouteLeave((to, from, next) => {
                            color="primary"
                            flat
                            @click="insert"
+                            class="q-mb-xs"
+                            dense
                        />
                    </template>
-            </QInput>
+                </VnInput>
+            </VnRow>
        </QCardSection>
    </QCard>
    <VnPaginate
@ -98,6 +122,10 @@ onBeforeRouteLeave((to, from, next) => {
        class="show"
        v-bind="$attrs"
        search-url="notes"
+        @on-fetch="
+            newNote.text = '';
+            newNote.observationTypeFk = null;
+        "
    >
        <template #body="{ rows }">
            <TransitionGroup name="list" tag="div" class="column items-center full-width">
@ -111,13 +139,28 @@ onBeforeRouteLeave((to, from, next) => {
                            :descriptor="false"
                            :worker-id="note.workerFk"
                            size="md"
+                            :title="note.worker?.user.nickname"
                        />
                        <div class="full-width row justify-between q-pa-xs">
+                            <div>
                                <VnUserLink
                                    :name="`${note.worker.user.nickname}`"
                                    :worker-id="note.worker.id"
                                />
-                            {{ toDateHourMin(note.created) }}
+                                <QBadge
+                                    class="q-ml-xs"
+                                    outline
+                                    color="grey"
+                                    v-if="selectType && note.observationTypeFk"
+                                >
+                                    {{
+                                        observationTypes.find(
+                                            (ot) => ot.id === note.observationTypeFk
+                                        )?.description
+                                    }}
+                                </QBadge>
+                            </div>
+                            <span v-text="toDateHourMin(note.created)" />
                        </div>
                    </QCardSection>
                    <QCardSection class="q-pa-xs q-my-none q-py-none">
@ -131,12 +174,6 @@ onBeforeRouteLeave((to, from, next) => {
 <style lang="scss" scoped>
 .q-card {
    width: 90%;
-    @media (max-width: $breakpoint-sm) {
-        width: 100%;
-    }
-    &__section {
-        word-wrap: break-word;
-    }
 }
 .q-dialog .q-card {
    width: 400px;
@ -150,11 +187,28 @@ onBeforeRouteLeave((to, from, next) => {
    opacity: 0;
    background-color: $primary;
 }
+
+.vn-row > :nth-child(2) {
+    margin-left: 0;
+}
+
+@media (max-width: $breakpoint-xs) {
+    .vn-row > :deep(*) {
+        margin-left: 0;
+    }
+    .q-card {
+        width: 100%;
+
+        &__section {
+            padding: 0;
+        }
+    }
+}
 </style>
 <i18n>
    es:
        Add note here...: Añadir nota aquí...
        New note: Nueva nota
        Save (Enter): Guardar (Intro)
-
+        Observation type: Tipo de observación
 </i18n>
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@ -56,7 +56,7 @@ const props = defineProps({
    },
    offset: {
        type: Number,
-        default: 0,
+        default: undefined,
    },
    skeleton: {
        type: Boolean,
@ -119,10 +119,9 @@ watch(
 );

 watch(
-    () => [props.url, props.filter, props.userParams],
-    ([url, filter, userParams]) => mounted.value && fetch({ url, filter, userParams })
+    () => [props.url, props.filter],
+    ([url, filter]) => mounted.value && fetch({ url, filter })
 );
-
 const addFilter = async (filter, params) => {
    await arrayData.addFilter({ filter, params });
 };
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@ -108,6 +108,7 @@ async function search() {
            ...Object.fromEntries(staticParams),
            search: searchText.value,
        },
+        ...{ filter: props.filter },
    };

    if (props.whereFilter) {
--- a/src/components/ui/VnToSummary.vue
+++ b/src/components/ui/VnToSummary.vue
@ -0,0 +1,33 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { defineProps } from 'vue';
+
+const props = defineProps({
+    routeName: {
+        type: String,
+        required: true,
+    },
+    entityId: {
+        type: [String, Number],
+        required: true,
+    },
+    url: {
+        type: String,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const id = props.entityId;
+</script>
+
+<template>
+    <router-link
+        v-if="route?.name !== routeName"
+        :to="{ name: routeName, params: { id: id } }"
+        class="header link"
+        :href="url"
+    >
+        <QIcon name="open_in_new" color="white" size="sm" />
+    </router-link>
+</template>
--- a/src/components/ui/VnUsesMana.vue
+++ b/src/components/ui/VnUsesMana.vue
@ -0,0 +1,55 @@
+<script setup>
+import { defineProps, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
+const props = defineProps({
+    usesMana: {
+        type: Boolean,
+        required: true,
+    },
+    manaCode: {
+        type: String,
+        required: true,
+    },
+    manaVal: {
+        type: String,
+        default: 'mana',
+    },
+    manaLabel: {
+        type: String,
+        default: 'Promotion mana',
+    },
+    manaClaimVal: {
+        type: String,
+        default: 'manaClaim',
+    },
+    claimLabel: {
+        type: String,
+        default: 'Claim mana',
+    },
+});
+
+const manaCode = ref(props.manaCode);
+</script>
+
+<template>
+    <div class="column q-gutter-y-sm q-mt-sm">
+        <QRadio
+            v-model="manaCode"
+            dense
+            :val="manaVal"
+            :label="t(manaLabel)"
+            :dark="true"
+            class="q-mb-sm"
+        />
+        <QRadio
+            v-model="manaCode"
+            dense
+            :val="manaClaimVal"
+            :label="t(claimLabel)"
+            :dark="true"
+            class="q-mb-sm"
+        />
+    </div>
+</template>
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@ -26,7 +26,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
            const params = JSON.parse(query[searchUrl]);
            const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
            delete params.filter;
-            store.userParams = { ...params, ...store.userParams };
+
+            store.userParams = { ...store.userParams, ...params };
            store.userFilter = { ...filter, ...store.userFilter };
            if (filter?.order) store.order = filter.order;
        }
@ -113,7 +114,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
            for (const row of response.data) store.data.push(row);
        } else {
            store.data = response.data;
-            if (!document.querySelectorAll('[role="dialog"]').length)
+            if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
                updateRouter && updateStateParams();
        }

--- a/src/css/app.scss
+++ b/src/css/app.scss
@ -288,3 +288,7 @@ input::-webkit-inner-spin-button {
        color: $info;
    }
 }
+
+.no-visible {
+    visibility: hidden;
+}
--- a/src/filters/toHour.js
+++ b/src/filters/toHour.js
@ -4,7 +4,7 @@ export default function toHour(date) {
    if (!isValidDate(date)) {
        return '--:--';
    }
-    return (new Date(date || '')).toLocaleTimeString([], {
+    return new Date(date || '').toLocaleTimeString([], {
        hour: '2-digit',
        minute: '2-digit',
    });
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -50,6 +50,7 @@ globals:
    summary:
        basicData: Basic data
    daysOnward: Days onward
+    daysAgo: Days ago
    today: Today
    yesterday: Yesterday
    dateFormat: en-GB
@ -104,6 +105,7 @@ globals:
    campaign: Campaign
    weight: Weight
    error: Ups! Something went wrong
+    recalc: Recalculate
    pageTitles:
        logIn: Login
        addressEdit: Update address
@ -111,7 +113,7 @@ globals:
        basicData: Basic data
        log: Logs
        parkingList: Parkings list
-        agencyList: Agencies list
+        agencyList: Agencies
        agency: Agency
        workCenters: Work centers
        modes: Modes
@ -135,7 +137,7 @@ globals:
        fiscalData: Fiscal data
        billingData: Billing data
        consignees: Consignees
-        'address-create': New address
+        address-create: New address
        notes: Notes
        credits: Credits
        greuges: Greuges
@ -207,7 +209,7 @@ globals:
        roadmap: Roadmap
        stops: Stops
        routes: Routes
-        cmrsList: CMRs list
+        cmrsList: CMRs
        RouteList: List
        routeCreate: New route
        RouteRoadmap: Roadmaps
@ -273,6 +275,9 @@ globals:
        clientsActionsMonitor: Clients and actions
        serial: Serial
        medical: Mutual
+        RouteExtendedList: Router
+        wasteRecalc: Waste recaclulate
+        operator: Operator
    supplier: Supplier
    created: Created
    worker: Worker
@ -288,7 +293,10 @@ globals:
    createInvoiceIn: Create invoice in
    myAccount: My account
    noOne: No one
+    maxTemperature: Max
+    minTemperature: Min
    params:
+        id: ID
        clientFk: Client id
        salesPersonFk: Sales person
        warehouseFk: Warehouse
@ -296,12 +304,21 @@ globals:
        from: From
        To: To
        stateFk: State
+        email: Email
+        SSN: SSN
+        fi: FI
+        myTeam: My team
+        departmentFk: Department
+    changePass: Change password
+    deleteConfirmTitle: Delete selected elements
+    changeState: Change state
 errors:
    statusUnauthorized: Access denied
    statusInternalServerError: An internal server error has ocurred
    statusBadGateway: It seems that the server has fall down
    statusGatewayTimeout: Could not contact the server
    userConfig: Error fetching user config
+    updateUserConfig: Error updating user config
    tokenConfig: Error fetching token config
    writeRequest: The requested operation could not be completed
 login:
@ -541,7 +558,6 @@ ticket:
        package: Package
        taxClass: Tax class
        services: Services
-        changeState: Change state
        requester: Requester
        atender: Atender
        request: Request
@ -729,6 +745,7 @@ worker:
        locker: Locker
        balance: Balance
        medical: Medical
+        operator: Operator
    list:
        name: Name
        email: Email
@ -801,14 +818,14 @@ worker:
        bankEntity: Swift / BIC
    formation:
        tableVisibleColumns:
-            course: Curso
-            startDate: Fecha Inicio
-            endDate: Fecha Fin
-            center: Centro Formación
-            invoice: Factura
-            amount: Importe
-            remark: Bonficado
-            hasDiploma: Diploma
+            course: Course
+            startDate: Start date
+            endDate: End date
+            center: Training center
+            invoice: Invoice
+            amount: Amount
+            remark: Remark
+            hasDiploma: Has diploma
    medical:
        tableVisibleColumns:
            date: Date
@ -826,6 +843,18 @@ worker:
            debit: Debt
            credit: Have
            concept: Concept
+    operator:
+        numberOfWagons: Number of wagons
+        train: Train
+        itemPackingType: Item packing type
+        warehouse: Warehouse
+        sector: Sector
+        labeler: Printer
+        linesLimit: Lines limit
+        volumeLimit: Volume limit
+        sizeLimit: Size limit
+        isOnReservationMode: Reservation mode
+        machine: Machine
 wagon:
    pageTitles:
        wagons: Wagons
@ -865,34 +894,7 @@ wagon:
        minHeightBetweenTrays: 'The minimum height between trays is '
        maxWagonHeight: 'The maximum height of the wagon is '
        uncompleteTrays: There are incomplete trays
-route:
-    pageTitles:
-        agency: Agency List
-        routes: Routes
-        cmrsList: CMRs list
-        RouteList: List
-        routeCreate: New route
-        basicData: Basic Data
-        summary: Summary
-        RouteRoadmap: Roadmaps
-        RouteRoadmapCreate: Create roadmap
-        tickets: Tickets
-        log: Log
-        autonomous: Autonomous
-    cmr:
-        list:
-            results: results
-            cmrFk: CMR id
-            hasCmrDms: Attached in gestdoc
-            'true': 'Yes'
-            'false': 'No'
-            ticketFk: Ticketd id
-            routeFk: Route id
-            country: Country
-            clientFk: Client id
-            shipped: Preparation date
-            viewCmr: View CMR
-            downloadCmrs: Download CMRs
+
 supplier:
    list:
        payMethod: Pay method
@ -1007,6 +1009,7 @@ travel:
            warehouseOut: Warehouse out
            totalEntries: Total entries
            totalEntriesTooltip: Total entries
+            daysOnward: Landed days onwards
    summary:
        confirmed: Confirmed
        entryId: Entry Id
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -49,6 +49,7 @@ globals:
    summary:
        basicData: Datos básicos
    daysOnward: Días adelante
+    daysAgo: Días atras
    today: Hoy
    yesterday: Ayer
    dateFormat: es-ES
@ -106,6 +107,7 @@ globals:
    campaign: Campaña
    weight: Peso
    error: ¡Ups! Algo salió mal
+    recalc: Recalcular
    pageTitles:
        logIn: Inicio de sesión
        addressEdit: Modificar consignatario
@ -113,7 +115,7 @@ globals:
        basicData: Datos básicos
        log: Historial
        parkingList: Listado de parkings
-        agencyList: Listado de agencias
+        agencyList: Agencias
        agency: Agencia
        workCenters: Centros de trabajo
        modes: Modos
@ -211,12 +213,13 @@ globals:
        roadmap: Troncales
        stops: Paradas
        routes: Rutas
-        cmrsList: Listado de CMRs
+        cmrsList: CMRs
        RouteList: Listado
        routeCreate: Nueva ruta
        RouteRoadmap: Troncales
        RouteRoadmapCreate: Crear troncal
        autonomous: Autónomos
+        RouteExtendedList: Enrutador
        suppliers: Proveedores
        supplier: Proveedor
        supplierCreate: Nuevo proveedor
@ -277,6 +280,8 @@ globals:
        clientsActionsMonitor: Clientes y acciones
        serial: Facturas por serie
        medical: Mutua
+        wasteRecalc: Recalcular mermas
+        operator: Operario
    supplier: Proveedor
    created: Fecha creación
    worker: Trabajador
@ -292,7 +297,10 @@ globals:
    createInvoiceIn: Crear factura recibida
    myAccount: Mi cuenta
    noOne: Nadie
+    maxTemperature: Máx
+    minTemperature: Mín
    params:
+        id: Id
        clientFk: Id cliente
        salesPersonFk: Comercial
        warehouseFk: Almacén
@ -300,12 +308,21 @@ globals:
        from: Desde
        To: Hasta
        stateFk: Estado
+        departmentFk: Departamento
+        email: Correo
+        SSN: NSS
+        fi: NIF
+        myTeam: Mi equipo
+    changePass: Cambiar contraseña
+    deleteConfirmTitle: Eliminar los elementos seleccionados
+    changeState: Cambiar estado
 errors:
    statusUnauthorized: Acceso denegado
    statusInternalServerError: Ha ocurrido un error interno del servidor
    statusBadGateway: Parece ser que el servidor ha caído
    statusGatewayTimeout: No se ha podido contactar con el servidor
    userConfig: Error al obtener configuración de usuario
+    updateUserConfig: Error al actualizar la configuración de usuario
    tokenConfig: Error al obtener configuración de token
    writeRequest: No se pudo completar la operación solicitada
 login:
@ -550,7 +567,6 @@ ticket:
        package: Embalaje
        taxClass: Tipo IVA
        services: Servicios
-        changeState: Cambiar estado
        requester: Solicitante
        atender: Comprador
        request: Petición de compra
@ -736,6 +752,7 @@ worker:
        balance: Balance
        formation: Formación
        medical: Mutua
+        operator: Operario
    list:
        name: Nombre
        email: Email
@ -824,6 +841,19 @@ worker:
            debit: Debe
            credit: Haber
            concept: Concepto
+    operator:
+        numberOfWagons: Número de vagones
+        train: tren
+        itemPackingType: Tipo de embalaje
+        warehouse: Almacén
+        sector: Sector
+        labeler: Impresora
+        linesLimit: Líneas límite
+        volumeLimit: Volumen límite
+        sizeLimit: Tamaño límite
+        isOnReservationMode: Modo de reserva
+        machine: Máquina
+
 wagon:
    pageTitles:
        wagons: Vagones
@ -863,21 +893,6 @@ wagon:
        minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
        maxWagonHeight: 'La altura máxima del vagón es '
        uncompleteTrays: Hay bandejas sin completar
-route:
-    cmr:
-        list:
-            results: resultados
-            cmrFk: Id CMR
-            hasCmrDms: Gestdoc
-            'true': Sí
-            'false': 'No'
-            ticketFk: Id ticket
-            routeFk: Id ruta
-            country: País
-            clientFk: Id cliente
-            shipped: Fecha preparación
-            viewCmr: Ver CMR
-            downloadCmrs: Descargar CMRs
 supplier:
    list:
        payMethod: Método de pago
@ -992,6 +1007,7 @@ travel:
            warehouseOut: Alm.entrada
            totalEntries: ∑
            totalEntriesTooltip: Entradas totales
+            daysOnward: Días de llegada en adelante
    summary:
        confirmed: Confirmado
        entryId: Id entrada
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -5,11 +5,14 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import AccountFilter from './AccountFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
-
+const filter = {
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};
 const columns = computed(() => [
    {
        align: 'left',
@ -18,27 +21,31 @@ const columns = computed(() => [
        isId: true,
        field: 'id',
        cardVisible: true,
-        columnFilter: {
-            component: 'select',
-            name: 'search',
-            attrs: {
-                url: 'VnUsers/preview',
-                fields: ['id', 'name'],
-            },
-        },
    },
    {
        align: 'left',
-        name: 'username',
+        name: 'roleFk',
+        label: t('role'),
+        columnFilter: {
+            component: 'select',
+            name: 'roleFk',
+            attrs: {
+                url: 'VnRoles',
+                optionValue: 'id',
+                optionLabel: 'name',
+            },
+        },
+        format: ({ role }, dashIfEmpty) => dashIfEmpty(role?.name),
+    },
+    {
+        align: 'left',
+        name: 'nickname',
        label: t('Nickname'),
        isTitle: true,
        component: 'input',
        columnField: {
            component: null,
        },
-        columnFilter: {
-            inWhere: true,
-        },
        cardVisible: true,
        create: true,
    },
@ -50,9 +57,6 @@ const columns = computed(() => [
        columnField: {
            component: null,
        },
-        columnFilter: {
-            inWhere: true,
-        },
        cardVisible: true,
        create: true,
    },
@ -104,17 +108,25 @@ const exprBuilder = (param, value) => {
        :expr-builder="exprBuilder"
        :label="t('account.search')"
        :info="t('account.searchInfo')"
+        :filter="filter"
    />
-
+    <RightMenu>
+        <template #right-panel>
+            <AccountFilter data-key="AccountUsers" />
+        </template>
+    </RightMenu>
    <VnTable
        ref="tableRef"
        data-key="AccountUsers"
        url="VnUsers/preview"
+        :filter="filter"
        order="id DESC"
        :columns="columns"
        default-mode="table"
        redirect="account"
        :use-model="true"
+        :right-search="false"
+        auto-load
    />
 </template>

--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@ -10,7 +10,7 @@ const { t } = useI18n();
    <VnCard
        data-key="Account"
        :descriptor="AccountDescriptor"
-        search-data-key="AccountUsers"
+        search-data-key="AccountList"
        :searchbar-props="{
            url: 'VnUsers/preview',
            label: t('account.search'),
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@ -4,9 +4,12 @@ import { computed, ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useRoute } from 'vue-router';
+import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import useNotify from 'src/composables/useNotify.js';
+
 const $props = defineProps({
    hasAccount: {
        type: Boolean,
@ -62,6 +65,19 @@ async function sync() {
 }
 </script>
 <template>
+    <VnChangePassword
+        ref="changePassRef"
+        :ask-old-pass="true"
+        :submit-fn="
+            async (newPassword, oldPassword) => {
+                await axios.patch(`Accounts/change-password`, {
+                    userId: entityId,
+                    newPassword,
+                    oldPassword,
+                });
+            }
+        "
+    />
    <VnConfirm
        v-model="showSyncDialog"
        :message="t('account.card.actions.sync.message')"
@ -92,6 +108,17 @@ async function sync() {
            />
        </template>
    </VnConfirm>
+    <QItem
+        v-if="
+            entityId == account.id &&
+            useAcl().hasAny([{ model: 'Account', props: '*', accessType: 'WRITE' }])
+        "
+        v-ripple
+        clickable
+        @click="$refs.changePassRef.show()"
+    >
+        <QItemSection>{{ t('globals.changePass') }}</QItemSection>
+    </QItem>
    <QItem
        v-if="account.hasAccount"
        v-ripple
@ -138,6 +165,5 @@ async function sync() {
    <QItem v-ripple clickable @click="showSyncDialog = true">
        <QItemSection>{{ t('account.card.actions.sync.name') }}</QItemSection>
    </QItem>
-
    <QSeparator />
 </template>
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@ -204,7 +204,7 @@ function claimUrl(section) {
                top
                color="black"
                text-color="white"
-                :label="t('ticket.summary.changeState')"
+                :label="t('globals.changeState')"
            >
                <QList>
                    <QVirtualScroll
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@ -18,6 +18,7 @@ const contactChannels = ref([]);
 const title = ref();
 const handleSalesModelValue = (val) => ({
    or: [
+        { id: val },
        { name: val },
        { nickname: { like: '%' + val + '%' } },
        { code: { like: `${val}%` } },
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@ -93,6 +93,7 @@ function handleLocation(data, location) {
            <VnRow>
                <VnLocation
                    :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                    :location="data"
                    @update:model-value="(location) => handleLocation(data, location)"
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@ -22,5 +22,6 @@ const noteFilter = computed(() => {
        :filter="noteFilter"
        :body="{ clientFk: route.params.id }"
        style="overflow-y: auto"
+        :select-type="true"
    />
 </template>
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@ -13,6 +13,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';

 const $props = defineProps({
    id: {
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@ -92,7 +92,7 @@ const onSubmit = async () => {
        notify('globals.dataSaved', 'positive');
        unpaidClient.value = true;
    } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
    } finally {
        isLoading.value = false;
    }
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@ -3,14 +3,11 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useQuasar } from 'quasar';
-
 import VnInput from 'src/components/common/VnInput.vue';
-import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';

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

@ -21,21 +18,11 @@ const filter = computed(() => {
    };
 });

-const showChangePasswordDialog = () => {
-    quasar.dialog({
-        component: CustomerChangePassword,
-        componentProps: {
-            id: route.params.id,
-        },
-    });
-};
-
 async function hasCustomerRole() {
    const { data } = await axios(`Clients/${route.params.id}/hasCustomerRole`);
    canChangePassword.value = data;
 }
 </script>
-
 <template>
    <FormModel
        url="VnUsers/preview"
@ -69,21 +56,29 @@ async function hasCustomerRole() {
        </template>
        <template #moreActions>
            <QBtn
-                :label="t('Change password')"
+                :label="t('globals.changePass')"
                color="primary"
                icon="edit"
                :disable="!canChangePassword"
-                @click="showChangePasswordDialog()"
+                @click="$refs.changePassRef.show"
            />
        </template>
    </FormModel>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Clients/${$route.params.id}/setPassword`, {
+                    newPassword: newPass,
+                });
+            }
+        "
+    />
 </template>
-
 <i18n>
 es:
    Enable web access: Habilitar acceso web
    User: Usuario
    Recovery email: Correo de recuperacion
    This email is used for user to regain access their account: Este correo electrónico se usa para que el usuario recupere el acceso a su cuenta
-    Change password: Cambiar contraseña
 </i18n>
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@ -429,10 +429,9 @@ function handleLocation(data, location) {
                :params="{
                    departmentCodes: ['VT', 'shopping'],
                }"
-                option-label="nickname"
-                option-value="id"
                :fields="['id', 'nickname']"
                sort-by="nickname ASC"
+                :use-like="false"
                emit-value
                auto-load
            >
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-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';
@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';

 const { t } = useI18n();
@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>

 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
    <VnSubToolbar>
        <template #st-data>
            <CustomerBalanceDueTotal :amount="balanceDueTotal" />
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@ -25,19 +25,31 @@ const { notify } = useNotify();
 const { t } = useI18n();

 const newObservation = ref(null);
+const obsId = ref(null);

 const onSubmit = async () => {
    try {
-        const data = $props.clients.map((item) => {
-            return { clientFk: item.clientFk, text: newObservation.value };
-        });
-        await axios.post('ClientObservations', data);
+        if (!obsId.value)
+            obsId.value = (
+                await axios.get('ObservationTypes/findOne', {
+                    params: { filter: { where: { description: 'Finance' } } },
+                })
+            ).data?.id;

-        const payload = {
+        const bodyObs = $props.clients.map((item) => {
+            return {
+                clientFk: item.clientFk,
+                text: newObservation.value,
+                observationTypeFk: obsId.value,
+            };
+        });
+        await axios.post('ClientObservations', bodyObs);
+
+        const bodyObsMail = {
            defaulters: $props.clients,
            observation: newObservation.value,
        };
-        await axios.post('Defaulters/observationEmail', payload);
+        await axios.post('Defaulters/observationEmail', bodyObsMail);

        await $props.promise();

--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@ -240,7 +240,6 @@ function handleLocation(data, location) {
                class="row q-gutter-md q-mb-md"
                v-for="(note, index) in notes"
            >
-                <div class="col">
                <VnSelect
                    :label="t('Observation type')"
                    :options="observationTypes"
@ -249,17 +248,14 @@ function handleLocation(data, location) {
                    option-value="id"
                    v-model="note.observationTypeFk"
                />
-                </div>
-                <div class="col">
                <VnInput
                    :label="t('Description')"
                    :rules="validate('route.description')"
                    clearable
                    v-model="note.description"
                />
-                </div>
-                <div class="flex items-center">
                <QIcon
+                    :style="{ flex: 0, 'align-self': $q.screen.gt.xs ? 'end' : 'center' }"
                    @click.stop="deleteNote(note.id, index)"
                    class="cursor-pointer"
                    color="primary"
@ -270,9 +266,7 @@ function handleLocation(data, location) {
                        {{ t('Remove note') }}
                    </QTooltip>
                </QIcon>
-                </div>
            </VnRow>
-
            <QBtn
                @click.stop="addNote()"
                class="cursor-pointer add-icon q-mt-md"
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ b/src/pages/Customer/components/CustomerChangePassword.vue
@ -1,138 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import axios from 'axios';
-import { useDialogPluginComponent } from 'quasar';
-
-import useNotify from 'src/composables/useNotify';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FetchData from 'src/components/FetchData.vue';
-
-const { dialogRef } = useDialogPluginComponent();
-const { notify } = useNotify();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: String,
-        required: true,
-    },
-    promise: {
-        type: Function,
-        required: true,
-    },
-});
-const userPasswords = ref({});
-
-const closeButton = ref(null);
-const isLoading = ref(false);
-const newPassword = ref('');
-const requestPassword = ref('');
-
-const onSubmit = async () => {
-    isLoading.value = true;
-
-    if (newPassword.value !== requestPassword.value) {
-        notify(t("Passwords don't match"), 'negative');
-        isLoading.value = false;
-        return;
-    }
-
-    const payload = {
-        newPassword: newPassword.value,
-    };
-    try {
-        await axios.patch(`Clients/${$props.id}/setPassword`, payload);
-    } catch (error) {
-        notify('errors.create', 'negative');
-    } finally {
-        isLoading.value = false;
-        if (closeButton.value) closeButton.value.click();
-    }
-};
-</script>
-
-<template>
-    <QDialog ref="dialogRef">
-        <FetchData
-            @on-fetch="(data) => (userPasswords = data[0])"
-            auto-load
-            url="UserPasswords"
-        />
-        <QCard class="q-pa-lg">
-            <QCardSection>
-                <QForm @submit.prevent="onSubmit">
-                    <span
-                        ref="closeButton"
-                        class="row justify-end close-icon"
-                        v-close-popup
-                    >
-                        <QIcon name="close" size="sm" />
-                    </span>
-
-                    <VnRow class="row q-gutter-md q-mb-md" style="flex-direction: column">
-                        <div class="col">
-                            <VnInput
-                                :label="t('New password')"
-                                clearable
-                                v-model="newPassword"
-                                type="password"
-                            >
-                                <template #append>
-                                    <QIcon name="info" class="cursor-info">
-                                        <QTooltip>
-                                            {{
-                                                t('customer.card.passwordRequirements', {
-                                                    ...userPasswords,
-                                                })
-                                            }}
-                                        </QTooltip>
-                                    </QIcon>
-                                </template>
-                            </VnInput>
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('Request password')"
-                                clearable
-                                v-model="requestPassword"
-                                type="password"
-                            />
-                        </div>
-                    </VnRow>
-
-                    <div class="q-mt-lg row justify-end">
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('globals.cancel')"
-                            :loading="isLoading"
-                            class="q-ml-sm"
-                            color="primary"
-                            flat
-                            type="reset"
-                            v-close-popup
-                        />
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('Change password')"
-                            :loading="isLoading"
-                            color="primary"
-                            type="submit"
-                        />
-                    </div>
-                </QForm>
-            </QCardSection>
-        </QCard>
-    </QDialog>
-</template>
-
-<i18n>
-es:
-    New password: Nueva contraseña
-    Request password: Repetir contraseña
-    Change password: Cambiar contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@ -138,7 +138,7 @@ const onSubmit = async () => {
        notify('globals.dataSaved', 'positive');
        onDataSaved(data);
    } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
    } finally {
        isLoading.value = false;
    }
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { date } from 'quasar';
 import { toDateFormat } from 'src/filters/date.js';

-import { toCurrency } from 'src/filters';
+import { dashIfEmpty, toCurrency } from 'src/filters';

 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
@ -32,6 +32,16 @@ const filter = {
        },
        { relation: 'invoiceOut', scope: { fields: ['id'] } },
        { relation: 'agencyMode', scope: { fields: ['name'] } },
+        {
+            relation: 'ticketSales',
+            scope: {
+                fields: ['id', 'concept', 'itemFk'],
+                include: { relation: 'item' },
+                scope: {
+                    fields: ['id', 'name', 'itemPackingTypeFk'],
+                },
+            },
+        },
    ],
    where: { clientFk: route.params.id },
    order: ['shipped DESC', 'id'],
@ -87,7 +97,12 @@ const columns = computed(() => [
        label: t('Total'),
        name: 'total',
    },
-
+    {
+        align: 'left',
+        name: 'itemPackingTypeFk',
+        label: t('ticketSale.packaging'),
+        format: (row) => getItemPackagingType(row),
+    },
    {
        align: 'right',
        label: '',
@ -135,6 +150,15 @@ const setShippedColor = (date) => {
    if (difference == 0) return 'warning';
    if (difference < 0) return 'success';
 };
+
+const getItemPackagingType = (row) => {
+    const packagingType = row?.ticketSales
+        .map((sale) => sale.item?.itemPackingTypeFk || '-')
+        .filter((value) => value !== '-')
+        .join(', ');
+
+    return dashIfEmpty(packagingType);
+};
 </script>

 <template>
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@ -1,9 +1,7 @@
 <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';
@ -11,17 +9,8 @@ import VnSelect from 'src/components/common/VnSelect.vue';

 const route = useRoute();
 const { t } = useI18n();
-
-const workersOptions = ref([]);
-const clientsOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers/search"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
-    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
    <FormModel
        :url="`Departments/${route.params.id}`"
        model="department"
@ -62,7 +51,7 @@ const clientsOptions = ref([]);
                <VnSelect
                    :label="t('department.bossDepartment')"
                    v-model="data.workerFk"
-                    :options="workersOptions"
+                    url="Workers/search"
                    option-value="id"
                    option-label="name"
                    hide-selected
@ -72,7 +61,7 @@ const clientsOptions = ref([]);
                <VnSelect
                    :label="t('department.selfConsumptionCustomer')"
                    v-model="data.clientFk"
-                    :options="clientsOptions"
+                    url="Clients"
                    option-value="id"
                    option-label="name"
                    hide-selected
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@ -11,6 +11,7 @@ import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
+import VnToSummary from 'src/components/ui/VnToSummary.vue';

 const route = useRoute();
 const { t } = useI18n();
@ -163,14 +164,12 @@ const fetchEntryBuys = async () => {
        data-key="EntrySummary"
    >
        <template #header-left>
-            <router-link
+            <VnToSummary
                v-if="route?.name !== 'EntrySummary'"
-                :to="{ name: 'EntrySummary', params: { id: entityId } }"
-                class="header link"
-                :href="entryUrl"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </router-link>
+                :route-name="'EntrySummary'"
+                :entity-id="entityId"
+                :url="entryUrl"
+            />
        </template>
        <template #header>
            <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@ -45,9 +45,10 @@ const columns = [
            optionValue: 'id',
            useLike: false,
        },
+        columnFilter: false,
    },
    {
-        align: 'left',
+        align: 'center',
        label: t('Reserve'),
        name: 'reserve',
        columnFilter: false,
@ -76,7 +77,7 @@ const columns = [
        name: 'tableActions',
        actions: [
            {
-                title: t('More'),
+                title: t('View more details'),
                icon: 'search',
                isPrimary: true,
                action: (row) => {
@ -141,6 +142,10 @@ function setFooter(data) {
    });
    tableRef.value.footer = footer;
 }
+
+function round(value) {
+    return Math.round(value * 100) / 100;
+}
 </script>
 <template>
    <VnSubToolbar>
@ -152,14 +157,16 @@ function setFooter(data) {
                :filter="filter"
                @on-fetch="
                    (data) => {
-                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
+                        travel = data.find(
+                            (data) => data.warehouseIn?.code.toLowerCase() === 'vnh'
+                        );
                    }
                "
            />
            <VnRow class="travel">
                <div v-if="travel">
                    <span style="color: var(--vn-label-color)">
-                        {{ t('Booked trucks') }}:
+                        {{ t('Purchase Spaces') }}:
                    </span>
                    <span>
                        {{ travel?.m3 }}
@ -206,7 +213,7 @@ function setFooter(data) {
        </template>
    </RightMenu>
    <div class="table-container">
-        <QPage class="column items-center q-pa-md">
+        <div class="column items-center">
            <VnTable
                ref="tableRef"
                data-key="StockBoughts"
@ -228,7 +235,9 @@ function setFooter(data) {
                :columns="columns"
                :user-params="userParams"
                :footer="true"
+                table-height="80vh"
                auto-load
+                :column-search="false"
            >
                <template #column-workerFk="{ row }">
                    <span class="link" @click.stop>
@ -243,7 +252,7 @@ function setFooter(data) {
                </template>
                <template #column-footer-reserve>
                    <span>
-                        {{ tableRef.footer.reserve }}
+                        {{ round(tableRef.footer.reserve) }}
                    </span>
                </template>
                <template #column-footer-bought>
@ -253,11 +262,11 @@ function setFooter(data) {
                                tableRef.footer.reserve < tableRef.footer.bought,
                        }"
                    >
-                        {{ tableRef.footer.bought }}
+                        {{ round(tableRef.footer.bought) }}
                    </span>
                </template>
            </VnTable>
-        </QPage>
+        </div>
    </div>
 </template>
 <style lang="scss" scoped>
@ -272,7 +281,6 @@ function setFooter(data) {
    display: flex;
    flex-direction: column;
    align-items: center;
-    width: 40%;
 }
 .text-negative {
    color: $negative !important;
@ -282,12 +290,12 @@ function setFooter(data) {
    es:
        Edit travel: Editar envío
        Travel: Envíos
-        Booked trucks: Camiones reservados
+        Purchase Spaces: Espacios de compra
        Buyer: Comprador
        Reserve: Reservado
        Bought: Comprado
-        More: Más
        Date: Fecha
+        View more details: Ver más detalles
        Reserve some space: Reservar espacio
        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha 
 </i18n>
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@ -77,18 +77,10 @@ const columns = [
                :columns="columns"
                :right-search="false"
                :disable-infinite-scroll="true"
+                :disable-option="{ card: true }"
                :limit="0"
                auto-load
            >
-                <template #top-left>
-                    <QBtn
-                        flat
-                        icon="Close"
-                        color="primary"
-                        class="bg-vn-section-color q-pa-xs"
-                        v-close-popup
-                    />
-                </template>
                <template #column-entryFk="{ row }">
                    <span class="link">
                        {{ row?.entryFk }}
@ -112,6 +104,11 @@ const columns = [
    justify-content: center;
    align-items: center;
    margin: auto;
+    background-color: var(--vn-section-color);
+    padding: 4px;
+}
+.container > div > div > .q-table__top.relative-position.row.items-center {
+    background-color: red !important;
 }
 </style>
 <i18n>
--- a/src/pages/Entry/EntryWasteRecalc.vue
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@ -0,0 +1,72 @@
+<script setup>
+import { ref, computed, watch } from 'vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const isLoading = ref(false);
+const dateFrom = ref();
+const dateTo = ref();
+
+const optionsTo = computed(() => (date) => {
+    if (!dateFrom.value) return true;
+    return new Date(date) >= new Date(dateFrom.value);
+});
+
+watch(dateFrom, (newDateFrom) => {
+    if (dateTo.value && new Date(dateTo.value) < new Date(newDateFrom))
+        dateTo.value = newDateFrom;
+});
+
+const recalc = async () => {
+    const { notify } = useNotify();
+
+    const params = {
+        schema: 'bs',
+        params: [new Date(dateFrom.value), new Date(dateTo.value)],
+    };
+
+    try {
+        isLoading.value = true;
+        await axios.post('Applications/waste_addSales/execute-proc', params);
+        notify('wasteRecalc.recalcOk', 'positive');
+    } catch (err) {
+        console.error(err);
+    } finally {
+        isLoading.value = false;
+    }
+};
+</script>
+
+<template>
+    <div class="q-pa-lg row justify-center">
+        <QCard class="bg-light" style="width: 300px">
+            <QCardSection>
+                <VnInputDate
+                    class="q-mb-lg"
+                    v-model="dateFrom"
+                    :label="$t('globals.from')"
+                    rounded
+                    dense
+                />
+                <VnInputDate
+                    class="q-mb-lg"
+                    v-model="dateTo"
+                    :options="optionsTo"
+                    :label="$t('globals.to')"
+                    :disable="!dateFrom"
+                    rounded
+                    dense
+                />
+                <QBtn
+                    color="primary"
+                    text-color="white"
+                    :label="$t('globals.recalc')"
+                    :loading="isLoading"
+                    :disable="isLoading || !(dateFrom && dateTo)"
+                    @click="recalc()"
+                />
+            </QCardSection>
+        </QCard>
+    </div>
+</template>
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@ -9,22 +9,27 @@ import VnTable from 'components/VnTable/VnTable.vue';

 const { t } = useI18n();
 const quasar = useQuasar();
+const params = {
+    daysOnward: 7,
+    daysAgo: 3,
+};
+
 const columns = computed(() => [
    {
        align: 'left',
        name: 'id',
-        label: t('customer.extendedList.tableVisibleColumns.id'),
+        label: t('myEntries.id'),
        columnFilter: false,
        isTitle: true,
    },
    {
        visible: false,
        align: 'right',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
        name: 'shipped',
        columnFilter: {
            name: 'fromShipped',
-            label: t('fromShipped'),
+            label: t('myEntries.fromShipped'),
            component: 'date',
        },
        format: ({ shipped }) => toDate(shipped),
@ -32,11 +37,11 @@ const columns = computed(() => [
    {
        visible: false,
        align: 'left',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
        name: 'shipped',
        columnFilter: {
            name: 'toShipped',
-            label: t('toShipped'),
+            label: t('myEntries.toShipped'),
            component: 'date',
        },
        format: ({ shipped }) => toDate(shipped),
@ -44,14 +49,14 @@ const columns = computed(() => [
    },
    {
        align: 'right',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
        name: 'shipped',
        columnFilter: false,
        format: ({ shipped }) => toDate(shipped),
    },
    {
        align: 'right',
-        label: t('landed'),
+        label: t('myEntries.landed'),
        name: 'landed',
        columnFilter: false,
        format: ({ landed }) => toDate(landed),
@ -59,26 +64,36 @@ const columns = computed(() => [

    {
        align: 'right',
-        label: t('globals.wareHouseIn'),
+        label: t('myEntries.wareHouseIn'),
        name: 'warehouseInFk',
-        format: (row) => row.warehouseInName,
+        format: (row) => {
+            row.warehouseInName;
+        },
        cardVisible: true,
        columnFilter: {
+            name: 'warehouseInFk',
+            label: t('myEntries.warehouseInFk'),
            component: 'select',
            attrs: {
                url: 'warehouses',
                fields: ['id', 'name'],
                optionLabel: 'name',
                optionValue: 'id',
-            },
                alias: 't',
+            },
            inWhere: true,
        },
    },
    {
        align: 'left',
-        label: t('globals.daysOnward'),
-        name: 'days',
+        label: t('myEntries.daysOnward'),
+        name: 'daysOnward',
+        visible: false,
+    },
+    {
+        align: 'left',
+        label: t('myEntries.daysAgo'),
+        name: 'daysAgo',
        visible: false,
    },
    {
@ -88,6 +103,7 @@ const columns = computed(() => [
            {
                title: t('printLabels'),
                icon: 'print',
+                isPrimary: true,
                action: (row) => printBuys(row.id),
            },
        ],
@ -114,9 +130,11 @@ const printBuys = (rowId) => {
        data-key="myEntriesList"
        url="Entries/filter"
        :columns="columns"
+        :user-params="params"
        default-mode="card"
        order="shipped DESC"
        auto-load
+        chip-locale="myEntries"
    />
 </template>

--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@ -6,9 +6,17 @@ entryFilter:
    filter:
        search: General search
        reference: Reference
+myEntries:
+    id: ID
    landed: Landed
    shipped: Shipped
    fromShipped: Shipped(from)
    toShipped: Shipped(to)
    printLabels: Print stickers
    viewLabel: View sticker
+    wareHouseIn: Warehouse in
+    warehouseInFk: Warehouse in
+    daysOnward: Days onward
+    daysAgo: Days ago
+wasteRecalc:
+    recalcOk: The wastes were successfully recalculated
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@ -9,10 +9,17 @@ entryFilter:
    filter:
        search: Búsqueda general
        reference: Referencia
-
+myEntries:
+    id: ID
    landed: F. llegada
    shipped: F. salida
    fromShipped: F. salida(desde)
    toShipped: F. salida(hasta)
    printLabels: Imprimir etiquetas
    viewLabel: Ver etiqueta
+    wareHouseIn: Alm. entrada
+    warehouseInFk: Alm. entrada
+    daysOnward: Días adelante
+    daysAgo: Días atras
+wasteRecalc:
+    recalcOk: Se han recalculado las mermas correctamente
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@ -274,10 +274,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                    :label="t('invoiceIn.summary.company')"
                    :value="entity.company?.code"
                />
-                <VnLv
-                    :label="t('invoiceIn.summary.booked')"
-                    :value="invoiceIn?.isBooked"
-                />
+                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
            </QCard>
            <QCard class="vn-one">
                <QCardSection class="q-pa-none">
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@ -116,7 +116,7 @@ const activities = ref([]);
            <QItem>
                <QItemSection>
                    <QCheckbox
-                        :label="t('params.isBooked')"
+                        :label="t('invoiceIn.isBooked')"
                        v-model="params.isBooked"
                        @update:model-value="searchFn()"
                        toggle-indeterminate
@ -170,7 +170,7 @@ es:
        awb: AWB
        amount: Importe
        issued: Emitida
-        isBooked: Conciliada
+        isBooked: Contabilizada
        account: Cuenta contable
        created: Creada
        dued: Vencida
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@ -65,7 +65,7 @@ const cols = computed(() => [
    {
        align: 'left',
        name: 'isBooked',
-        label: t('invoiceIn.list.isBooked'),
+        label: t('invoiceIn.isBooked'),
        columnFilter: false,
    },
    {
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@ -1,5 +1,6 @@
 invoiceIn:
    serial: Serial
+    isBooked: Is booked
    list:
        ref: Reference
        supplier: Supplier
@ -7,7 +8,6 @@ invoiceIn:
        serial: Serial
        file: File
        issued: Issued
-        isBooked: Is booked
        awb: AWB
        amount: Amount
    card:
@ -31,7 +31,6 @@ invoiceIn:
        sage: Sage withholding
        vat: Undeductible VAT
        company: Company
-        booked: Booked
        expense: Expense
        taxableBase: Taxable base
        rate: Rate
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@ -1,5 +1,6 @@
 invoiceIn:
    serial: Serie
+    isBooked: Contabilizada
    list:
        ref: Referencia
        supplier: Proveedor
@ -7,7 +8,6 @@ invoiceIn:
        shortIssued: F. emisión
        file: Fichero
        issued: Fecha emisión
-        isBooked: Conciliada
        awb: AWB
        amount: Importe
    card:
@ -31,7 +31,6 @@ invoiceIn:
        sage: Retención sage
        vat: Iva no deducible
        company: Empresa
-        booked: Contabilizada
        expense: Gasto
        taxableBase: Base imp.
        rate: Tasa
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@ -9,7 +9,6 @@ import RefundInvoiceForm from 'src/components/RefundInvoiceForm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';

 import useNotify from 'src/composables/useNotify';
-import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { getUrl } from 'src/composables/getUrl';
@ -30,8 +29,6 @@ const $props = defineProps({

 const { notify } = useNotify();
 const router = useRouter();
-const session = useSession();
-const token = session.getToken();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@ -78,7 +78,7 @@ const ticketsColumns = ref([
        align: 'left',
    },
    {
-        name: 'quantity',
+        name: 'nickname',
        label: t('invoiceOut.summary.nickname'),
        field: (row) => row.nickname,
        sortable: true,
@ -172,11 +172,11 @@ const ticketsColumns = ref([
                            </QBtn>
                        </QTd>
                    </template>
-                    <template #body-cell-quantity="{ value, row }">
+                    <template #body-cell-nickname="{ value, row }">
                        <QTd>
                            <QBtn class="no-uppercase link" flat dense>
                                {{ value }}
-                                <CustomerDescriptorProxy :id="row.id" />
+                                <CustomerDescriptorProxy :id="row.clientFk" />
                            </QBtn>
                        </QTd>
                    </template>
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@ -15,25 +15,10 @@ const props = defineProps({
        required: true,
    },
 });
-
-const workers = ref();
-const workersCopy = ref();
 const states = ref();
-
-function setWorkers(data) {
-    workers.value = data;
-    workersCopy.value = data;
-}
 </script>
-
 <template>
    <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="setWorkers"
-        auto-load
-    />
    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
        <template #tags="{ tag, formatFn }">
            <div class="q-gutter-x-xs">
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@ -13,6 +13,8 @@ import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import InvoiceOutFilter from './InvoiceOutFilter.vue';

 const { t } = useI18n();
 const stateStore = useStateStore();
@ -27,13 +29,16 @@ const { openReport } = usePrintService();

 const columns = computed(() => [
    {
-        align: 'left',
+        align: 'center',
        name: 'id',
        label: t('invoiceOutList.tableVisibleColumns.id'),
        chip: {
            condition: () => true,
        },
        isId: true,
+        columnFilter: {
+            name: 'search',
+        },
    },
    {
        align: 'left',
@ -179,6 +184,11 @@ watchEffect(selectedRows);
        :label="t('searchInvoice')"
        data-key="invoiceOut"
    />
+    <RightMenu>
+        <template #right-panel>
+            <InvoiceOutFilter data-key="invoiceOut" />
+        </template>
+    </RightMenu>
    <VnSubToolbar>
        <template #st-actions>
            <QBtn
@ -203,6 +213,7 @@ watchEffect(selectedRows);
                active: true,
            },
        }"
+        :right-search="false"
        v-model:selected="selectedRows"
        order="id DESC"
        :columns="columns"
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@ -9,6 +9,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from '../Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';

 const { t } = useI18n();
 const tableRef = ref();
@ -64,7 +65,8 @@ const columns = computed(() => [
        cardVisible: true,
        attrs: {
            url: 'Clients',
-            fields: ['id', 'name'],
+            optionLabel: 'socialName',
+            optionValue: 'socialName',
        },
        columnField: {
            component: null,
@ -168,7 +170,6 @@ const downloadCSV = async () => {
                }
            }
        "
-        :limit="0"
        :columns="columns"
        auto-load
        :is-editable="false"
@ -192,10 +193,33 @@ const downloadCSV = async () => {
                <WorkerDescriptorProxy :id="row.comercialId" />
            </span>
        </template>
+        <template #moreFilterPanel="{ params }">
+            <VnInputDate
+                :label="t('params.from')"
+                v-model="params.from"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+            <VnInputDate
+                :label="t('params.to')"
+                v-model="params.to"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+        </template>
    </VnTable>
 </template>

 <i18n>
 es:
    Download as CSV: Descargar como CSV
+    params:
+        from: Desde
+        to: Hasta
+en:
+    params:
+        from: From
+        to: To
 </i18n>
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@ -171,7 +171,6 @@ const insertTag = (rows) => {
                            <QBtn
                                @click="insertTag(rows)"
                                class="cursor-pointer"
-                                :disable="!validRow"
                                color="primary"
                                flat
                                icon="add"
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@ -514,7 +514,7 @@ function handleOnDataSave({ CrudModelRef }) {
            </template>
            <template #column-minPrice="props">
                <QTd class="col">
-                    <div class="row">
+                    <div class="row" style="align-items: center">
                        <QCheckbox
                            :model-value="props.row.hasMinPrice"
                            @update:model-value="updateMinPrice($event, props)"
@ -600,11 +600,14 @@ function handleOnDataSave({ CrudModelRef }) {
 .q-table th,
 .q-table td {
    padding-inline: 5px !important;
-    // text-align: -webkit-right;
+}
+.q-table tr td {
+    font-size: 10pt;
+    border-top: none;
+    border-collapse: collapse;
 }
 .q-table tbody td {
    max-width: none;
-
    .q-td.col {
        & .vnInputDate {
            min-width: 90px;
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@ -491,9 +491,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                        <QTd>
                            <VnImg
                                size="50x50"
+                                zoom-resolution="1600x900"
                                :id="row.id"
-                                height="50px"
-                                width="50px"
                                class="image"
                            />
                        </QTd>
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@ -229,7 +229,7 @@ onBeforeMount(() => {
        >
            <template #body-cell-id="{ row }">
                <QTd>
-                    <QBtn flat color="primary"> {{ row.ticketFk }}</QBtn>
+                    <QBtn flat class="link"> {{ row.ticketFk }}</QBtn>
                    <TicketDescriptorProxy :id="row.ticketFk" />
                </QTd>
            </template>
@ -251,22 +251,35 @@ onBeforeMount(() => {
            </template>
            <template #body-cell-requester="{ row }">
                <QTd>
-                    <QBtn flat dense color="primary"> {{ row.requesterName }}</QBtn>
+                    <QBtn flat dense class="link"> {{ row.requesterName }}</QBtn>
                    <WorkerDescriptorProxy :id="row.requesterFk" />
                </QTd>
            </template>
            <template #body-cell-attender="{ row }">
                <QTd>
                    <VnSelect
+                        url="Workers/search"
                        v-model="row.attenderFk"
-                        :where="{ role: 'buyer' }"
-                        sort-by="id"
-                        url="Workers"
+                        :params="{ departmentCodes: ['shopping'] }"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                        hide-selected
-                        option-label="firstName"
+                        option-label="nickname"
                        option-value="id"
                        dense
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt?.nickname }},
+                                        {{ scope.opt?.code }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                </QTd>
            </template>
            <template #body-cell-item="{ row }">
@ -292,7 +305,7 @@ onBeforeMount(() => {
            </template>
            <template #body-cell-concept="{ row }">
                <QTd>
-                    <QBtn flat dense color="primary"> {{ row.itemDescription }}</QBtn>
+                    <QBtn flat dense class="link"> {{ row.itemDescription }}</QBtn>
                    <ItemDescriptorProxy :id="row.itemFk" />
                </QTd>
            </template>
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@ -174,6 +174,16 @@ const decrement = (paramsObj, key) => {
                    </VnSelect>
                </QItemSection>
            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.myTeam"
+                        :label="t('params.myTeam')"
+                        @update:model-value="searchFn()"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
            <QCard bordered>
                <QItem>
                    <QItemSection>
@ -274,11 +284,11 @@ en:
        to: To
        mine: For me
        state: State
+        myTeam: My team
    dateFiltersTooltip: Cannot choose a range of dates and days onward at the same time
    denied: Denied
    accepted: Accepted
    pending: Pending
-
 es:
    params:
        search: Búsqueda general
@ -291,6 +301,7 @@ es:
        to: Hasta
        mine: Para mi
        state: Estado
+        myTeam: Mi equipo
    dateFiltersTooltip: No se puede seleccionar un rango de fechas y días en adelante a la vez
    denied: Denegada
    accepted: Aceptada
--- a/src/pages/Item/ItemTypeCreate.vue
+++ b/src/pages/Item/ItemTypeCreate.vue
@ -15,7 +15,6 @@ const router = useRouter();

 const newItemTypeForm = reactive({});

-const workersOptions = ref([]);
 const categoriesOptions = ref([]);
 const temperaturesOptions = ref([]);

@ -25,12 +24,6 @@ const redirectToItemTypeBasicData = (_, { id }) => {
 </script>

 <template>
-    <FetchData
-        url="Workers"
-        @on-fetch="(data) => (workersOptions = data)"
-        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
-        auto-load
-    />
    <FetchData
        url="ItemCategories"
        @on-fetch="(data) => (categoriesOptions = data)"
@ -59,13 +52,27 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                </VnRow>
                <VnRow>
                    <VnSelect
+                        url="Workers/search"
                        v-model="data.workerFk"
-                        :label="t('itemType.shared.worker')"
-                        :options="workersOptions"
+                        :label="t('shared.worker')"
+                        sort-by="nickname ASC"
+                        :fields="['id', 'nickname']"
+                        :params="{ departmentCodes: ['shopping'] }"
+                        option-label="nickname"
                        option-value="id"
-                        option-label="firstName"
                        hide-selected
-                    />
+                        ><template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt?.nickname }},
+                                        {{ scope.opt?.code }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                    <VnSelect
                        v-model="data.categoryFk"
                        :label="t('itemType.shared.category')"
--- a/src/pages/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@ -12,17 +12,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 const route = useRoute();
 const { t } = useI18n();

-const workersOptions = ref([]);
 const categoriesOptions = ref([]);
 const temperaturesOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers"
-        @on-fetch="(data) => (workersOptions = data)"
-        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
-        auto-load
-    />
    <FetchData
        url="ItemCategories"
        @on-fetch="(data) => (categoriesOptions = data)"
@ -48,13 +41,27 @@ const temperaturesOptions = ref([]);
            </VnRow>
            <VnRow>
                <VnSelect
+                    url="Workers/search"
                    v-model="data.workerFk"
                    :label="t('shared.worker')"
-                    :options="workersOptions"
+                    sort-by="nickname ASC"
+                    :fields="['id', 'nickname']"
+                    :params="{ departmentCodes: ['shopping'] }"
+                    option-label="nickname"
                    option-value="id"
-                    option-label="firstName"
                    hide-selected
-                />
+                    ><template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                <QItemLabel caption
+                                    >{{ scope.opt?.nickname }},
+                                    {{ scope.opt?.code }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template></VnSelect
+                >
                <VnSelect
                    v-model="data.categoryFk"
                    :label="t('shared.category')"
--- a/src/pages/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@ -6,6 +6,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v

 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import VnToSummary from 'src/components/ui/VnToSummary.vue';

 onUpdated(() => summaryRef.value.fetch());

@ -55,6 +56,11 @@ async function setItemTypeData(data) {
            >
                <QIcon name="open_in_new" color="white" size="sm" />
            </router-link>
+            <VnToSummary
+                v-if="route?.name !== 'ItemTypeSummary'"
+                :route-name="'ItemTypeSummary'"
+                :entity-id="entityId"
+            />
        </template>
        <template #header>
            <span>
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@ -139,6 +139,7 @@ const openTab = (id) =>
        :disable-option="{ card: true }"
    >
        <template #top-left>
+            <div class="q-mt-sm">
                <QBtn
                    icon="refresh"
                    size="md"
@ -158,7 +159,7 @@ const openTab = (id) =>
                    color="primary"
                    @click="
                        openConfirmationModal(
-                        $t('salesOrdersTable.deleteConfirmTitle'),
+                            $t('globals.deleteConfirmTitle'),
                            $t('salesOrdersTable.deleteConfirmMessage'),
                            removeOrders
                        )
@ -166,6 +167,7 @@ const openTab = (id) =>
                >
                    <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
                </QBtn>
+            </div>
        </template>
        <template #column-dateSend="{ row }">
            <QTd>
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@ -25,7 +25,11 @@ const stateOpts = ref([]);
 const zoneOpts = ref([]);
 const visibleColumns = ref([]);
 const { viewSummary } = useSummaryDialog();
-const [from, to] = dateRange(Date.vnNew());
+const from = Date.vnNew();
+from.setHours(0, 0, 0, 0);
+const to = new Date(from.getTime());
+to.setDate(to.getDate() + 1);
+to.setHours(23, 59, 59, 999);

 function exprBuilder(param, value) {
    switch (param) {
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@ -15,7 +15,6 @@ salesOrdersTable:
    dateMake: Make date
    client: Client
    salesPerson: Salesperson
-    deleteConfirmTitle: Delete selected elements
    deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
    agency: Agency
    import: Import
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@ -15,7 +15,6 @@ salesOrdersTable:
    dateMake: Fecha de realización
    client: Cliente
    salesPerson: Comercial
-    deleteConfirmTitle: Eliminar los elementos seleccionados
    deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
    agency: Agencia
    import: Importe
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@ -130,4 +130,5 @@ function extractValueTags(items) {
 <i18n>
 es:
    You can search items by name or id: Puedes buscar items por nombre o id
+    Search items: Buscar items
 </i18n>
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@ -247,6 +247,7 @@ function addOrder(value, field, params) {
                        rounded
                        emit-value
                        use-input
+                        sort-by="name ASC"
                        :disable="!selectedCategoryFk"
                        @update:model-value="
                            (value) => {
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@ -20,8 +20,10 @@ const props = defineProps({

 const fields = ref((props.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const descriptorData = useArrayData('orderData');
-
+const isLoading = ref(false);
 const addToOrder = async () => {
+    if (isLoading.value) return;
+    isLoading.value = true;
    const items = (fields.value || []).filter((item) => Number(item.quantity) > 0);
    await axios.post('/OrderRows/addToOrder', {
        items,
@ -30,6 +32,10 @@ const addToOrder = async () => {
    notify(t('globals.dataSaved'), 'positive');
    emit('added');
    descriptorData.fetch({});
+    isLoading.value = false;
+};
+const canAddToOrder = () => {
+    return (fields.value || []).some((item) => Number(item.quantity) > 0);
 };
 </script>

@ -68,7 +74,11 @@ const addToOrder = async () => {
                </tbody>
            </QMarkupTable>
            <div class="flex justify-center q-mt-lg">
-                <QBtn color="primary" type="submit">
+                <QBtn
+                    color="primary"
+                    type="submit"
+                    :disable="!isLoading && !canAddToOrder()"
+                >
                    {{ t('globals.add') }}
                </QBtn>
            </div>
@ -81,3 +91,10 @@ const addToOrder = async () => {
    width: 200px;
 }
 </style>
+
+<i18n>
+es:
+    noAmount: La cantidad no puede ser 0
+en:
+    noAmount: Amount can not be 0
+</i18n>
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@ -1,5 +1,5 @@
 <script setup>
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
@ -13,12 +13,10 @@ import { reactive } from 'vue';
 import FetchData from 'components/FetchData.vue';

 const { t } = useI18n();
-const route = useRoute();
 const state = useState();
 const ORDER_MODEL = 'order';

 const router = useRouter();
-const clientList = ref([]);
 const agencyList = ref([]);
 const addressList = ref([]);
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
@ -128,12 +126,6 @@ onMounted(async () => {
 </script>

 <template>
-    <FetchData
-        url="addresses"
-        @on-fetch="(data) => (clientOptions = data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
-        auto-load
-    />
    <FormModelPopup
        url-create="Orders/new"
        :title="t('Create Order')"
@ -167,13 +159,16 @@ onMounted(async () => {
                    </template>
                </VnSelect>
                <VnSelect
+                    ref="addressRef"
                    :label="t('order.form.addressFk')"
                    v-model="data.addressId"
-                    :options="addressList"
+                    url="addresses"
+                    :fields="['id', 'nickname', 'defaultAddressFk', 'street', 'city']"
+                    sort-by="id"
                    option-value="id"
                    option-label="street"
                    hide-selected
-                    :disable="!addressList?.length"
+                    :disable="!$refs.addressRef?.length"
                >
                    <template #option="scope">
                        <QItem v-bind="scope.itemProps">
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@ -17,10 +17,6 @@ const props = defineProps({

 const agencyFilter = { fields: ['id', 'name'] };
 const agencyList = ref(null);
-const salesPersonFilter = {
-    fields: ['id', 'nickname'],
-};
-const salesPersonList = ref(null);
 const sourceList = ref([]);
 </script>

@ -32,14 +28,6 @@ const sourceList = ref([]);
        auto-load
        @on-fetch="(data) => (agencyList = data)"
    />
-    <FetchData
-        url="Workers/search"
-        :filter="salesPersonFilter"
-        sort-by="nickname ASC"
-        @on-fetch="(data) => (salesPersonList = data)"
-        :params="{ departmentCodes: ['VT'] }"
-        auto-load
-    />
    <FetchData
        url="Orders/getSourceValues"
        :filter="{ fields: ['value'] }"
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@ -278,7 +278,11 @@ watch(
    >
        <template #column-image="{ row }">
            <div class="image-wrapper">
-                <VnImg :id="parseInt(row?.item?.image)" class="rounded" />
+                <VnImg
+                    :id="parseInt(row?.item?.image)"
+                    class="rounded"
+                    zoom-resolution="1600x900"
+                />
            </div>
        </template>
        <template #column-id="{ row }">
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@ -27,12 +27,15 @@ const columns = computed(() => [
            condition: () => true,
        },
        isId: true,
+        columnFilter: false,
    },
    {
        align: 'left',
        label: t('globals.name'),
        name: 'name',
        isTitle: true,
+        columnFilter: false,
+        columnClass: 'expand',
    },
    {
        align: 'left',
@ -70,8 +73,9 @@ const columns = computed(() => [
        data-key="AgencyList"
        :expr-builder="exprBuilder"
    />
+    <div class="list-container">
+        <div class="list">
            <VnTable
-        ref="tableRef"
                data-key="AgencyList"
                url="Agencies"
                order="name"
@ -81,7 +85,21 @@ const columns = computed(() => [
                redirect="agency"
                default-mode="card"
            />
+        </div>
+    </div>
 </template>
+<style lang="scss" scoped>
+.list {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 55%;
+}
+.list-container {
+    display: flex;
+    justify-content: center;
+}
+</style>
 <i18n>
    es:
        isOwn: Tiene propietario
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@ -46,13 +46,13 @@ async function deleteWorCenter(id) {
 }
 </script>
 <template>
-    <div class="centerCard">
    <FetchData
        url="workCenters"
        sort-by="name"
        @on-fetch="(data) => (warehouses = data)"
        auto-load
    />
+    <div class="centerCard">
        <VnPaginate
            ref="paginate"
            data-key="AgencyWorkCenters"
--- a/src/pages/Route/Card/RouteListTicketsDialog.vue
+++ b/src/pages/Route/Card/RouteListTicketsDialog.vue
@ -167,8 +167,8 @@ const setTicketsRoute = async () => {
                        <QTd :props="props">
                            <span class="link">
                                {{ props.value }}
-                                <TicketDescriptorProxy :id="props?.row?.id" />
                            </span>
+                            <TicketDescriptorProxy :id="props?.row?.id" />
                        </QTd>
                    </template>
                    <template #body-cell-client="props">
--- a/src/pages/Route/RouteExtendedList.vue
+++ b/src/pages/Route/RouteExtendedList.vue
@ -0,0 +1,360 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useQuasar } from 'quasar';
+import { toDate } from 'src/filters';
+import { useRouter } from 'vue-router';
+import { usePrintService } from 'src/composables/usePrintService';
+
+import axios from 'axios';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
+import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+
+const { openReport } = usePrintService();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const quasar = useQuasar();
+const selectedRows = ref([]);
+const tableRef = ref([]);
+const confirmationDialog = ref(false);
+const startingDate = ref(null);
+const router = useRouter();
+const routeFilter = {
+    include: [
+        {
+            relation: 'workers',
+            scope: {
+                fields: ['id', 'firstName'],
+            },
+        },
+    ],
+};
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: 'Id',
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'workerFk',
+        label: t('route.Worker'),
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            useLike: false,
+            optionFilter: 'firstName',
+            find: {
+                value: 'workerFk',
+                label: 'workerUserName',
+            },
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        useLike: false,
+        cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
+    },
+    {
+        align: 'left',
+        name: 'agencyModeFk',
+        label: t('route.Agency'),
+        isTitle: true,
+        cardVisible: true,
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'agencyModes',
+            fields: ['id', 'name'],
+            find: {
+                value: 'agencyModeFk',
+                label: 'agencyName',
+            },
+        },
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'vehicleFk',
+        label: t('route.Vehicle'),
+        cardVisible: true,
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'vehicles',
+            fields: ['id', 'numberPlate'],
+            optionLabel: 'numberPlate',
+            optionFilterValue: 'numberPlate',
+            find: {
+                value: 'vehicleFk',
+                label: 'vehiclePlateNumber',
+            },
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('route.Date'),
+        columnFilter: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'left',
+        name: 'from',
+        label: t('route.From'),
+        visible: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'left',
+        name: 'to',
+        label: t('route.To'),
+        visible: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'center',
+        name: 'm3',
+        label: 'm3',
+        cardVisible: true,
+        columnClass: 'shrink',
+    },
+    {
+        align: 'left',
+        name: 'started',
+        label: t('route.hourStarted'),
+        component: 'time',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'finished',
+        label: t('route.hourFinished'),
+        component: 'time',
+        columnFilter: false,
+    },
+    {
+        align: 'center',
+        name: 'kmStart',
+        label: t('route.KmStart'),
+        columnClass: 'shrink',
+        create: true,
+        visible: false,
+    },
+    {
+        align: 'center',
+        name: 'kmEnd',
+        label: t('route.KmEnd'),
+        columnClass: 'shrink',
+        create: true,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'description',
+        label: t('route.Description'),
+        isTitle: true,
+        create: true,
+        component: 'input',
+        field: 'description',
+    },
+    {
+        align: 'left',
+        name: 'isOk',
+        label: t('route.Served'),
+        component: 'checkbox',
+        columnFilter: false,
+        columnClass: 'shrink',
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('route.Add tickets'),
+                icon: 'vn:ticketAdd',
+                action: (row) => openTicketsDialog(row?.id),
+                isPrimary: true,
+            },
+            {
+                title: t('route.components.smartCard.viewSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row?.id, RouteSummary),
+                isPrimary: true,
+            },
+            {
+                title: t('route.Route summary'),
+                icon: 'arrow_forward',
+                action: (row) => navigate(row?.id),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
+
+function navigate(id) {
+    router.push({ path: `/route/${id}` });
+}
+
+const cloneRoutes = () => {
+    if (!selectedRows.value.length || !startingDate.value) return;
+    axios.post('Routes/clone', {
+        created: startingDate.value,
+        ids: selectedRows.value.map((row) => row?.id),
+    });
+    startingDate.value = null;
+    tableRef.value.reload();
+};
+
+const showRouteReport = () => {
+    const ids = selectedRows.value.map((row) => row?.id);
+    const idString = ids.join(',');
+    let url = `Routes/${idString}/driver-route-pdf`;
+    let params = {};
+    if (selectedRows.value.length >= 1) {
+        params = {
+            id: idString,
+        };
+        url = `Routes/downloadZip`;
+    }
+    openReport(url, params, '_blank');
+};
+
+function markAsServed() {
+    selectedRows.value.forEach(async (row) => {
+        await axios.patch(`Routes/${row?.id}`, { isOk: true });
+    });
+    tableRef.value.reload();
+    startingDate.value = null;
+}
+
+const openTicketsDialog = (id) => {
+    quasar
+        .dialog({
+            component: RouteListTicketsDialog,
+            componentProps: {
+                id,
+            },
+        })
+        .onOk(() => tableRef.value.reload());
+};
+</script>
+
+<template>
+    <RouteSearchbar />
+    <QDialog v-model="confirmationDialog">
+        <QCard style="min-width: 350px">
+            <QCardSection>
+                <p class="text-h6 q-ma-none">{{ t('route.Select the starting date') }}</p>
+            </QCardSection>
+
+            <QCardSection class="q-pt-none">
+                <VnInputDate
+                    :label="t('route.Stating date')"
+                    v-model="startingDate"
+                    autofocus
+                />
+            </QCardSection>
+            <QCardActions align="right">
+                <QBtn
+                    flat
+                    :label="t('route.Cancel')"
+                    v-close-popup
+                    class="text-primary"
+                />
+                <QBtn color="primary" v-close-popup @click="cloneRoutes">
+                    {{ t('globals.clone') }}
+                </QBtn>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+    <VnSubToolbar />
+    <RightMenu>
+        <template #right-panel>
+            <RouteFilter data-key="RouteList" />
+        </template>
+    </RightMenu>
+    <VnTable
+        class="route-list"
+        ref="tableRef"
+        data-key="RouteList"
+        url="Routes/filter"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="true"
+        :filter="routeFilter"
+        redirect="route"
+        :row-click="false"
+        :create="{
+            urlCreate: 'Routes',
+            title: t('route.createRoute'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
+        }"
+        save-url="Routes/crud"
+        :disable-option="{ card: true }"
+        table-height="85vh"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+    >
+        <template #moreBeforeActions>
+            <QBtn
+                icon="vn:clone"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="confirmationDialog = true"
+            >
+                <QTooltip>{{ t('route.Clone Selected Routes') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                icon="cloud_download"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="showRouteReport"
+            >
+                <QTooltip>{{ t('route.Download selected routes as PDF') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                icon="check"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="markAsServed()"
+            >
+                <QTooltip>{{ t('route.Mark as served') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnTable>
+</template>
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@ -1,34 +1,19 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useQuasar } from 'quasar';
-import { toDate } from 'src/filters';
-import { useRouter } from 'vue-router';
+import { toHour } from 'src/filters';

-import axios from 'axios';
 import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
-
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { usePrintService } from 'src/composables/usePrintService';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';

-const { openReport } = usePrintService();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const quasar = useQuasar();
-const session = useSession();
-const selectedRows = ref([]);
 const tableRef = ref([]);
-const confirmationDialog = ref(false);
-const startingDate = ref(null);
-const router = useRouter();
 const routeFilter = {
    include: [
        {
@ -42,156 +27,70 @@ const routeFilter = {
 const columns = computed(() => [
    {
        align: 'left',
+        isId: true,
        name: 'id',
        label: 'Id',
        chip: {
            condition: () => true,
        },
-        isId: true,
        columnFilter: false,
    },
    {
        align: 'left',
        name: 'workerFk',
-        label: t('Worker'),
+        label: t('route.Worker'),
        create: true,
-        component: 'select',
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            useLike: false,
-            optionFilter: 'firstName',
-            find: {
-                value: 'workerFk',
-                label: 'workerUserName',
-            },
-        },
-        columnFilter: {
-            inWhere: true,
-        },
-        useLike: false,
        cardVisible: true,
        format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
-    },
-    {
-        align: 'left',
-        name: 'agencyModeFk',
-        label: t('Agency'),
-        isTitle: true,
-        cardVisible: true,
-        create: true,
-        component: 'select',
-        attrs: {
-            url: 'agencyModes',
-            fields: ['id', 'name'],
-            find: {
-                value: 'agencyModeFk',
-                label: 'agencyName',
-            },
-        },
-        columnClass: 'expand',
-    },
-    {
-        align: 'left',
-        name: 'vehicleFk',
-        label: t('Vehicle'),
-        cardVisible: true,
-        create: true,
-        component: 'select',
-        attrs: {
-            url: 'vehicles',
-            fields: ['id', 'numberPlate'],
-            optionLabel: 'numberPlate',
-            optionFilterValue: 'numberPlate',
-            find: {
-                value: 'vehicleFk',
-                label: 'vehiclePlateNumber',
-            },
-        },
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        name: 'created',
-        label: t('Date'),
        columnFilter: false,
-        cardVisible: true,
-        create: true,
-        component: 'date',
-        format: ({ date }) => toDate(date),
    },
    {
        align: 'left',
-        name: 'from',
-        label: t('From'),
-        visible: false,
+        name: 'agencyName',
+        label: t('route.Agency'),
        cardVisible: true,
        create: true,
-        component: 'date',
-        format: ({ date }) => toDate(date),
+        columnClass: 'expand',
+        columnFilter: false,
    },
    {
        align: 'left',
-        name: 'to',
-        label: t('To'),
-        visible: false,
+        name: 'vehiclePlateNumber',
+        label: t('route.Vehicle'),
        cardVisible: true,
        create: true,
-        component: 'date',
-        format: ({ date }) => toDate(date),
-    },
-    {
-        align: 'center',
-        name: 'm3',
-        label: t('Volume'),
-        cardVisible: true,
-        columnClass: 'shrink',
+        columnFilter: false,
    },
    {
        align: 'left',
        name: 'started',
-        label: t('hourStarted'),
-        component: 'time',
+        label: t('route.hourStarted'),
+        cardVisible: true,
        columnFilter: false,
+        format: (row) => toHour(row.started),
    },
    {
        align: 'left',
        name: 'finished',
-        label: t('hourFinished'),
-        component: 'time',
+        label: t('route.hourFinished'),
+        cardVisible: true,
        columnFilter: false,
-    },
-    {
-        align: 'center',
-        name: 'kmStart',
-        label: t('KmStart'),
-        columnClass: 'shrink',
-        create: true,
-        visible: false,
-    },
-    {
-        align: 'center',
-        name: 'kmEnd',
-        label: t('KmEnd'),
-        columnClass: 'shrink',
-        create: true,
-        visible: false,
+        format: (row) => toHour(row.started),
    },
    {
        align: 'left',
        name: 'description',
-        label: t('Description'),
+        label: t('route.Description'),
+        cardVisible: true,
        isTitle: true,
        create: true,
-        component: 'input',
        field: 'description',
+        columnFilter: false,
    },
    {
        align: 'left',
        name: 'isOk',
-        label: t('Served'),
+        label: t('route.Served'),
        component: 'checkbox',
        columnFilter: false,
        columnClass: 'shrink',
@ -200,212 +99,43 @@ const columns = computed(() => [
        align: 'right',
        name: 'tableActions',
        actions: [
-            {
-                title: t('Add tickets'),
-                icon: 'vn:ticketAdd',
-                action: (row) => openTicketsDialog(row?.id),
-            },
            {
                title: t('components.smartCard.viewSummary'),
                icon: 'preview',
                action: (row) => viewSummary(row?.id, RouteSummary),
-            },
-            {
-                title: t('Route summary'),
-                icon: 'arrow_forward',
                isPrimary: true,
-                action: (row) => navigate(row?.id),
            },
        ],
    },
 ]);
-
-function navigate(id) {
-    router.push({ path: `/route/${id}` });
-}
-
-const cloneRoutes = () => {
-    if (!selectedRows.value.length || !startingDate.value) return;
-    axios.post('Routes/clone', {
-        created: startingDate.value,
-        ids: selectedRows.value.map((row) => row?.id),
-    });
-    startingDate.value = null;
-    tableRef.value.reload();
-};
-
-const showRouteReport = () => {
-    const ids = selectedRows.value.map((row) => row?.id);
-    const idString = ids.join(',');
-    let url = `Routes/${idString}/driver-route-pdf`;
-    let params = {};
-    if (selectedRows.value.length >= 1) {
-        params = {
-            id: idString,
-        };
-        url = `Routes/downloadZip`;
-    }
-    openReport(url, params, '_blank');
-};
-
-function markAsServed() {
-    selectedRows.value.forEach(async (row) => {
-        await axios.patch(`Routes/${row?.id}`, { isOk: true });
-    });
-    tableRef.value.reload();
-    startingDate.value = null;
-}
-
-const openTicketsDialog = (id) => {
-    quasar
-        .dialog({
-            component: RouteListTicketsDialog,
-            componentProps: {
-                id,
-            },
-        })
-        .onOk(() => tableRef.value.reload());
-};
 </script>
-
 <template>
    <RouteSearchbar />
-    <QDialog v-model="confirmationDialog">
-        <QCard style="min-width: 350px">
-            <QCardSection>
-                <p class="text-h6 q-ma-none">{{ t('Select the starting date') }}</p>
-            </QCardSection>
-
-            <QCardSection class="q-pt-none">
-                <VnInputDate
-                    :label="t('Stating date')"
-                    v-model="startingDate"
-                    autofocus
-                />
-            </QCardSection>
-            <QCardActions align="right">
-                <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
-                <QBtn color="primary" v-close-popup @click="cloneRoutes">
-                    {{ t('globals.clone') }}
-                </QBtn>
-            </QCardActions>
-        </QCard>
-    </QDialog>
-    <VnSubToolbar />
    <RightMenu>
        <template #right-panel>
            <RouteFilter data-key="RouteList" />
        </template>
    </RightMenu>
    <VnTable
-        class="route-list"
-        ref="tableRef"
        data-key="RouteList"
        url="Routes/filter"
        :columns="columns"
        :right-search="false"
-        :is-editable="true"
        :filter="routeFilter"
        redirect="route"
-        :row-click="false"
        :create="{
            urlCreate: 'Routes',
-            title: t('Create route'),
+            title: t('route.createRoute'),
            onDataSaved: ({ id }) => tableRef.redirect(id),
            formInitialData: {},
        }"
-        save-url="Routes/crud"
-        :disable-option="{ card: true }"
        table-height="85vh"
-        v-model:selected="selectedRows"
-        :table="{
-            'row-key': 'id',
-            selection: 'multiple',
-        }"
    >
-        <template #moreBeforeActions>
-            <QBtn
-                icon="vn:clone"
-                color="primary"
-                class="q-mr-sm"
-                :disable="!selectedRows?.length"
-                @click="confirmationDialog = true"
-            >
-                <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                icon="cloud_download"
-                color="primary"
-                class="q-mr-sm"
-                :disable="!selectedRows?.length"
-                @click="showRouteReport"
-            >
-                <QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                icon="check"
-                color="primary"
-                class="q-mr-sm"
-                :disable="!selectedRows?.length"
-                @click="markAsServed()"
-            >
-                <QTooltip>{{ t('Mark as served') }}</QTooltip>
-            </QBtn>
+        <template #column-workerFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row?.workerUserName }}
+                <WorkerDescriptorProxy :id="row?.workerFk" v-if="row?.workerFk" />
+            </span>
        </template>
    </VnTable>
 </template>
-
-<style lang="scss" scoped>
-.table-input-cell {
-    max-width: 143px;
-}
-
-.route-list {
-    width: 100%;
-    max-height: 100%;
-}
-
-.table-actions {
-    gap: 12px;
-}
-th:last-child,
-td:last-child {
-    background-color: var(--vn-section-color);
-    position: sticky;
-    right: 0;
-}
-</style>
-<i18n>
-en:
-    newRoute: New Route
-    hourStarted: Started hour
-    hourFinished: Finished hour
-es:
-    From: Desde
-    To: Hasta
-    Worker: Trabajador
-    Agency: Agencia
-    Vehicle: Vehículo
-    Volume: Volumen
-    Date: Fecha
-    Description: Descripción
-    Hour started: Hora inicio
-    Hour finished: Hora fin
-    KmStart: Km inicio
-    KmEnd: Km fin
-    Served: Servida
-    newRoute: Nueva Ruta
-    Clone Selected Routes: Clonar rutas seleccionadas
-    Select the starting date: Seleccione la fecha de inicio
-    Stating date: Fecha de inicio
-    Cancel: Cancelar
-    Mark as served: Marcar como servidas
-    Download selected routes as PDF: Descargar rutas seleccionadas como PDF
-    Add ticket: Añadir tickets
-    Preview: Vista previa
-    Summary: Resumen
-    Route is closed: La ruta está cerrada
-    Route is not served: La ruta no está servida
-    hourStarted: Hora de inicio
-    hourFinished: Hora de fin
-</i18n>
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@ -87,7 +87,7 @@ const columns = computed(() => [
        actions: [
            {
                title: t('Ver cmr'),
-                icon: 'visibility',
+                icon: 'preview',
                isPrimary: true,
                action: (row) => viewSummary(row?.id, RoadmapSummary),
            },
--- a/Show More
+++ b/Show More