Merge branch 'dev' into 7220_cypressUnitTest

2024-10-17 13:03:06 +02:00 · 2024-10-17 13:03:06 +02:00 · c69745b0fd
parent d00354553d 3069ac27d0
commit c69745b0fd
184 changed files with 5673 additions and 2777 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.40.0",
+    "version": "24.44.0",
    "description": "Salix frontend",
    "productName": "Salix",
    "author": "Verdnatura",
--- 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
@ -20,7 +20,7 @@ const customer = computed(() => state.get('customer'));
 const bankEntityFormData = reactive({
    name: null,
    bic: null,
-    countryFk: customer?.value?.countryFk,
+    countryFk: customer.value?.countryFk,
    id: null,
 });

@ -30,8 +30,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,5 +1,5 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';

 import FetchData from 'src/components/FetchData.vue';
@ -9,27 +9,35 @@ import VnInput from 'src/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 +49,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,225 @@
-<script setup></script>
+<script setup>
+import { reactive, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';

-<template><h1></h1></template>
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectProvince from 'src/components/VnSelectProvince.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import CreateNewCityForm from './CreateNewCityForm.vue';
+import VnSelectDialog from 'components/common/VnSelectDialog.vue';
+import FormModelPopup from './FormModelPopup.vue';

-<i18n lang="yml"></i18n>
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+
+const postcodeFormData = reactive({
+    code: null,
+    countryFk: null,
+    provinceFk: null,
+    townFk: null,
+});
+
+const townsFetchDataRef = ref(null);
+const provincesFetchDataRef = ref(null);
+const countriesOptions = ref([]);
+const provincesOptions = ref([]);
+const townsOptions = ref([]);
+const town = ref({});
+
+function onDataSaved(formData) {
+    const newPostcode = {
+        ...formData,
+    };
+    newPostcode.town = town.value.name;
+    newPostcode.townFk = town.value.id;
+    const provinceObject = provincesOptions.value.find(
+        ({ id }) => id === formData.provinceFk
+    );
+    newPostcode.province = provinceObject?.name;
+    const countryObject = countriesOptions.value.find(
+        ({ id }) => id === formData.countryFk
+    );
+    newPostcode.country = countryObject?.name;
+    emit('onDataSaved', newPostcode);
+}
+
+async function onCityCreated(newTown, formData) {
+    await provincesFetchDataRef.value.fetch();
+    newTown.province = provincesOptions.value.find(
+        (province) => province.id === newTown.provinceFk
+    );
+    formData.townFk = newTown;
+    setTown(newTown, formData);
+}
+
+function setTown(newTown, data) {
+    if (!newTown) return;
+    town.value = newTown;
+    data.provinceFk = newTown.provinceFk;
+    data.countryFk = newTown.province.countryFk;
+}
+
+async function setProvince(id, data) {
+    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="handleProvinces"
+        auto-load
+        url="Provinces/location"
+    />
+    <FetchData
+        ref="townsFetchDataRef"
+        @on-fetch="handleTowns"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData @on-fetch="handleCountries" auto-load url="Countries" />
+    <FormModelPopup
+        url-create="postcodes"
+        model="postcode"
+        :title="t('New postcode')"
+        :subtitle="t('Please, ensure you put the correct data!')"
+        :form-initial-data="postcodeFormData"
+        :mapper="(data) => (data.townFk = data.townFk.id) && data"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data, validate }">
+            <VnRow>
+                <VnInput
+                    :label="t('Postcode')"
+                    v-model="data.code"
+                    :rules="validate('postcode.code')"
+                    clearable
+                />
+                <VnSelectDialog
+                    :label="t('City')"
+                    @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="true"
+                >
+                    <template #option="{ itemProps, opt }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ opt.name }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ opt.province.name }},
+                                    {{ opt.province.country.name }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                    <template #form>
+                        <CreateNewCityForm
+                            :country-fk="data.countryFk"
+                            :province-selected="data.provinceFk"
+                            :provinces="provincesOptions"
+                            @on-data-saved="
+                                (_, requestResponse) =>
+                                    onCityCreated(requestResponse, data)
+                            "
+                        />
+                    </template>
+                </VnSelectDialog>
+            </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')"
+                    :options="countriesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.countryFk"
+                    :rules="validate('postcode.countryFk')"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<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
+    Country: País
+    Postcode: Código postal
+</i18n>
--- 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/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/CrudModel.vue
+++ b/src/components/CrudModel.vue
@ -234,6 +234,8 @@ async function remove(data) {
                newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                fetch(newData);
            });
+    } else {
+        reset();
    }
    emit('update:selected', []);
 }
--- 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
@ -78,9 +78,9 @@ async function saveDarkMode(value) {
            darkMode: value,
        });
        user.value.darkMode = value;
-        notify('globals.dataSaved', 'positive');
+        onDataSaved();
    } catch (error) {
-        console.error(error);
+        onDataError();
    }
 }

@ -91,9 +91,9 @@ async function saveLanguage(value) {
            lang: value,
        });
        user.value.lang = value;
-        notify('globals.dataSaved', 'positive');
+        onDataSaved();
    } catch (error) {
-        console.error(error);
+        onDataError();
    }
 }

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

-function saveUserData(param, value) {
+async function saveUserData(param, value) {
    try {
-        axios.post('UserConfigs/setUserConfig', { [param]: value });
+        await axios.post('UserConfigs/setUserConfig', { [param]: value });
        localUserData();
-        notify('globals.dataSaved', 'positive');
+        onDataSaved();
    } catch (error) {
-        console.error(error);
+        onDataError();
    }
 }

 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 'src/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 lang="yml">
 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 'src/components/common/VnInputDate.vue';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
 import VnTableColumn from 'src/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 'src/components/FormModelPopup.vue';

 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnTableColumn from 'src/components/VnTable/VnColumn.vue';
-import VnTableFilter from 'src/components/VnTable/VnFilter.vue';
+import VnFilter from 'src/components/VnTable/VnFilter.vue';
 import VnTableChip from 'src/components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
@ -53,6 +53,10 @@ const $props = defineProps({
        type: Boolean,
        default: true,
    },
+    bottom: {
+        type: Object,
+        default: null,
+    },
    cardClass: {
        type: String,
        default: 'flex-one',
@ -69,7 +73,6 @@ const $props = defineProps({
        type: Boolean,
        default: false,
    },
-
    hasSubToolbar: {
        type: Boolean,
        default: null,
@ -98,10 +101,18 @@ const $props = defineProps({
        type: String,
        default: '90vh',
    },
+    chipLocale: {
+        type: String,
+        default: null,
+    },
    footer: {
        type: Boolean,
        default: false,
    },
+    disabledAttr: {
+        type: Boolean,
+        default: false,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@ -122,6 +133,7 @@ const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
+const tableFilterRef = ref([]);

 const tableModes = [
    {
@ -147,7 +159,7 @@ onMounted(() => {
        quasar.platform.is.mobile && !$props.disableOption?.card
            ? CARD_MODE
            : $props.defaultMode;
-    stateStore.rightDrawer = true;
+    stateStore.rightDrawer = quasar.screen.gt.xs;
    columnsVisibilitySkipped.value = [
        ...splittedColumns.value.columns
            .filter((c) => c.visible == false)
@ -224,7 +236,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
@ -306,7 +318,7 @@ defineExpose({
 });

 function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved(this);
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
    else $props.create.onDataSaved(_);
 }
 </script>
@ -326,6 +338,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
@ -335,7 +354,8 @@ function handleOnDataSaved(_) {
                        )"
                        :key="col.id"
                    >
-                        <VnTableFilter
+                        <VnFilter
+                            ref="tableFilterRef"
                            :column="col"
                            :data-key="$attrs['data-key']"
                            v-model="params[columnName(col)]"
@ -359,10 +379,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'"
@ -420,7 +445,7 @@ function handleOnDataSaved(_) {
                    <QBtn
                        v-if="$props.rightSearch"
                        icon="filter_alt"
-                        class="bg-vn-section-color q-ml-md"
+                        class="bg-vn-section-color q-ml-sm"
                        dense
                        @click="stateStore.toggleRightDrawer()"
                    />
@ -442,7 +467,7 @@ function handleOnDataSaved(_) {
                                    :search-url="searchUrl"
                                />
                            </div>
-                            <VnTableFilter
+                            <VnFilter
                                v-if="$props.columnSearch"
                                :column="col"
                                :show-title="true"
@ -472,6 +497,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) =>
@ -500,6 +526,7 @@ function handleOnDataSaved(_) {
                        :class="getColAlign(col)"
                        class="sticky no-padding"
                        @click="stopEventPropagation($event)"
+                        :style="col.style"
                    >
                        <QBtn
                            v-for="(btn, index) of col.actions"
@ -507,8 +534,12 @@ function handleOnDataSaved(_) {
                            :key="index"
                            :title="btn.title"
                            :icon="btn.icon"
-                            class="q-px-sm text-primary-light"
+                            class="q-pa-xs"
                            flat
+                            dense
+                            :class="
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
+                            "
                            :style="`visibility: ${
                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
                            }`"
@ -516,6 +547,29 @@ function handleOnDataSaved(_) {
                        />
                    </QTd>
                </template>
+                <template #bottom v-if="bottom">
+                    <slot name="bottom-table">
+                        <QBtn
+                            @click="
+                                () =>
+                                    createAsDialog
+                                        ? (showForm = !showForm)
+                                        : handleOnDataSaved(create)
+                            "
+                            class="cursor-pointer fill-icon"
+                            color="primary"
+                            icon="add_circle"
+                            size="md"
+                            round
+                            flat
+                            shortcut="+"
+                            :disabled="!disabledAttr"
+                        />
+                        <QTooltip>
+                            {{ createForm.title }}
+                        </QTooltip>
+                    </slot>
+                </template>
                <template #item="{ row, colsMap }">
                    <component
                        :is="$props.redirect ? 'router-link' : 'span'"
@ -632,25 +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"
+                            :class="getColAlign(col)"
                        >
-                            <div
-                                v-if="col?.summation"
-                                :class="`text-${col?.align ?? 'left'}`"
-                                class="text-bold q-pa-sm"
-                            >
-                                {{
-                                    rows.reduce(
-                                        (sum, currentRow) => sum + currentRow[col.name],
-                                        0
-                                    )
-                                }}
-                            </div>
+                            <slot :name="`column-footer-${col.name}`" />
                        </QTh>
                    </QTr>
                </template>
@ -668,7 +712,7 @@ function handleOnDataSaved(_) {
            icon="add"
            shortcut="+"
        />
-        <QTooltip>
+        <QTooltip self="top right">
            {{ createForm?.title }}
        </QTooltip>
    </QPageSticky>
@ -729,16 +773,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));
@ -767,10 +801,16 @@ es:
    }
 }

-.q-table th {
-    padding: 0;
-}
+.q-table {
+    th {
+        padding: 0;
+    }

+    &__top {
+        padding: 12px 0px;
+        top: 0;
+    }
+}
 .vnTable {
    thead tr th {
        position: sticky;
@ -806,6 +846,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 {
@ -851,4 +900,12 @@ es:
    cursor: text;
    user-select: all;
 }
+
+.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/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@ -135,7 +135,7 @@ onMounted(async () => {
 });
 </script>
 <template>
-    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md q-px-sm" dense>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-sm q-px-sm" dense>
        <QPopupProxy ref="popupProxyRef">
            <QCard class="column q-pa-md">
                <QIcon name="info" size="sm" class="info-icon">
--- 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/VnInput.vue
+++ b/src/components/common/VnInput.vue
@ -103,6 +103,7 @@ const mixinRules = [
                    @click="
                        () => {
                            value = null;
+                            vnInputRef.focus();
                            emit('remove');
                        }
                    "
--- 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({
@ -20,6 +21,7 @@ const { validations } = useValidator();

 const { t } = useI18n();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const vnInputDateRef = ref(null);

 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
@ -86,11 +88,17 @@ const styleAttrs = computed(() => {
          }
        : {};
 });
+
+const manageDate = (date) => {
+    formattedDate.value = date;
+    isPopupOpen.value = false;
+};
 </script>

 <template>
    <div @mouseover="hover = true" @mouseleave="hover = false">
        <QInput
+            ref="vnInputDateRef"
            v-model="formattedDate"
            class="vn-input-date"
            :mask="mask"
@ -113,6 +121,7 @@ const styleAttrs = computed(() => {
                        !$attrs.disable
                    "
                    @click="
+                        vnInputDateRef.focus();
                        model = null;
                        isPopupOpen = false;
                    "
@ -126,6 +135,7 @@ const styleAttrs = computed(() => {
                />
            </template>
            <QMenu
+                v-if="$q.screen.gt.xs"
                transition-show="scale"
                transition-hide="scale"
                v-model="isPopupOpen"
@ -134,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 });
@ -16,6 +18,7 @@ const props = defineProps({
        default: false,
    },
 });
+const vnInputTimeRef = ref(null);
 const initialDate = ref(model.value ?? Date.vnNew());
 const { t } = useI18n();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
@ -69,6 +72,7 @@ function dateToTime(newDate) {
 <template>
    <div @mouseover="hover = true" @mouseleave="hover = false">
        <QInput
+            ref="vnInputTimeRef"
            class="vn-input-time"
            mask="##:##"
            placeholder="--:--"
@ -92,6 +96,7 @@ function dateToTime(newDate) {
                        !$attrs.disable
                    "
                    @click="
+                        vnInputTimeRef.focus();
                        model = null;
                        isPopupOpen = false;
                    "
@ -104,6 +109,7 @@ function dateToTime(newDate) {
                />
            </template>
            <QMenu
+                v-if="$q.screen.gt.xs"
                transition-show="scale"
                transition-hide="scale"
                v-model="isPopupOpen"
@ -112,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 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
@ -72,4 +105,12 @@ const handleModelValue = (data) => {
 }
 </style>

-<i18n lang="yml"></i18n>
+<i18n lang="yml">
+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/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@ -2,6 +2,7 @@
 import { useStateStore } from 'src/stores/useStateStore';
 import LeftMenu from 'src/components/LeftMenu.vue';
 import { onMounted } from 'vue';
+import { useQuasar } from 'quasar';

 const stateStore = useStateStore();
 const $props = defineProps({
@ -10,7 +11,9 @@ const $props = defineProps({
        default: true,
    },
 });
-onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
+onMounted(
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
+);
 </script>

 <template>
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@ -38,6 +38,10 @@ const $props = defineProps({
        type: [Array],
        default: () => [],
    },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
    isClearable: {
        type: Boolean,
        default: true,
@ -183,6 +187,7 @@ async function fetchFilter(val) {
        }, {});
    } else defaultWhere = { [key]: getVal(val) };
    const where = { ...(val ? defaultWhere : {}), ...$props.where };
+    $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
    const fetchOptions = { where, include, limit };
    if (fields) fetchOptions.fields = fields;
    if (sortBy) fetchOptions.order = sortBy;
@ -226,6 +231,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/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@ -47,6 +47,7 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+const menuRef = ref();
 defineExpose({ getData });

 onBeforeMount(async () => {
@ -170,7 +171,7 @@ const toModule = computed(() =>
                    <QTooltip>
                        {{ t('components.cardDescriptor.moreOptions') }}
                    </QTooltip>
-                    <QMenu ref="menuRef">
+                    <QMenu :ref="menuRef">
                        <QList>
                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                        </QList>
--- 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 'src/composables/useArrayData';
 import { useRoute } from 'vue-router';
-import { date } from 'quasar';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'src/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 'src/components/ui/VnPaginate.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnInput from 'src/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,29 +73,42 @@ 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"
-                type="textarea"
-                :label="t('Add note here...')"
-                filled
-                size="lg"
-                autogrow
-                autofocus
-                @keyup="handleKeyUp"
-                clearable
-            >
-                <template #append>
-                    <QBtn
-                        :title="t('Save (Enter)')"
-                        icon="save"
-                        color="primary"
-                        flat
-                        @click="insert"
-                    />
-                </template>
-            </QInput>
+        <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
+                    @keyup.enter.stop="insert"
+                    clearable
+                    :required="true"
+                >
+                    <template #append>
+                        <QBtn
+                            :title="t('Save (Enter)')"
+                            icon="save"
+                            color="primary"
+                            flat
+                            @click="insert"
+                            class="q-mb-xs"
+                            dense
+                        />
+                    </template>
+                </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">
-                            <VnUserLink
-                                :name="`${note.worker.user.nickname}`"
-                                :worker-id="note.worker.id"
-                            />
-                            {{ toDateHourMin(note.created) }}
+                            <div>
+                                <VnUserLink
+                                    :name="`${note.worker.user.nickname}`"
+                                    :worker-id="note.worker.id"
+                                />
+                                <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,10 +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 lang="yml">
 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 });
 };
@ -131,9 +130,8 @@ async function fetch(params) {
    useArrayData(props.dataKey, params);
    arrayData.reset(['filter.skip', 'skip']);
    await arrayData.fetch({ append: false });
-    if (!store.hasMoreData) {
-        isLoading.value = false;
-    }
+    if (!store.hasMoreData) isLoading.value = false;
+
    emit('onFetch', store.data);
    return store.data;
 }
--- 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/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@ -24,7 +24,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;
        }
@ -111,7 +112,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/composables/usePrintService.js
+++ b/src/composables/usePrintService.js
@ -1,15 +1,18 @@
 import { useSession } from './useSession';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';

 export function usePrintService() {
    const quasar = useQuasar();
+    const { t } = useI18n();
+
    const { getTokenMultimedia } = useSession();

    function sendEmail(path, params) {
        return axios.post(path, params).then(() =>
            quasar.notify({
-                message: 'Notification sent',
+                message: t('globals.notificationSent'),
                type: 'positive',
                icon: 'check',
            })
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@ -36,7 +36,6 @@ $color-font-secondary: #777;
 .bg-success {
    background-color: $positive;
 }
-
 .bg-notice {
    background-color: $info;
 }
--- 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,8 @@ globals:
        clientsActionsMonitor: Clients and actions
        serial: Serial
        medical: Mutual
+        RouteExtendedList: Router
+        wasteRecalc: Waste recaclulate
    supplier: Supplier
    created: Created
    worker: Worker
@ -288,7 +292,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 +303,19 @@ globals:
        from: From
        To: To
        stateFk: State
+        departmentFk: Department
+        email: Email
+        SSN: SSN
+        fi: FI
+    changePass: Change password
+    deleteConfirmTitle: Delete selected elements
 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:
@ -495,6 +509,8 @@ ticket:
        warehouse: Warehouse
        customerCard: Customer card
        alias: Alias
+        ticketList: Ticket List
+        newOrder: New Order
    boxing:
        expedition: Expedition
        item: Item
@ -516,6 +532,7 @@ ticket:
        landed: Landed
        consigneePhone: Consignee phone
        consigneeMobile: Consignee mobile
+        consigneeAddress: Consignee address
        clientPhone: Client phone
        clientMobile: Client mobile
        consignee: Consignee
@ -545,6 +562,11 @@ ticket:
        weight: Weight
        goTo: Go to
        summaryAmount: Summary
+        purchaseRequest: Purchase request
+        service: Service
+        description: Description
+        attender: Attender
+        ok: Ok
    create:
        client: Client
        address: Address
@ -568,7 +590,6 @@ invoiceOut:
        client: Client
        company: Company
        customerCard: Customer card
-        ticketList: Ticket List
    summary:
        issued: Issued
        created: Created
@ -794,14 +815,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
@ -858,34 +879,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
@ -901,6 +895,7 @@ supplier:
            account: Account
            payMethod: Pay Method
            payDay: Pay Day
+            country: Country
    summary:
        responsible: Responsible
        notes: Notes
@ -999,6 +994,7 @@ travel:
            warehouseOut: Warehouse out
            totalEntries: Total entries
            totalEntriesTooltip: Total entries
+            daysOnward: Landed days onwards
    summary:
        confirmed: Confirmed
        entryId: Entry Id
@ -1074,7 +1070,7 @@ item:
        producer: Producer
        landed: Landed
    fixedPrice:
-        itemId: Item ID
+        itemFk: Item ID
        groupingPrice: Grouping price
        packingPrice: Packing price
        hasMinPrice: Has min price
--- 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
@ -63,7 +64,7 @@ globals:
    shipped: F. envío
    totalEntries: Ent. totales
    amount: Importe
-    packages: Bultos
+    packages: Embalajes
    download: Descargar
    downloadPdf: Descargar PDF
    selectRows: 'Seleccionar las { numberRows } filas(s)'
@ -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
@ -162,6 +164,7 @@ globals:
        dms: Gestión documental
        entryCreate: Nueva entrada
        latestBuys: Últimas compras
+        reserves: Reservas
        tickets: Tickets
        ticketCreate: Nuevo ticket
        boxing: Encajado
@ -210,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
@ -266,7 +270,7 @@ globals:
        tracking: Estados
        components: Componentes
        pictures: Fotos
-        packages: Bultos
+        packages: Embalajes
        ldap: LDAP
        samba: Samba
        twoFactor: Doble factor
@ -276,6 +280,7 @@ globals:
        clientsActionsMonitor: Clientes y acciones
        serial: Facturas por serie
        medical: Mutua
+        wasteRecalc: Recalcular mermas
    supplier: Proveedor
    created: Fecha creación
    worker: Trabajador
@ -291,7 +296,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
@ -299,12 +307,19 @@ globals:
        from: Desde
        To: Hasta
        stateFk: Estado
+        departmentFk: Departamento
+        email: Correo
+        SSN: NSS
+        fi: NIF
+    changePass: Cambiar contraseña
+    deleteConfirmTitle: Eliminar los elementos seleccionados
 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:
@ -485,7 +500,7 @@ ticket:
        tracking: Estados
        components: Componentes
        pictures: Fotos
-        packages: Bultos
+        packages: Embalajes
    list:
        nickname: Alias
        state: Estado
@ -503,6 +518,8 @@ ticket:
        warehouse: Almacén
        customerCard: Ficha del cliente
        alias: Alias
+        ticketList: Listado de tickets
+        newOrder: Nuevo pedido
    boxing:
        expedition: Expedición
        item: Artículo
@ -524,6 +541,7 @@ ticket:
        landed: Entregado
        consigneePhone: Tel. consignatario
        consigneeMobile: Móv. consignatario
+        consigneeAddress: Dir. consignatario
        clientPhone: Tel. cliente
        clientMobile: Móv. cliente
        consignee: Consignatario
@ -553,6 +571,10 @@ ticket:
        weight: Peso
        goTo: Ir a
        summaryAmount: Resumen
+        purchaseRequest: Petición de compra
+        service: Servicio
+        description: Descripción
+        attender: Consignatario
    create:
        client: Cliente
        address: Dirección
@ -855,21 +877,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
@ -885,6 +892,7 @@ supplier:
            account: Cuenta
            payMethod: Método de pago
            payDay: Dia de pago
+            country: País
    summary:
        responsible: Responsable
        notes: Notas
@ -983,6 +991,7 @@ travel:
            warehouseOut: Alm.entrada
            totalEntries: ∑
            totalEntriesTooltip: Entradas totales
+            daysOnward: Días de llegada en adelante
    summary:
        confirmed: Confirmado
        entryId: Id entrada
@ -1058,7 +1067,7 @@ item:
        producer: Productor
        landed: F. entrega
    fixedPrice:
-        itemId: ID Artículo
+        itemFk: ID Artículo
        groupingPrice: Precio grouping
        packingPrice: Precio packing
        hasMinPrice: Tiene precio mínimo
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -5,11 +5,14 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSearchbar from 'src/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 'src/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/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@ -16,7 +16,7 @@ import { useVnConfirm } from 'src/composables/useVnConfirm';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnFilter from 'src/components/VnTable/VnFilter.vue';
+import VnSelect from 'src/src/components/common/VnSelect.vue';

 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
@ -33,9 +33,9 @@ const stateStore = useStateStore();
 const user = state.getUser();

 const clientRisk = ref([]);
+const companies = ref([]);
 const tableRef = ref();
 const companyId = ref(user.value.companyFk);
-const companyLastId = ref(user.value.companyFk);
 const balances = ref([]);
 const vnFilterRef = ref({});
 const filter = computed(() => {
@ -45,33 +45,6 @@ const filter = computed(() => {
    };
 });

-const companyFilterColumn = {
-    align: 'left',
-    name: 'companyId',
-    label: t('Company'),
-    component: 'select',
-    attrs: {
-        url: 'Companies',
-        optionLabel: 'code',
-        sortBy: 'code',
-        limit: 0,
-    },
-    columnFilter: {
-        event: {
-            remove: () => (companyId.value = null),
-            'update:modelValue': (newCompanyFk) => {
-                if (!newCompanyFk) return;
-                vnFilterRef.value.addFilter(newCompanyFk);
-                companyLastId.value = newCompanyFk;
-            },
-            blur: () =>
-                !companyId.value &&
-                (companyId.value = companyLastId.value ?? user.value.companyFk),
-        },
-    },
-    visible: false,
-};
-
 const columns = computed(() => [
    {
        align: 'right',
@ -166,6 +139,11 @@ onBeforeMount(() => {
 });

 async function getCurrentBalance(data) {
+    currentBalance.value[companyId.value] = {
+        amount: 0,
+        code: companies.value.find((c) => c.id === companyId.value)?.code,
+    };
+
    for (const balance of data) {
        currentBalance.value[balance.companyFk] = {
            code: balance.company.code,
@ -192,14 +170,21 @@ const showBalancePdf = ({ id }) => {

 <template>
    <FetchData
+        url="Companies"
+        auto-load
+        @on-fetch="(data) => (companies = data)"
+    ></FetchData>
+    <FetchData
+        v-if="companies.length > 0"
        url="clientRisks"
        :filter="{
            include: { relation: 'company', scope: { fields: ['code'] } },
-            where: { clientFk: route.params.id, companyFk: companyId },
+            where: { clientFk: route.params.id },
        }"
        auto-load
        @on-fetch="getCurrentBalance"
    ></FetchData>
+
    <VnSubToolbar class="q-mb-md">
        <template #st-data>
            <div class="column justify-center q-px-md q-py-sm">
@ -212,13 +197,15 @@ const showBalancePdf = ({ id }) => {
        </template>
        <template #st-actions>
            <div>
-                <VnFilter
+                <VnSelect
+                    :label="t('Company')"
                    ref="vnFilterRef"
                    v-model="companyId"
                    data-key="CustomerBalance"
-                    :column="companyFilterColumn"
-                    search-url="balance"
-                />
+                    :options="companies"
+                    option-label="code"
+                    option-value="id"
+                ></VnSelect>
            </div>
        </template>
    </VnSubToolbar>
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@ -16,6 +16,20 @@ const { t } = useI18n();
 const businessTypes = ref([]);
 const contactChannels = ref([]);
 const title = ref();
+const handleSalesModelValue = (val) => ({
+    or: [
+        { id: val },
+        { name: val },
+        { nickname: { like: '%' + val + '%' } },
+        { code: { like: `${val}%` } },
+    ],
+});
+
+const exprBuilder = (param, value) => {
+    return {
+        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
+    };
+};
 </script>
 <template>
    <FetchData
@ -34,7 +48,7 @@ const title = ref();
            <VnRow>
                <VnInput
                    :label="t('globals.name')"
-                    :rules="validate('client.socialName')"
+                    :rules="validate('client.name')"
                    autofocus
                    clearable
                    v-model="data.name"
@ -98,8 +112,10 @@ const title = ref();
                    }"
                    :fields="['id', 'nickname']"
                    sort-by="nickname ASC"
+                    option-label="nickname"
+                    option-value="id"
                    :rules="validate('client.salesPersonFk')"
-                    :use-like="false"
+                    :expr-builder="exprBuilder"
                    emit-value
                    auto-load
                >
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@ -0,0 +1,177 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import { QItem } from 'quasar';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import { QItemSection } from 'quasar';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { toDate } from 'src/filters';
+
+const { t } = useI18n();
+defineProps({ dataKey: { type: String, required: true } });
+</script>
+<template>
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.item')"
+                        v-model="params.itemId"
+                        is-outlined
+                        lazy-rules
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.buyerId"
+                        url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
+                        :label="t('params.buyer')"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.typeId"
+                        url="ItemTypes"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
+                        :label="t('params.typeId')"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.categoryId"
+                        url="ItemCategories"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
+                        :label="t('params.categoryId')"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.campaignId"
+                        url="Campaigns/latest"
+                        sort-by="dated DESC"
+                        :label="t('params.campaignId')"
+                        option-label="code"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        t(`params.${scope.opt?.code}`)
+                                    }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        toDate(scope.opt.dated)
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        v-model="params.from"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        v-model="params.to"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+en:
+    params:
+        item: Item id
+        buyer: Buyer
+        type: Type
+        category: Category
+        itemId: Item id
+        buyerId: Buyer
+        typeId: Type
+        categoryId: Category
+        from: From
+        to: To
+        campaignId: Campaña
+        valentinesDay: Valentine's Day
+        mothersDay: Mother's Day
+        allSaints: All Saints' Day
+es:
+    params:
+        item: Id artículo
+        buyer: Comprador
+        type: Tipo
+        category: Categoría
+        itemId: Id Artículo
+        buyerId: Comprador
+        typeId: Tipo
+        categoryId: Reino
+        from: Desde
+        to: Hasta
+        campaignId: Campaña
+        valentinesDay: Día de San Valentín
+        mothersDay: Día de la Madre
+        allSaints: Día de Todos los Santos
+</i18n>
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@ -190,6 +190,18 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                >
                    <QTooltip>{{ t('Go to user') }}</QTooltip>
                </QBtn>
+                <QBtn
+                    v-if="entity.supplier"
+                    :to="{
+                        name: 'SupplierSummary',
+                        params: { id: entity.supplier.id },
+                    }"
+                    size="md"
+                    icon="vn:supplier"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Go to supplier') }}</QTooltip>
+                </QBtn>
            </QCardActions>
        </template>
    </CardDescriptor>
@ -204,6 +216,7 @@ es:
    Customer ticket list: Listado de tickets del cliente
    Customer invoice out list: Listado de facturas del cliente
    Go to user: Ir al usuario
+    Go to supplier: Ir al proveedor
    Customer unpaid: Cliente impago
    Unpaid: Impagado
    unpaidDated: 'Fecha {dated}'
--- 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)"
@ -134,15 +135,17 @@ function handleLocation(data, location) {
                        </QTooltip>
                    </QIcon>
                </div>
-                <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
            </VnRow>

            <VnRow>
                <QCheckbox
                    :label="t('Electronic invoice')"
                    v-model="data.hasElectronicInvoice"
+                /><QCheckbox
+                    :label="t('Verified data')"
+                    v-model="data.isTaxDataChecked"
                />
-                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
            </VnRow>
        </template>
    </FormModel>
--- 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 'src/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,14 +56,24 @@ 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 lang="yml">
@ -85,5 +82,4 @@ es:
    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/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@ -1,5 +1,4 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';

 import FetchData from 'src/components/FetchData.vue';
@ -8,28 +7,16 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';

 const { t } = useI18n();
-const props = defineProps({
+defineProps({
    dataKey: {
        type: String,
        required: true,
    },
 });
-
-const provinces = ref();
-const workers = ref();
-const zones = ref();
 </script>

 <template>
-    <FetchData url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load />
-    <FetchData url="Zones" @on-fetch="(data) => (zones = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
        <template #tags="{ tag, formatFn }">
            <div class="q-gutter-x-xs">
                <strong>{{ t(`params.${tag.label}`) }}: </strong>
@ -65,15 +52,14 @@ const zones = ref();
                </QItemSection>
            </QItem>
            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
+                <QItemSection>
                    <VnSelect
+                        url="Workers/activeWithInheritedRole"
+                        :filter="{ where: { role: 'salesPerson' } }"
+                        auto-load
                        :label="t('Salesperson')"
                        v-model="params.salesPersonFk"
                        @update:model-value="searchFn()"
-                        :options="workers"
                        option-value="id"
                        option-label="name"
                        emit-value
@ -88,15 +74,12 @@ const zones = ref();
                </QItemSection>
            </QItem>
            <QItem class="q-mb-sm">
-                <QItemSection v-if="!provinces">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="provinces">
-                    <VnSelect
+                <QItemSection
+                    ><VnSelect
+                        url="Provinces"
                        :label="t('Province')"
                        v-model="params.provinceFk"
                        @update:model-value="searchFn()"
-                        :options="provinces"
                        option-value="id"
                        option-label="name"
                        emit-value
@ -105,6 +88,7 @@ const zones = ref();
                        dense
                        outlined
                        rounded
+                        auto-load
                        :input-debounce="0"
                    />
                </QItemSection>
@ -135,25 +119,21 @@ const zones = ref();
                    </QItemSection>
                </QItem>
                <QItem>
-                    <QItemSection v-if="!zones">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="zones">
-                        <VnSelect
-                            :label="t('Zone')"
-                            v-model="params.zoneFk"
-                            @update:model-value="searchFn()"
-                            :options="zones"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
+                    <VnSelect
+                        url="Zones"
+                        :label="t('Zone')"
+                        v-model="params.zoneFk"
+                        @update:model-value="searchFn()"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        auto-load
+                    />
                </QItem>
                <QItem>
                    <QItemSection>
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@ -8,10 +8,10 @@ import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import RightMenu from 'src/components/common/RightMenu.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-
 import { toDate } from 'src/filters';
+import CustomerFilter from './CustomerFilter.vue';

 const { t } = useI18n();
 const router = useRouter();
@ -397,6 +397,11 @@ function handleLocation(data, location) {
        :label="t('Search customer')"
        data-key="Customer"
    />
+    <RightMenu>
+        <template #right-panel>
+            <CustomerFilter data-key="Customer" />
+        </template>
+    </RightMenu>
    <VnTable
        ref="tableRef"
        data-key="Customer"
@ -413,6 +418,7 @@ function handleLocation(data, location) {
        order="id DESC"
        :columns="columns"
        redirect="customer"
+        :right-search="false"
        auto-load
    >
        <template #more-create-dialog="{ data }">
--- 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/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@ -134,6 +134,7 @@ function handleLocation(data, location) {
                    option-label="fiscalName"
                    option-value="id"
                    v-model="data.customsAgentFk"
+                    :tooltip="t('Create a new expense')"
                >
                    <template #form>
                        <CustomerNewCustomsAgent @on-data-saved="refreshData()" />
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@ -11,7 +11,7 @@ import VnRow from 'src/components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';

 const { t } = useI18n();
 const route = useRoute();
@ -226,9 +226,10 @@ function handleLocation(data, location) {
                        option-label="fiscalName"
                        option-value="id"
                        v-model="data.customsAgentFk"
+                        :tooltip="t('New customs agent')"
                    >
                        <template #form>
-                            <CustomsNewCustomsAgent />
+                            <CustomerNewCustomsAgent />
                        </template>
                    </VnSelectDialog>
                </div>
@ -239,39 +240,33 @@ 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"
-                        hide-selected
-                        option-label="description"
-                        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
-                        @click.stop="deleteNote(note.id, index)"
-                        class="cursor-pointer"
-                        color="primary"
-                        name="delete"
-                        size="sm"
-                    >
-                        <QTooltip>
-                            {{ t('Remove note') }}
-                        </QTooltip>
-                    </QIcon>
-                </div>
+                <VnSelect
+                    :label="t('Observation type')"
+                    :options="observationTypes"
+                    hide-selected
+                    option-label="description"
+                    option-value="id"
+                    v-model="note.observationTypeFk"
+                />
+                <VnInput
+                    :label="t('Description')"
+                    :rules="validate('route.description')"
+                    clearable
+                    v-model="note.description"
+                />
+                <QIcon
+                    :style="{ flex: 0, 'align-self': $q.screen.gt.xs ? 'end' : 'center' }"
+                    @click.stop="deleteNote(note.id, index)"
+                    class="cursor-pointer"
+                    color="primary"
+                    name="delete"
+                    size="sm"
+                >
+                    <QTooltip>
+                        {{ t('Remove note') }}
+                    </QTooltip>
+                </QIcon>
            </VnRow>
-
            <QBtn
                @click.stop="addNote()"
                class="cursor-pointer add-icon q-mt-md"
@ -309,6 +304,7 @@ es:
    Mobile: Movíl
    Incoterms: Incoterms
    Customs agent: Agente de aduanas
+    New customs agent: Nuevo agente de aduanas
    Notes: Notas
    Observation type: Tipo de observación
    Description: Descripción
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ b/src/pages/Customer/components/CustomerChangePassword.vue
@ -1,139 +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 'src/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);
-        await $props.promise();
-    } 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 lang="yml">
-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/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@ -58,7 +58,7 @@ customer:
        vies: VIES
        payMethod: Método de pago
        bankAccount: Cuenta bancaria
-        dueDay: Día de pago
+        dueDay: Vencimiento
        hasLcr: Recibido LCR
        hasCoreVnl: Recibido core VNL
        hasB2BVnl: Recibido B2B VNL
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@ -1,5 +1,4 @@
 <script setup>
-import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';

@ -11,17 +10,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 +52,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 +62,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
@ -10,6 +10,7 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';

 const route = useRoute();
 const { t } = useI18n();
@ -163,7 +164,7 @@ const fetchEntryBuys = async () => {
    >
        <template #header-left>
            <router-link
-                v-if="route.name !== 'EntrySummary'"
+                v-if="route?.name !== 'EntrySummary'"
                :to="{ name: 'EntrySummary', params: { id: entityId } }"
                class="header link"
                :href="entryUrl"
@ -184,7 +185,10 @@ const fetchEntryBuys = async () => {
                    <QIcon name="open_in_new" />
                </router-link>
                <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
-                <VnLv :label="t('entry.summary.currency')" :value="entry.currency.name" />
+                <VnLv
+                    :label="t('entry.summary.currency')"
+                    :value="entry.currency?.name"
+                />
                <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
                <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
                <VnLv
@ -210,12 +214,12 @@ const fetchEntryBuys = async () => {
                </VnLv>
                <VnLv
                    :label="t('entry.summary.travelAgency')"
-                    :value="entry.travel.agency.name"
+                    :value="entry.travel.agency?.name"
                />
                <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
                <VnLv
                    :label="t('entry.summary.travelWarehouseOut')"
-                    :value="entry.travel.warehouseOut.name"
+                    :value="entry.travel.warehouseOut?.name"
                />
                <QCheckbox
                    :label="t('entry.summary.travelDelivered')"
@ -225,7 +229,7 @@ const fetchEntryBuys = async () => {
                <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
                <VnLv
                    :label="t('entry.summary.travelWarehouseIn')"
-                    :value="entry.travel.warehouseIn.name"
+                    :value="entry.travel.warehouseIn?.name"
                />
                <QCheckbox
                    :label="t('entry.summary.travelReceived')"
@ -281,17 +285,17 @@ const fetchEntryBuys = async () => {
                >
                    <template #body="{ cols, row, rowIndex }">
                        <QTr no-hover>
-                            <QTd v-for="col in cols" :key="col.name">
+                            <QTd v-for="col in cols" :key="col?.name">
                                <component
-                                    :is="tableColumnComponents[col.name].component(props)"
-                                    v-bind="tableColumnComponents[col.name].props(props)"
-                                    @click="tableColumnComponents[col.name].event(props)"
+                                    :is="tableColumnComponents[col?.name].component()"
+                                    v-bind="tableColumnComponents[col?.name].props()"
+                                    @click="tableColumnComponents[col?.name].event()"
                                    class="col-content"
                                >
                                    <template
                                        v-if="
-                                            col.name !== 'observation' &&
-                                            col.name !== 'isConfirmed'
+                                            col?.name !== 'observation' &&
+                                            col?.name !== 'isConfirmed'
                                        "
                                        >{{ col.value }}</template
                                    >
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@ -1,16 +1,18 @@
 <script setup>
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
-import { useStateStore } from 'stores/useStateStore';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+
 const stateStore = useStateStore();
 const { t } = useI18n();
-import { toDate } from 'src/filters';
-import VnImg from 'src/components/ui/VnImg.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 const columns = [
    {
        align: 'center',
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';

 import FetchData from 'src/components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';

@ -18,6 +19,7 @@ defineProps({

 const itemTypeWorkersOptions = ref([]);
 const suppliersOptions = ref([]);
+const tagValues = ref([]);
 </script>

 <template>
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@ -45,19 +45,19 @@ const columns = [
            optionValue: 'id',
            useLike: false,
        },
+        columnFilter: false,
    },
    {
-        align: 'left',
+        align: 'center',
        label: t('Reserve'),
        name: 'reserve',
        columnFilter: false,
        create: true,
        component: 'number',
        summation: true,
-        cardVisible: true,
    },
    {
-        align: 'left',
+        align: 'center',
        label: t('Bought'),
        name: 'bought',
        summation: true,
@ -77,7 +77,7 @@ const columns = [
        name: 'tableActions',
        actions: [
            {
-                title: t('More'),
+                title: t('View more details'),
                icon: 'search',
                isPrimary: true,
                action: (row) => {
@ -101,14 +101,9 @@ const travel = ref(null);
 const userParams = ref({
    dated: Date.vnNew(),
 });
+
 const filter = ref({
-    where: {
-        shipped: (userParams.value.dated
-            ? new Date(userParams.value.dated)
-            : Date.vnNew()
-        ).setHours(0, 0, 0, 0),
-        m3: { neq: null },
-    },
+    fields: ['id', 'm3', 'warehouseInFk'],
    include: [
        {
            relation: 'warehouseIn',
@ -117,6 +112,13 @@ const filter = ref({
            },
        },
    ],
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
 });

 const setUserParams = async ({ dated }) => {
@ -128,6 +130,22 @@ const setUserParams = async ({ dated }) => {
 function openDialog() {
    travelDialogRef.value = true;
 }
+
+function setFooter(data) {
+    const footer = {
+        bought: 0,
+        reserve: 0,
+    };
+    data.forEach((row) => {
+        footer.bought += row?.bought;
+        footer.reserve += row?.reserve;
+    });
+    tableRef.value.footer = footer;
+}
+
+function round(value) {
+    return Math.round(value * 100) / 100;
+}
 </script>
 <template>
    <VnSubToolbar>
@ -139,20 +157,22 @@ function openDialog() {
                :filter="filter"
                @on-fetch="
                    (data) => {
-                        travel = data.filter((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[0]?.m3 }}
+                        {{ travel?.m3 }}
                    </span>
                    <QBtn
-                        v-if="travel[0]?.m3"
+                        v-if="travel?.m3"
                        style="max-width: 20%"
                        flat
                        icon="edit"
@ -166,10 +186,10 @@ function openDialog() {
    </VnSubToolbar>
    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
        <FormModelPopup
-            :url-update="`Travels/${travel[0].id}`"
+            :url-update="`Travels/${travel?.id}`"
            model="travel"
            :title="t('Travel m3')"
-            :form-initial-data="{ id: travel[0].id, m3: travel[0].m3 }"
+            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
            @on-data-saved="fetchDataRef.fetch()"
        >
            <template #form-inputs="{ data }">
@ -192,42 +212,79 @@ function openDialog() {
            />
        </template>
    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <VnTable
-            ref="tableRef"
-            data-key="StockBoughts"
-            url="StockBoughts/getStockBought"
-            save-url="StockBoughts/crud"
-            order="reserve DESC"
-            :right-search="false"
-            :is-editable="true"
-            :create="{
-                urlCreate: 'StockBoughts',
-                title: t('Reserve some space'),
-                onDataSaved: () => tableRef.reload(),
-                formInitialData: {
-                    workerFk: user.id,
-                    dated: Date.vnNow(),
-                },
-            }"
-            :columns="columns"
-            :user-params="userParams"
-            :footer="true"
-            auto-load
-        >
-            <template #column-workerFk="{ row }">
-                <span class="link" @click.stop>
-                    {{ row?.worker?.user?.name }}
-                    <WorkerDescriptorProxy :id="row?.workerFk" />
-                </span>
-            </template>
-        </VnTable>
-    </QPage>
+    <div class="table-container">
+        <div class="column items-center">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughts"
+                url="StockBoughts/getStockBought"
+                save-url="StockBoughts/crud"
+                order="reserve DESC"
+                :right-search="false"
+                :is-editable="true"
+                @on-fetch="(data) => setFooter(data)"
+                :create="{
+                    urlCreate: 'StockBoughts',
+                    title: t('Reserve some space'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {
+                        workerFk: user.id,
+                        dated: Date.vnNow(),
+                    },
+                }"
+                :columns="columns"
+                :user-params="userParams"
+                :footer="true"
+                table-height="80vh"
+                auto-load
+                :column-search="false"
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.worker?.user?.name }}
+                        <WorkerDescriptorProxy :id="row?.workerFk" />
+                    </span>
+                </template>
+                <template #column-bought="{ row }">
+                    <span :class="{ 'text-negative': row.reserve < row.bought }">
+                        {{ row?.bought }}
+                    </span>
+                </template>
+                <template #column-footer-reserve>
+                    <span>
+                        {{ round(tableRef.footer.reserve) }}
+                    </span>
+                </template>
+                <template #column-footer-bought>
+                    <span
+                        :class="{
+                            'text-negative':
+                                tableRef.footer.reserve < tableRef.footer.bought,
+                        }"
+                    >
+                        {{ round(tableRef.footer.bought) }}
+                    </span>
+                </template>
+            </VnTable>
+        </div>
+    </div>
 </template>
-<style lang="css" scoped>
+<style lang="scss" scoped>
 .travel {
    margin-bottom: 0px;
 }
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+.text-negative {
+    color: $negative !important;
+}
 </style>
 <i18n lang="yml">
 en:
@ -240,12 +297,12 @@ en:
 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
@ -22,7 +22,7 @@ const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}
 const columns = [
    {
        align: 'left',
-        label: 'Entry',
+        label: t('Entry'),
        name: 'entryFk',
        isTitle: true,
        isId: true,
@ -41,29 +41,33 @@ const columns = [
        create: true,
        columnClass: 'expand',
        columnFilter: false,
+        cardVisible: true,
    },
    {
        align: 'left',
        name: 'volume',
        label: t('Volume'),
        columnFilter: false,
+        cardVisible: true,
    },
    {
        align: 'left',
        label: t('Packaging'),
        name: 'packagingFk',
        columnFilter: false,
+        cardVisible: true,
    },
    {
        align: 'left',
        label: 'Packing',
        name: 'packing',
        columnFilter: false,
+        cardVisible: true,
    },
 ];
 </script>
 <template>
-    <QDialog :maximized="true">
+    <QDialog>
        <div class="container">
            <VnTable
                ref="tableRef"
@ -78,13 +82,13 @@ const columns = [
                auto-load
            >
                <template #column-entryFk="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                        {{ row?.entryFk }}
                        <EntryDescriptorProxy :id="row.entryFk" />
                    </span>
                </template>
                <template #column-itemName="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                        {{ row?.itemName }}
                        <ItemDescriptorProxy :id="row.itemFk" />
                    </span>
@ -93,14 +97,18 @@ const columns = [
        </div>
    </QDialog>
 </template>
-<style lang="css">
-.q-dialog__inner {
+<style lang="css" scoped>
+.container {
    max-width: 50vw;
    overflow: auto;
-    display: flex;
    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 lang="yml">
@ -110,4 +118,9 @@ es:
    Bought: Comprado
    More: Más
    Date: Fecha
+        Entry: Entrada
+        Item: Artículo
+        Name: Nombre
+        Volume: Volumen
+        Packaging: Embalage
 </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 'src/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',
            },
-            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
-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
+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
-
-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
+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 'src/components/common/SendEmailDialog.vue';

 import useNotify from 'src/composables/useNotify';
-import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'src/composables/usePrintService';
 import { useVnConfirm } from 'src/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/InvoiceOutDescriptorProxy.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue
@ -1,5 +1,6 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
+import InvoiceOutSummary from './InvoiceOutSummary.vue';

 const $props = defineProps({
    id: {
@ -10,6 +11,10 @@ const $props = defineProps({
 </script>
 <template>
    <QPopupProxy>
-        <InvoiceOutDescriptor v-if="$props.id" :id="$props.id" />
+        <InvoiceOutDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="InvoiceOutSummary"
+        />
    </QPopupProxy>
 </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 lang="yml">
 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
@ -36,23 +36,23 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
-
 const itemFixedPriceFilterRef = ref();
-
 const params = reactive({});
-const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
-};
+
 onMounted(async () => {
    stateStore.rightDrawer = true;
    params.warehouseFk = user.value.warehouseFk;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
    {
-        label: t('item.fixedPrice.itemId'),
-        name: 'itemId',
+        label: t('item.fixedPrice.itemFk'),
+        name: 'itemFk',
        ...defaultColumnAttrs,
        isId: true,
        cardVisible: true,
@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
            :default-save="false"
            data-key="ItemFixedPrices"
            url="FixedPrices/filter"
-            :order="['itemFk ASC']"
+            :order="['description DESC']"
            save-url="FixedPrices/crud"
            :user-params="{ warehouseFk: user.warehouseFk }"
            ref="tableRef"
@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
                <QCheckbox flat v-model="scope.selected" />
            </template>

-            <template #column-itemId="props">
+            <template #column-itemFk="props">
                <VnSelect
                    style="max-width: 100px"
                    url="Items/withName"
@ -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/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)"
@ -61,7 +54,9 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                    <VnSelect
                        v-model="data.workerFk"
                        :label="t('itemType.shared.worker')"
-                        :options="workersOptions"
+                        url="Workers"
+                        sort-by="firstName ASC"
+                        :fields="['id', 'firstName']"
                        option-value="id"
                        option-label="firstName"
                        hide-selected
--- 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)"
@ -50,7 +43,9 @@ const temperaturesOptions = ref([]);
                <VnSelect
                    v-model="data.workerFk"
                    :label="t('shared.worker')"
-                    :options="workersOptions"
+                    url="Workers"
+                    sort-by="firstName ASC"
+                    :fields="['id', 'firstName']"
                    option-value="id"
                    option-label="firstName"
                    hide-selected
--- a/src/pages/Monitor/MonitorClients.vue
+++ b/src/pages/Monitor/MonitorClients.vue
@ -139,7 +139,11 @@ const columns = computed(() => [
    </VnTable>
 </template>
 <style lang="scss" scoped>
-.full-width .vn-row > * {
-    flex: 0.4;
+.full-width .vn-row {
+    margin-bottom: 0;
+    flex-direction: row;
+    > * {
+        max-width: 125px;
+    }
 }
 </style>
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@ -132,7 +132,6 @@ const openTab = (id) =>
        :table="{
            'row-key': 'id',
            selection: 'multiple',
-            'hide-bottom': true,
        }"
        default-mode="table"
        :row-click="({ id }) => openTab(id)"
@ -140,33 +139,35 @@ const openTab = (id) =>
        :disable-option="{ card: true }"
    >
        <template #top-left>
-            <QBtn
-                icon="refresh"
-                size="md"
-                color="primary"
-                dense
-                flat
-                @click="$refs.table.reload()"
-            >
-                <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                v-if="selectedRows.length"
-                icon="delete"
-                size="md"
-                dense
-                flat
-                color="primary"
-                @click="
-                    openConfirmationModal(
-                        $t('salesOrdersTable.deleteConfirmTitle'),
-                        $t('salesOrdersTable.deleteConfirmMessage'),
-                        removeOrders
-                    )
-                "
-            >
-                <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
-            </QBtn>
+            <div class="q-mt-sm">
+                <QBtn
+                    icon="refresh"
+                    size="md"
+                    color="primary"
+                    dense
+                    flat
+                    @click="$refs.table.reload()"
+                >
+                    <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    v-if="selectedRows.length"
+                    icon="delete"
+                    size="md"
+                    dense
+                    flat
+                    color="primary"
+                    @click="
+                        openConfirmationModal(
+                            $t('globals.deleteConfirmTitle'),
+                            $t('salesOrdersTable.deleteConfirmMessage'),
+                            removeOrders
+                        )
+                    "
+                >
+                    <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) {
@ -54,7 +58,6 @@ const columns = computed(() => [
        label: t('salesTicketsTable.problems'),
        name: 'totalProblems',
        align: 'left',
-
        columnFilter: false,
        attrs: {
            dense: true,
@ -65,7 +68,6 @@ const columns = computed(() => [
        name: 'id',
        field: 'id',
        align: 'left',
-
        columnFilter: {
            component: 'number',
            name: 'id',
@ -108,9 +110,7 @@ const columns = computed(() => [
    {
        label: t('salesTicketsTable.date'),
        name: 'shippedDate',
-        style: { 'max-width': '100px' },
        align: 'left',
-
        columnFilter: {
            component: 'date',
            name: 'shippedDate',
@ -164,7 +164,6 @@ const columns = computed(() => [
        label: t('salesTicketsTable.state'),
        name: 'state',
        align: 'left',
-        style: { 'max-width': '100px' },
        columnFilter: {
            component: 'select',
            name: 'stateFk',
@ -193,7 +192,6 @@ const columns = computed(() => [
        label: t('salesTicketsTable.zone'),
        name: 'zoneFk',
        align: 'left',
-
        columnFilter: {
            component: 'select',
            name: 'zoneFk',
@ -210,8 +208,6 @@ const columns = computed(() => [
        name: 'totalWithVat',
        field: 'totalWithVat',
        align: 'left',
-        style: { 'max-width': '75px' },
-
        columnFilter: {
            component: 'number',
            name: 'totalWithVat',
@ -370,7 +366,7 @@ const openTab = (id) =>
            </QCheckbox>
        </template>
        <template #column-totalProblems="{ row }">
-            <QTd class="no-padding" style="max-width: 60px">
+            <span>
                <QIcon
                    v-if="row.isTaxDataChecked === 0"
                    name="vn:no036"
@ -424,46 +420,40 @@ const openTab = (id) =>
                >
                    <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
                </QIcon>
-            </QTd>
+            </span>
        </template>
        <template #column-id="{ row }">
-            <QTd class="no-padding">
-                <span class="link" @click.stop.prevent>
-                    {{ row.id }}
-                    <TicketDescriptorProxy :id="row.id" />
-                </span>
-            </QTd>
+            <span class="link" @click.stop.prevent>
+                {{ row.id }}
+                <TicketDescriptorProxy :id="row.id" />
+            </span>
        </template>
        <template #column-clientFk="{ row }">
-            <QTd class="no-padding" @click.stop :title="row.nickname">
-                <span class="link">{{ row.nickname }}</span>
+            <div @click.stop :title="row.nickname">
+                <span class="link" v-text="row.nickname" />
                <CustomerDescriptorProxy :id="row.clientFk" />
-            </QTd>
+            </div>
        </template>
        <template #column-salesPersonFk="{ row }">
-            <QTd class="no-padding" @click.stop :title="row.userName">
+            <div @click.stop :title="row.userName">
                <span class="link" v-text="dashIfEmpty(row.userName)" />
                <WorkerDescriptorProxy :id="row.salesPersonFk" />
-            </QTd>
+            </div>
        </template>
        <template #column-shippedDate="{ row }">
-            <QTd class="no-padding">
-                <QBadge
-                    v-bind="getBadgeAttrs(row.shippedDate)"
-                    class="q-pa-sm"
-                    style="font-size: 14px"
-                >
-                    {{ formatShippedDate(row.shippedDate) }}
-                </QBadge>
-            </QTd>
+            <QBadge
+                v-bind="getBadgeAttrs(row.shippedDate)"
+                class="q-pa-sm"
+                style="font-size: 14px"
+            >
+                {{ formatShippedDate(row.shippedDate) }}
+            </QBadge>
        </template>
        <template #column-provinceFk="{ row }">
-            <QTd class="no-padding">
-                <span :title="row.province" v-text="row.province" />
-            </QTd>
+            <span :title="row.province" v-text="row.province" />
        </template>
        <template #column-state="{ row }">
-            <QTd class="no-padding" @click.stop.prevent>
+            <div @click.stop.prevent>
                <div v-if="row.refFk">
                    <span class="link">{{ row.refFk }}</span>
                    <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
@ -477,32 +467,33 @@ const openTab = (id) =>
                >
                    {{ row.state }}
                </QBadge>
-            </QTd>
+            </div>
        </template>
        <template #column-isFragile="{ row }">
-            <QTd class="no-padding">
-                <QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
-                    <QTooltip>{{ $t('salesTicketsTable.isFragile') }}</QTooltip>
-                </QIcon>
-            </QTd>
+            <QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
+                <QTooltip>{{ $t('salesTicketsTable.isFragile') }}</QTooltip>
+            </QIcon>
        </template>
        <template #column-zoneFk="{ row }">
-            <QTd class="no-padding" @click.stop.prevent :title="row.zoneName">
+            <div @click.stop.prevent :title="row.zoneName">
                <span class="link">{{ row.zoneName }}</span>
                <ZoneDescriptorProxy :id="row.zoneFk" />
-            </QTd>
+            </div>
        </template>
        <template #column-totalWithVat="{ row }">
-            <QTd class="no-padding">
-                <QBadge
-                    :color="totalPriceColor(row) || 'transparent'"
-                    :text-color="totalPriceColor(row) ? 'black' : 'white'"
-                    class="q-pa-sm"
-                    style="font-size: 14px"
-                >
-                    {{ toCurrency(row.totalWithVat) }}
-                </QBadge>
-            </QTd>
+            <QBadge
+                :color="totalPriceColor(row) || 'transparent'"
+                :text-color="totalPriceColor(row) ? 'black' : 'white'"
+                class="q-pa-sm"
+                style="font-size: 14px"
+            >
+                {{ toCurrency(row.totalWithVat) }}
+            </QBadge>
        </template>
    </VnTable>
 </template>
+<style lang="scss" scoped>
+td .q-icon {
+    margin: 0 2px;
+}
+</style>
--- 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 lang="yml">
 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 'src/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
@ -249,7 +249,7 @@ watch(
        @on-fetch="(data) => (orderSummary.vat = data)"
        auto-load
    />
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
        <QCard
            class="order-lines-summary q-pa-lg"
            v-if="orderSummary.vat && orderSummary.total"
@ -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/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@ -14,14 +14,15 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import { onMounted } from 'vue';
+import { useRoute } from 'vue-router';

 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const agencyList = ref([]);
 const addressesList = ref([]);
-const clientId = ref();
-
+const route = useRoute();
 const columns = computed(() => [
    {
        align: 'left',
@ -169,6 +170,13 @@ const getDateColor = (date) => {
    if (comparation == 0) return 'bg-warning';
    if (comparation < 0) return 'bg-success';
 };
+
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk, id);
+});
 </script>
 <template>
    <OrderSearchbar />
@ -184,13 +192,14 @@ const getDateColor = (date) => {
        :order="['landed DESC', 'clientFk ASC', 'id DESC']"
        :create="{
            urlCreate: 'Orders/new',
-            title: 'Create Order',
+            title: t('module.cerateOrder'),
            onDataSaved: (url) => {
                tableRef.redirect(url);
            },
            formInitialData: {
                active: true,
                addressId: null,
+                clientFk: null,
            },
        }"
        :user-params="{ showEmpty: false }"
@ -221,7 +230,7 @@ const getDateColor = (date) => {
            <VnSelect
                url="Clients"
                :include="{ relation: 'addresses' }"
-                v-model="clientId"
+                v-model="data.clientFk"
                :label="t('module.customer')"
                @update:model-value="(id) => fetchClientAddress(id, data)"
            />
--- a/src/pages/Order/locale/en.yml
+++ b/src/pages/Order/locale/en.yml
@ -10,6 +10,7 @@ module:
    total: Total
    salesPerson: Sales Person
    address: Address
+    cerateOrder: Create order
 lines:
    item: Item
    warehouse: Warehouse
--- a/Show More
+++ b/Show More