Merge branch 'dev' into 7323-fineTunningWorker

2024-10-03 07:17:05 +00:00 · 2024-10-03 07:17:05 +00:00 · 1536cbe205
parent 3caeb9e738 ed5cf137b0
commit 1536cbe205
51 changed files with 831 additions and 216 deletions
--- 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,26 +63,78 @@ 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 (!!oldValueFk[0] && newCountryFk[0] !== oldValueFk[0]) {
+            postcodeFormData.provinceFk = null;
+            postcodeFormData.townFk = null;
+        }
+        if ((newCountryFk, newCountryFk !== postcodeFormData.countryFk)) {
+            await provincesFetchDataRef.value.fetch({
+                where: {
+                    countryFk: newCountryFk[0],
+                },
+            });
+            await townsFetchDataRef.value.fetch({
+                where: {
+                    provinceFk: {
+                        inq: provincesOptions.value.map(({ id }) => id),
+                    },
+                },
+            });
+        }
+    }
+);
+
+watch(
+    () => postcodeFormData.provinceFk,
+    async (newProvinceFk) => {
+        if (newProvinceFk[0] && newProvinceFk[0] !== postcodeFormData.provinceFk) {
+            await townsFetchDataRef.value.fetch({
+                where: { provinceFk: newProvinceFk[0] },
+            });
+        }
+    }
+);
+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"
        auto-load
        url="Provinces/location"
    />
    <FetchData
-        @on-fetch="(data) => (countriesOptions = data)"
+        ref="townsFetchDataRef"
+        @on-fetch="handleTowns"
        auto-load
-        url="Countries"
+        url="Towns/location"
    />
+    <FetchData @on-fetch="handleCountries" auto-load url="Countries" />
    <FormModelPopup
        url-create="postcodes"
        model="postcode"
@ -96,18 +150,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 +178,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 +191,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 +216,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,6 +40,11 @@ const onDataSaved = (dataSaved, requestResponse) => {
    <FetchData
        @on-fetch="(data) => (autonomiesOptions = data)"
        auto-load
+        :filter="{
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
        url="Autonomies/location"
    />
    <FormModelPopup
--- 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/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
@ -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/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -73,7 +73,6 @@ const $props = defineProps({
        type: Boolean,
        default: false,
    },
-
    hasSubToolbar: {
        type: Boolean,
        default: null,
@ -318,8 +317,8 @@ defineExpose({
    params,
 });

-function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved(this);
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
    else $props.create.onDataSaved(_);
 }
 </script>
@ -687,17 +686,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>
@ -859,6 +856,15 @@ es:
        background-color: var(--vn-section-color);
        z-index: 1;
    }
+    table tbody th {
+        position: relative;
+    }
+    tbody:nth-last-child(1) {
+        @extend .bg-header;
+        position: sticky;
+        z-index: 2;
+        bottom: 0;
+    }
 }

 .vn-label-value {
@ -905,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/VnInput.vue
+++ b/src/components/common/VnInput.vue
@ -130,4 +130,24 @@ const mixinRules = [
 .q-field__append {
    padding-inline: 0;
 }
+
+.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: 20px;
+}
+.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: auto;
+}
+.q-field__control {
+    height: unset;
+}
+
+.q-field--labeled {
+    .q-field__native,
+    .q-field__prefix,
+    .q-field__suffix,
+    .q-field__input {
+        padding-bottom: 0;
+        min-height: 15px;
+    }
+}
 </style>
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@ -12,14 +12,46 @@ const props = defineProps({
        default: null,
    },
 });
+
+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
-        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
-        : null
+    props.location ? formatLocation(props.location, locationProperties) : null
 );
+
 function showLabel(data) {
-    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
+    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
@ -283,4 +283,15 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field--outlined {
    max-width: 100%;
 }
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+
+        display: flex;
+        align-items: flex-end;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}
 </style>
--- 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',
@ -114,9 +112,9 @@ watch(
 );

 const isLoading = ref(false);
-async function search() {
+async function search(evt) {
    try {
-        if ($props.disableSubmitEvent) return;
+        if (evt && $props.disableSubmitEvent) return;

        store.filter.where = {};
        isLoading.value = true;
@ -167,7 +165,7 @@ const tagsList = computed(() => {
    for (const key of Object.keys(userParams.value)) {
        const value = userParams.value[key];
        if (value == null || ($props.hiddenTags || []).includes(key)) continue;
-        tagList.push({ label: aliasField(key), value });
+        tagList.push({ label: key, value });
    }
    return tagList;
 });
@ -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);

@ -203,11 +200,6 @@ function sanitizer(params) {
    }
    return params;
 }
-
-function aliasField(field) {
-    const split = field.split('.');
-    return split[1] ?? split[0];
-}
 </script>

 <template>
@ -219,7 +211,7 @@ function aliasField(field) {
        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/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@ -9,6 +9,7 @@ defineProps({ wrap: { type: Boolean, default: false } });
 <style lang="scss" scoped>
 .vn-row {
    display: flex;
+    align-items: flex-end;
    > :deep(*) {
        flex: 1;
    }
--- 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/css/app.scss
+++ b/src/css/app.scss
@ -288,3 +288,14 @@ input::-webkit-inner-spin-button {
        color: $info;
    }
 }
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+        display: flex;
+        align-items: flex-end;
+        padding-bottom: 2px;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}
--- 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
@ -289,8 +290,8 @@ globals:
    createInvoiceIn: Create invoice in
    myAccount: My account
    noOne: No one
-    maxTemperature: Maximum Temperature
-    minTemperature: Minimum Temperatura
+    maxTemperature: Max
+    minTemperature: Min
    params:
        id: ID
        clientFk: Client id
@ -311,6 +312,7 @@ errors:
    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:
--- 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
@ -293,8 +294,8 @@ globals:
    createInvoiceIn: Crear factura recibida
    myAccount: Mi cuenta
    noOne: Nadie
-    maxTemperature: Temperatura máxima
-    minTemperature: Temperatura mínima
+    maxTemperature: Máx
+    minTemperature: Mín
    params:
        id: Id
        clientFk: Id cliente
@ -316,6 +317,7 @@ errors:
    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:
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -9,7 +9,9 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
-
+const filter = {
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};
 const columns = computed(() => [
    {
        align: 'left',
@ -29,7 +31,22 @@ const columns = computed(() => [
    },
    {
        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',
@ -104,12 +121,13 @@ const exprBuilder = (param, value) => {
        :expr-builder="exprBuilder"
        :label="t('account.search')"
        :info="t('account.searchInfo')"
+        :filter="filter"
    />
-
    <VnTable
        ref="tableRef"
        data-key="AccountUsers"
        url="VnUsers/preview"
+        :filter="filter"
        order="id DESC"
        :columns="columns"
        default-mode="table"
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@ -11,6 +11,9 @@ const { t } = useI18n();
        data-key="Account"
        :descriptor="AccountDescriptor"
        search-data-key="AccountUsers"
+        :filter="{
+            include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+        }"
        :searchbar-props="{
            url: 'VnUsers/preview',
            label: t('account.search'),
--- 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/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/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/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@ -47,7 +47,7 @@ const columns = [
        },
    },
    {
-        align: 'left',
+        align: 'center',
        label: t('Reserve'),
        name: 'reserve',
        columnFilter: false,
@ -76,7 +76,7 @@ const columns = [
        name: 'tableActions',
        actions: [
            {
-                title: t('More'),
+                title: t('View more details'),
                icon: 'search',
                isPrimary: true,
                action: (row) => {
@ -141,6 +141,10 @@ function setFooter(data) {
    });
    tableRef.value.footer = footer;
 }
+
+function round(value) {
+    return Math.round(value * 100) / 100;
+}
 </script>
 <template>
    <VnSubToolbar>
@ -152,7 +156,9 @@ 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'
+                        );
                    }
                "
            />
@ -206,7 +212,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,6 +234,7 @@ function setFooter(data) {
                :columns="columns"
                :user-params="userParams"
                :footer="true"
+                table-height="80vh"
                auto-load
            >
                <template #column-workerFk="{ row }">
@ -243,7 +250,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 +260,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 +279,7 @@ function setFooter(data) {
    display: flex;
    flex-direction: column;
    align-items: center;
-    width: 40%;
+    width: 35%;
 }
 .text-negative {
    color: $negative !important;
@ -286,8 +293,8 @@ function setFooter(data) {
        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/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,15 @@ entryFilter:
    filter:
        search: General search
        reference: Reference
-landed: Landed
-shipped: Shipped
-fromShipped: Shipped(from)
-toShipped: Shipped(to)
-printLabels: Print stickers
-viewLabel: View sticker
+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
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@ -9,10 +9,15 @@ entryFilter:
    filter:
        search: Búsqueda general
        reference: Referencia
-
-landed: F. llegada
-shipped: F. salida
-fromShipped: F. salida(desde)
-toShipped: F. salida(hasta)
-printLabels: Imprimir etiquetas
-viewLabel: Ver etiqueta
+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
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@ -27,13 +27,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',
--- 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,
@ -192,10 +194,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/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)"
@ -601,6 +601,11 @@ function handleOnDataSave({ CrudModelRef }) {
 .q-table td {
    padding-inline: 5px !important;
 }
+.q-table tr td {
+    font-size: 10pt;
+    border-top: none;
+    border-collapse: collapse;
+}
 .q-table tbody td {
    max-width: none;
    .q-td.col {
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@ -84,6 +84,7 @@ function handleLocation(data, location) {
                <VnRow>
                    <VnLocation
                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                        :location="
                            data.postalCode
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@ -52,7 +52,22 @@ function handleLocation(data, location) {
        :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
        model="supplier"
        :filter="{
-            fields: ['id', 'name', 'city', 'postCode', 'countryFk', 'provinceFk'],
+            fields: [
+                'id',
+                'nif',
+                'city',
+                'name',
+                'account',
+                'postCode',
+                'countryFk',
+                'provinceFk',
+                'sageTaxTypeFk',
+                'sageWithholdingFk',
+                'sageTransactionTypeFk',
+                'supplierActivityFk',
+                'healthRegister',
+                'street',
+            ],
            include: [
                {
                    relation: 'province',
@ -146,6 +161,7 @@ function handleLocation(data, location) {
            <VnRow>
                <VnLocation
                    :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                    :location="{
                        postcode: data.postCode,
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@ -277,13 +277,14 @@ async function createRefund(withWarehouse) {
    const params = {
        ticketsIds: [parseInt(ticketId)],
        withWarehouse: withWarehouse,
+        negative: true,
    };
-    const { data } = await axios.post(`Tickets/refund`, params);
+    const { data } = await axios.post(`Tickets/cloneAll`, params);

    if (data) {
-        const refundTicket = data;
-
-        push({ name: 'TicketSale', params: { id: refundTicket[0].id } });
+        const [refundTicket] = data;
+        notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
+        push({ name: 'TicketSale', params: { id: refundTicket.id } });
    }
 }

--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@ -53,7 +53,7 @@ const tableRef = ref([]);

 watch(
    () => route.params.id,
-    async () => await getSales()
+    () => tableRef.value.reload()
 );

 const columns = computed(() => [
@ -161,15 +161,6 @@ const onSalesFetched = (salesData) => {
    for (let sale of salesData) sale.amount = getSaleTotal(sale);
 };

-const getSales = async () => {
-    try {
-        const { data } = await axios.get(`Tickets/${route.params.id}/getSales`);
-        onSalesFetched(data);
-    } catch (err) {
-        console.error('Error fetching sales', err);
-    }
-};
-
 const getSaleTotal = (sale) => {
    if (sale.quantity == null || sale.price == null) return null;

@ -181,7 +172,7 @@ const getSaleTotal = (sale) => {

 const resetChanges = async () => {
    arrayData.fetch({ append: false });
-    getSales();
+    tableRef.value.reload();
 };

 const updateQuantity = async (sale) => {
@ -434,8 +425,6 @@ const setTransferParams = async () => {
 onMounted(async () => {
    stateStore.rightDrawer = true;
    getConfig();
-    getSales();
-    getItems();
 });

 onUnmounted(() => (stateStore.rightDrawer = false));
@ -443,11 +432,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 const items = ref([]);
 const newRow = ref({});

-async function getItems() {
-    const { data } = await axios.get(`Items/withName`);
-    items.value = data;
-}
-
 const updateItem = (row) => {
    const selectedItem = items.value.find((item) => item.id === row.itemFk);
    if (selectedItem) {
@ -623,6 +607,7 @@ watch(
        :column-search="false"
        :disable-option="{ card: true }"
        auto-load
+        @on-fetch="onSalesFetched"
        :create="{
            onDataSaved: handleOnDataSave,
        }"
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@ -44,7 +44,7 @@ const props = defineProps({
    },
 });

-const router = useRouter();
+const { push } = useRouter();
 const { t } = useI18n();
 const { dialog } = useQuasar();
 const { notify } = useNotify();
@ -142,7 +142,7 @@ const onCreateClaimAccepted = async () => {
    try {
        const params = { ticketId: ticket.value.id, sales: props.sales };
        const { data } = await axios.post(`Claims/createFromSales`, params);
-        router.push({ name: 'ClaimBasicData', params: { id: data.id } });
+        push({ name: 'ClaimBasicData', params: { id: data.id } });
    } catch (error) {
        console.error('Error creating claim: ', error);
    }
@ -169,7 +169,7 @@ const createRefund = async (withWarehouse) => {
        const { data } = await axios.post('Tickets/cloneAll', params);
        const [refundTicket] = data;
        notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
-        router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
+        push({ name: 'TicketSale', params: { id: refundTicket.id } });
    } catch (error) {
        console.error(error);
    }
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@ -1,7 +1,7 @@
 <script setup>
 import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import { onMounted, ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
@ -12,6 +12,8 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
@ -19,8 +21,7 @@ import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';

 const route = useRoute();
-const router = useRouter();
-
+const { notify } = useNotify();
 const { t } = useI18n();

 const $props = defineProps({
@ -38,6 +39,8 @@ const ticket = computed(() => summaryRef.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
+const stateBtnDropdownRef = ref();
+const descriptorData = useArrayData('ticketData');

 onMounted(async () => {
    ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@ -64,15 +67,19 @@ function isEditable() {
 }

 async function changeState(value) {
-    if (!ticket.value.id) return;
-
+    try {
+        stateBtnDropdownRef.value.hide();
        const formData = {
-        ticketFk: ticket.value.id,
+            ticketFk: entityId.value,
            code: value,
        };
-
        await axios.post(`Tickets/state`, formData);
-    router.go(route.fullPath);
+        notify('globals.dataSaved', 'positive');
+        summaryRef.value?.fetch();
+        descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }

 function getNoteValue(description) {
@ -125,6 +132,7 @@ function toTicketUrl(section) {
        </template>
        <template #header-right>
            <QBtnDropdown
+                ref="stateBtnDropdownRef"
                color="black"
                text-color="white"
                :label="t('ticket.summary.changeState')"
@ -137,7 +145,7 @@ function toTicketUrl(section) {
                    option-value="code"
                    hide-dropdown-icon
                    focus-on-mount
-                    @update:model-value="changeState(item.code)"
+                    @update:model-value="changeState"
                />
            </QBtnDropdown>
        </template>
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@ -121,6 +121,20 @@ const thermographsTableColumns = computed(() => {
            name: 'temperatureFk',
            align: 'left',
        },
+        {
+            label: t('globals.maxTemperature'),
+            field: 'maxTemperature',
+            name: 'maxTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
+        {
+            label: t('globals.minTemperature'),
+            field: 'minTemperature',
+            name: 'minTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
        {
            label: t('travel.thermographs.state'),
            field: 'result',
@ -133,7 +147,7 @@ const thermographsTableColumns = computed(() => {
            name: 'destination',
            align: 'left',
            format: (val) =>
-                warehouses.value.find((warehouse) => warehouse.id === val).name,
+                warehouses.value.find((warehouse) => warehouse.id === val)?.name,
        },
        {
            label: t('travel.thermographs.created'),
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@ -52,12 +52,14 @@ const TableColumns = computed(() => {
            field: 'maxTemperature',
            name: 'maxTemperature',
            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
        },
        {
            label: t('globals.minTemperature'),
            field: 'minTemperature',
            name: 'minTemperature',
            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
        },
        {
            label: t('travel.thermographs.state'),
@ -219,6 +221,4 @@ es:
    Thermograph removed: Termógrafo eliminado
    Are you sure you want to remove the thermograph?: ¿Seguro que quieres quitar el termógrafo?
    No results: Sin resultados
-    Max Temperature: Temperatura máxima
-    Min Temperature: Temperatura mínima
 </i18n>
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@ -0,0 +1,157 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const states = ref([]);
+
+defineExpose({ states });
+</script>
+
+<template>
+    <FetchData url="warehouses" @on-fetch="(data) => (states = data)" auto-load />
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <div class="q-pa-sm q-gutter-y-sm">
+                <VnInput
+                    :label="t('travel.Id')"
+                    v-model="params.id"
+                    lazy-rules
+                    is-outlined
+                >
+                    <template #prepend> <QIcon name="badge" size="xs" /></template>
+                </VnInput>
+                <VnInput
+                    :label="t('travel.ref')"
+                    v-model="params.ref"
+                    lazy-rules
+                    is-outlined
+                />
+                <VnSelect
+                    :label="t('travel.agency')"
+                    v-model="params.agencyModeFk"
+                    @update:model-value="searchFn()"
+                    url="agencyModes"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnSelect
+                    :label="t('travel.warehouseInFk')"
+                    v-model="params.warehouseInFk"
+                    @update:model-value="searchFn()"
+                    url="warehouses"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputDate
+                    :label="t('travel.shipped')"
+                    v-model="params.shipped"
+                    @update:model-value="searchFn()"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputTime
+                    v-model="params.shipmentHour"
+                    @update:model-value="searchFn()"
+                    :label="t('travel.shipmentHour')"
+                    outlined
+                    rounded
+                    dense
+                />
+                <VnSelect
+                    :label="t('travel.warehouseOut')"
+                    v-model="params.warehouseOut"
+                    @update:model-value="searchFn()"
+                    url="warehouses"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputDate
+                    :label="t('travel.landed')"
+                    v-model="params.landed"
+                    @update:model-value="searchFn()"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputTime
+                    v-model="params.landingHour"
+                    @update:model-value="searchFn()"
+                    :label="t('travel.landingHour')"
+                    outlined
+                    rounded
+                    dense
+                />
+                <VnInput
+                    :label="t('travel.totalEntries')"
+                    v-model="params.totalEntries"
+                    lazy-rules
+                    is-outlined
+                />
+            </div>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    travel:
+        Id: Contains
+        ref: Reference
+        agency: Agency
+        warehouseInFk: W. In
+        shipped: Shipped
+        shipmentHour: Shipment Hour
+        warehouseOut: W. Out
+        landed: Landed
+        landingHour: Landing Hour
+        totalEntries: Σ
+es:
+    travel:
+        Id: Id
+        ref: Referencia
+        agency: Agencia
+        warehouseInFk: Alm.Salida
+        shipped: F.Envío
+        shipmentHour: Hora de envío
+        warehouseOut: Alm.Entrada
+        landed: F.Entrega
+        landingHour: Hora de entrega
+        totalEntries: Σ
+</i18n>
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@ -9,6 +9,8 @@ import TravelSummary from './Card/TravelSummary.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import TravelFilter from './TravelFilter.vue';

 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
@ -24,6 +26,7 @@ const $props = defineProps({
 });
 const entityId = computed(() => $props.id || route.params.id);

+const travelFilterRef = ref();
 onMounted(async () => {
    stateStore.rightDrawer = true;
 });
@ -201,6 +204,11 @@ const columns = computed(() => [
        :label="t('Search travel')"
        data-key="TravelList"
    />
+    <RightMenu>
+        <template #right-panel>
+            <TravelFilter data-key="TravelList" ref="travelFilterRef" />
+        </template>
+    </RightMenu>
    <VnTable
        ref="tableRef"
        data-key="TravelList"
@ -213,6 +221,7 @@ const columns = computed(() => [
                editorFk: entityId,
            },
        }"
+        :right-search="false"
        :user-params="{ daysOnward: 7 }"
        order="landed DESC"
        :columns="columns"
@ -220,7 +229,6 @@ const columns = computed(() => [
        redirect="travel"
        :is-editable="false"
        :use-model="true"
-        chip-locale="travel.travelList.tableVisibleColumns"
    >
        <template #column-shipped="{ row }">
            <QBadge
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@ -239,6 +239,7 @@ async function autofillBic(worker) {
                    <VnInput v-model="data.name" :label="t('worker.create.webUser')" />
                    <VnInput
                        v-model="data.email"
+                        type="email"
                        :label="t('worker.create.personalEmail')"
                    />
                </VnRow>
@ -287,6 +288,7 @@ async function autofillBic(worker) {
                </VnRow>
                <VnRow>
                    <VnLocation
+                        :roles-allowed-to-create="['deliveryAssistant']"
                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                        :options="postcodesOptions"
                        @update:model-value="(location) => handleLocation(data, location)"
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@ -154,7 +154,7 @@ onMounted(() => {
            </div>
            <div
                v-if="excludeType === 'specificLocations'"
-                style="min-height: 60vh; overflow-y: scroll"
+                style="max-height: 60vh; overflow-y: scroll"
            >
                <ZoneLocationsTree
                    :root-label="t('eventsExclusionForm.rootTreeLabel')"
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@ -44,23 +44,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="dock_to_left"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
        <QScrollArea class="fit text-grey-8">
            <ZoneEventsPanel
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@ -1,7 +1,7 @@
 <script setup>
 import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
 import { useRoute } from 'vue-router';
-
+import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
@ -144,7 +144,8 @@ watch(storeData, async (val) => {
 });

 const reFetch = async () => {
-    await arrayData.fetch({ append: false });
+    const { data } = await arrayData.fetch({ append: false });
+    nodes.value = data;
 };

 onMounted(async () => {
@ -182,6 +183,16 @@ onUnmounted(() => {
 </script>

 <template>
+    <VnInput
+        v-if="showSearchBar"
+        v-model="store.userParams.search"
+        :placeholder="$t('globals.search')"
+        @update:model-value="reFetch()"
+    >
+        <template #prepend>
+            <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
+        </template>
+    </VnInput>
    <QTree
        ref="treeRef"
        :nodes="nodes"
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@ -87,7 +87,7 @@ eventsPanel:
    travelingDays: Días de viaje
    price: Precio
    bonus: Bonificación
-    m3Max: Meidida máxima
+    m3Max: Medida máxima
    everyday: Todos los días
    delete: Eliminar
    deleteTitle: Este elemento será eliminado
--- a/test/cypress/integration/vnComponent/UserPanel.spec.js
+++ b/test/cypress/integration/vnComponent/UserPanel.spec.js
@ -0,0 +1,58 @@
+/// <reference types="cypress" />
+describe('UserPanel', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit(`/#dashboard`);
+        cy.waitForElement('.q-page', 6000);
+    });
+
+    it('should notify when update user warehouse', () => {
+        const userWarehouse =
+            '.q-menu .q-gutter-xs > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native> .q-field__input';
+
+        // Abro el panel
+        cy.openUserPanel();
+
+        // Compruebo la opcion inicial
+        cy.get(userWarehouse).should('have.value', 'VNL').click();
+
+        // Actualizo la opción
+        getOption(3);
+
+        //Compruebo la notificación
+        cy.get('.q-notification').should('be.visible');
+        cy.get(userWarehouse).should('have.value', 'VNH');
+
+        //Restauro el valor
+        cy.get(userWarehouse).click();
+        getOption(2);
+    });
+    it('should notify when update user company', () => {
+        const userCompany =
+            '.q-menu .q-gutter-xs > :nth-child(2)  >  .q-field--float > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native> .q-field__input';
+
+        // Abro el panel
+        cy.openUserPanel();
+
+        // Compruebo la opcion inicial
+        cy.get(userCompany).should('have.value', 'Warehouse One').click();
+
+        //Actualizo la opción
+        getOption(2);
+
+        //Compruebo la notificación
+        cy.get('.q-notification').should('be.visible');
+        cy.get(userCompany).should('have.value', 'Warehouse Two');
+
+        //Restauro el valor
+        cy.get(userCompany).click();
+        getOption(1);
+    });
+});
+
+function getOption(index) {
+    cy.waitForElement('[role="listbox"]');
+    const option = `[role="listbox"] .q-item:nth-child(${index})`;
+    cy.get(option).click();
+}
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@ -3,25 +3,90 @@ describe('VnLocation', () => {
    const dialogInputs = '.q-dialog label input';
    const createLocationButton = '.q-form > .q-card > .vn-row:nth-child(6) .--add-icon';
    const inputLocation = '.q-form input[aria-label="Location"]';
+    const createForm = {
+        prefix: '.q-dialog__inner > .column > #formModel > .q-card',
+        sufix: ' .q-field__inner > .q-field__control',
+    };
+    describe('CreateFormDialog ', () => {
+        beforeEach(() => {
+            cy.viewport(1280, 720);
+            cy.login('developer');
+            cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
+            cy.waitForElement('.q-card');
+            cy.get(createLocationButton).click();
+        });
+        it('should filter provinces based on selected country', () => {
+            // Select a country
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
+                'Ecuador'
+            );
+            // Verify that provinces are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+
+            // Verify that towns are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+        });
+
+        it('should filter towns based on selected province', () => {
+            // Select a country
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
+                'Ecuador'
+            );
+            // Verify that provinces are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+
+            // Verify that towns are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+        });
+        it('should pass selected country', () => {
+            // Select a country
+            const country = 'Ecuador';
+            const province = 'Province five';
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
+                country
+            );
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
+                province
+            );
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) > .q-icon`
+            ).click();
+            cy.get(
+                `#q-portal--dialog--4 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
+            ).should('have.value', province);
+        });
+    });
    describe('Worker Create', () => {
        beforeEach(() => {
            cy.viewport(1280, 720);
            cy.login('developer');
            cy.visit('/#/worker/create', { timeout: 5000 });
            cy.waitForElement('.q-card');
+            cy.get(inputLocation).click();
        });
        it('Show all options', function () {
-            cy.get(inputLocation).click();
            cy.get(locationOptions).should('have.length.at.least', 5);
        });
        it('input filter location as "al"', function () {
-            cy.get(inputLocation).click();
+            // cy.get(inputLocation).click();
            cy.get(inputLocation).clear();
            cy.get(inputLocation).type('al');
            cy.get(locationOptions).should('have.length.at.least', 4);
        });
        it('input filter location as "ecuador"', function () {
-            cy.get(inputLocation).click();
+            // cy.get(inputLocation).click();
            cy.get(inputLocation).clear();
            cy.get(inputLocation).type('ecuador');
            cy.get(locationOptions).should('have.length.at.least', 1);
@ -63,13 +128,11 @@ describe('VnLocation', () => {
            cy.get(dialogInputs).eq(0).clear();
            cy.get(dialogInputs).eq(0).type(postCode);
            cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > .q-select > .q-field__inner > .q-field__control ',
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
                province
            );
            cy.get('.q-mt-lg > .q-btn--standard').click();
-            cy.get('.q-dialog__inner > .column > #formModel > .q-card').should(
-                'not.exist'
-            );
+            cy.get(`${createForm.prefix}`).should('not.exist');
            checkVnLocation(postCode, province);
        });
        it('Create city', () => {
@ -79,7 +142,7 @@ describe('VnLocation', () => {
            cy.get(dialogInputs).eq(0).type(postCode);
            // city create button
            cy.get(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > .q-select > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon'
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
            ).click();
            cy.selectOption('#q-portal--dialog--2 .q-select', 'one');
            cy.get('#q-portal--dialog--2 .q-input').type(province);
@ -89,9 +152,7 @@ describe('VnLocation', () => {
        });

        function checkVnLocation(postCode, province) {
-            cy.get('.q-dialog__inner > .column > #formModel > .q-card').should(
-                'not.exist'
-            );
+            cy.get(`${createForm.prefix}`).should('not.exist');
            cy.get('.q-form > .q-card > .vn-row:nth-child(6)')
                .find('input')
                .invoke('val')
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@ -248,3 +248,9 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
 Cypress.Commands.add('openActionsDescriptor', () => {
    cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
 });
+
+Cypress.Commands.add('openUserPanel', () => {
+    cy.get(
+        '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image'
+    ).click();
+});