Merge branch 'dev' into 7010-AddPackingField

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

 ### Added 🆕
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-front",
-    "version": "24.42.0",
+    "version": "24.44.0",
    "description": "Salix frontend",
    "productName": "Salix",
    "author": "Verdnatura",
--- a/src/boot/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
@ -31,8 +31,8 @@ const countriesFilter = {

 const countriesOptions = ref([]);

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

 onMounted(async () => {
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -317,7 +317,7 @@ defineExpose({
    params,
 });

-function handleOnDataSaved(_, res) {
+function handleOnDataSaved(_) {
    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
    else $props.create.onDataSaved(_);
 }
@ -497,6 +497,7 @@ function handleOnDataSaved(_, res) {
                        auto-width
                        class="no-margin q-px-xs"
                        :class="[getColAlign(col), col.columnClass]"
+                        :style="col.style"
                        v-if="col.visible ?? true"
                        @click.ctrl="
                            ($event) =>
@ -525,6 +526,7 @@ function handleOnDataSaved(_, res) {
                        :class="getColAlign(col)"
                        class="sticky no-padding"
                        @click="stopEventPropagation($event)"
+                        :style="col.style"
                    >
                        <QBtn
                            v-for="(btn, index) of col.actions"
@ -710,7 +712,7 @@ function handleOnDataSaved(_, res) {
            icon="add"
            shortcut="+"
        />
-        <QTooltip>
+        <QTooltip self="top right">
            {{ createForm?.title }}
        </QTooltip>
    </QPageSticky>
@ -771,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));
--- 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
@ -130,24 +130,4 @@ const mixinRules = [
 .q-field__append {
    padding-inline: 0;
 }
-
-.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
-    height: 20px;
-}
-.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
-    height: auto;
-}
-.q-field__control {
-    height: unset;
-}
-
-.q-field--labeled {
-    .q-field__native,
-    .q-field__prefix,
-    .q-field__suffix,
-    .q-field__input {
-        padding-bottom: 0;
-        min-height: 15px;
-    }
-}
 </style>
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@ -3,6 +3,7 @@ import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useAttrs } from 'vue';
+import VnDate from './VnDate.vue';

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

 <template>
@ -129,6 +135,7 @@ const styleAttrs = computed(() => {
                />
            </template>
            <QMenu
+                v-if="$q.screen.gt.xs"
                transition-show="scale"
                transition-hide="scale"
                v-model="isPopupOpen"
@ -137,19 +144,11 @@ const styleAttrs = computed(() => {
                :no-focus="true"
                :no-parent-event="true"
            >
-                <QDate
-                    v-model="popupDate"
-                    :landscape="true"
-                    :today-btn="true"
-                    :options="$attrs.options"
-                    @update:model-value="
-                        (date) => {
-                            formattedDate = date;
-                            isPopupOpen = false;
-                        }
-                    "
-                />
+                <VnDate v-model="popupDate" @update:model-value="manageDate" />
            </QMenu>
+            <QDialog v-else v-model="isPopupOpen">
+                <VnDate v-model="popupDate" @update:model-value="manageDate" />
+            </QDialog>
        </QInput>
    </div>
 </template>
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@ -3,6 +3,8 @@ import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
+import VnTime from './VnTime.vue';
+
 const { validations } = useValidator();
 const $attrs = useAttrs();
 const model = defineModel({ type: String });
@ -107,6 +109,7 @@ function dateToTime(newDate) {
                />
            </template>
            <QMenu
+                v-if="$q.screen.gt.xs"
                transition-show="scale"
                transition-hide="scale"
                v-model="isPopupOpen"
@ -115,8 +118,11 @@ function dateToTime(newDate) {
                :no-focus="true"
                :no-parent-event="true"
            >
-                <QTime v-model="formattedTime" mask="HH:mm" landscape now-btn />
+                <VnTime v-model="formattedTime" />
            </QMenu>
+            <QDialog v-else v-model="isPopupOpen">
+                <VnTime v-model="formattedTime" />
+            </QDialog>
        </QInput>
    </div>
 </template>
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@ -227,6 +227,8 @@ function nullishToTrue(value) {
 }

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

 <template>
@ -283,15 +285,4 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field--outlined {
    max-width: 100%;
 }
-.q-field__inner {
-    .q-field__control {
-        min-height: auto !important;
-
-        display: flex;
-        align-items: flex-end;
-        .q-field__native.row {
-            min-height: auto !important;
-        }
-    }
-}
 </style>
--- a/src/components/common/VnTime.vue
+++ b/src/components/common/VnTime.vue
@ -0,0 +1,16 @@
+<script setup>
+const model = defineModel({ type: [String, Number], required: true });
+</script>
+<template>
+    <QTime v-model="model" now-btn mask="HH:mm" />
+</template>
+<style lang="scss" scoped>
+.q-time {
+    width: 230px;
+    min-width: unset;
+    :deep(.q-time__header) {
+        min-height: unset;
+        height: 50px;
+    }
+}
+</style>
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@ -31,7 +31,7 @@ const dialog = ref(null);
    <div class="container order-catalog-item overflow-hidden">
        <QCard class="card shadow-6">
            <div class="img-wrapper">
-                <VnImg :id="item.id" class="image" />
+                <VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
                <div v-if="item.hex && isCatalog" class="item-color-container">
                    <div
                        class="item-color"
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@ -58,7 +58,7 @@ defineExpose({
        :class="{ zoomIn: zoom }"
        :src="getUrl()"
        v-bind="$attrs"
-        @click.stop="show = $props.zoom ? true : false"
+        @click.stop="show = $props.zoom"
        spinner-color="primary"
    />
    <QDialog v-if="$props.zoom" v-model="show">
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref } from 'vue';
+import { ref, reactive } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@ -12,36 +12,40 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnAvatar from 'components/ui/VnAvatar.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInput from 'components/common/VnInput.vue';

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

 const { t } = useI18n();
 const state = useState();
 const quasar = useQuasar();
 const currentUser = ref(state.getUser());
-const newNote = ref('');
+const newNote = reactive({ text: null, observationTypeFk: null });
+const observationTypes = ref([]);
 const vnPaginateRef = ref();
-function handleKeyUp(event) {
-    if (event.key === 'Enter') {
-        event.preventDefault();
-        if (!event.shiftKey) insert();
-    }
-}
+
 async function insert() {
+    if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
+
    const body = $props.body;
-    const newBody = { ...body, ...{ text: newNote.value } };
+    const newBody = {
+        ...body,
+        ...{ text: newNote.text, observationTypeFk: newNote.observationTypeFk },
+    };
    await axios.post($props.url, newBody);
    await vnPaginateRef.value.fetch();
-    newNote.value = '';
 }
-
 onBeforeRouteLeave((to, from, next) => {
-    if (newNote.value)
+    if (newNote.text)
        quasar.dialog({
            component: VnConfirm,
            componentProps: {
@ -54,6 +58,13 @@ onBeforeRouteLeave((to, from, next) => {
 });
 </script>
 <template>
+    <FetchData
+        v-if="selectType"
+        url="ObservationTypes"
+        :filter="{ fields: ['id', 'description'] }"
+        auto-load
+        @on-fetch="(data) => (observationTypes = data)"
+    />
    <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
        <QCardSection horizontal>
            <VnAvatar :worker-id="currentUser.id" size="md" />
@ -62,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,11 +187,28 @@ onBeforeRouteLeave((to, from, next) => {
    opacity: 0;
    background-color: $primary;
 }
+
+.vn-row > :nth-child(2) {
+    margin-left: 0;
+}
+
+@media (max-width: $breakpoint-xs) {
+    .vn-row > :deep(*) {
+        margin-left: 0;
+    }
+    .q-card {
+        width: 100%;
+
+        &__section {
+            padding: 0;
+        }
+    }
+}
 </style>
 <i18n>
    es:
        Add note here...: Añadir nota aquí...
        New note: Nueva nota
        Save (Enter): Guardar (Intro)
-
+        Observation type: Tipo de observación
 </i18n>
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@ -56,7 +56,7 @@ const props = defineProps({
    },
    offset: {
        type: Number,
-        default: 0,
+        default: undefined,
    },
    skeleton: {
        type: Boolean,
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@ -9,7 +9,6 @@ defineProps({ wrap: { type: Boolean, default: false } });
 <style lang="scss" scoped>
 .vn-row {
    display: flex;
-    align-items: flex-end;
    > :deep(*) {
        flex: 1;
    }
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@ -114,7 +114,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
            for (const row of response.data) store.data.push(row);
        } else {
            store.data = response.data;
-            if (!document.querySelectorAll('[role="dialog"]').length)
+            if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
                updateRouter && updateStateParams();
        }

--- a/src/css/app.scss
+++ b/src/css/app.scss
@ -288,14 +288,3 @@ input::-webkit-inner-spin-button {
        color: $info;
    }
 }
-.q-field__inner {
-    .q-field__control {
-        min-height: auto !important;
-        display: flex;
-        align-items: flex-end;
-        padding-bottom: 2px;
-        .q-field__native.row {
-            min-height: auto !important;
-        }
-    }
-}
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -105,6 +105,7 @@ globals:
    campaign: Campaign
    weight: Weight
    error: Ups! Something went wrong
+    recalc: Recalculate
    pageTitles:
        logIn: Login
        addressEdit: Update address
@ -275,6 +276,8 @@ globals:
        serial: Serial
        medical: Mutual
        RouteExtendedList: Router
+        wasteRecalc: Waste recaclulate
+        operator: Operator
    supplier: Supplier
    created: Created
    worker: Worker
@ -293,6 +296,7 @@ globals:
    maxTemperature: Max
    minTemperature: Min
    params:
+        id: ID
        clientFk: Client id
        salesPersonFk: Sales person
        warehouseFk: Warehouse
@ -300,6 +304,12 @@ 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
@ -734,6 +744,7 @@ worker:
        locker: Locker
        balance: Balance
        medical: Medical
+        operator: Operator
    list:
        name: Name
        email: Email
@ -806,14 +817,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
@ -831,6 +842,18 @@ worker:
            debit: Debt
            credit: Have
            concept: Concept
+    operator:
+        numberOfWagons: Number of wagons
+        train: Train
+        itemPackingType: Item packing type
+        warehouse: Warehouse
+        sector: Sector
+        labeler: Printer
+        linesLimit: Lines limit
+        volumeLimit: Volume limit
+        sizeLimit: Size limit
+        isOnReservationMode: Reservation mode
+        machine: Machine
 wagon:
    pageTitles:
        wagons: Wagons
@ -870,35 +893,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
-        RouteExtendedList: Router
-    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
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -107,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
@ -279,6 +280,8 @@ globals:
        clientsActionsMonitor: Clientes y acciones
        serial: Facturas por serie
        medical: Mutua
+        wasteRecalc: Recalcular mermas
+        operator: Operario
    supplier: Proveedor
    created: Fecha creación
    worker: Trabajador
@ -297,6 +300,7 @@ globals:
    maxTemperature: Máx
    minTemperature: Mín
    params:
+        id: Id
        clientFk: Id cliente
        salesPersonFk: Comercial
        warehouseFk: Almacén
@ -304,6 +308,12 @@ 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
@ -741,6 +751,7 @@ worker:
        balance: Balance
        formation: Formación
        medical: Mutua
+        operator: Operario
    list:
        name: Nombre
        email: Email
@ -829,6 +840,19 @@ worker:
            debit: Debe
            credit: Haber
            concept: Concepto
+    operator:
+        numberOfWagons: Número de vagones
+        train: tren
+        itemPackingType: Tipo de embalaje
+        warehouse: Almacén
+        sector: Sector
+        labeler: Impresora
+        linesLimit: Líneas límite
+        volumeLimit: Volumen límite
+        sizeLimit: Tamaño límite
+        isOnReservationMode: Modo de reserva
+        machine: Máquina
+
 wagon:
    pageTitles:
        wagons: Vagones
@ -868,21 +892,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
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -5,7 +5,8 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import AccountFilter from './AccountFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@ -20,14 +21,6 @@ const columns = computed(() => [
        isId: true,
        field: 'id',
        cardVisible: true,
-        columnFilter: {
-            component: 'select',
-            name: 'search',
-            attrs: {
-                url: 'VnUsers/preview',
-                fields: ['id', 'name'],
-            },
-        },
    },
    {
        align: 'left',
@ -53,9 +46,6 @@ const columns = computed(() => [
        columnField: {
            component: null,
        },
-        columnFilter: {
-            inWhere: true,
-        },
        cardVisible: true,
        create: true,
    },
@ -67,9 +57,6 @@ const columns = computed(() => [
        columnField: {
            component: null,
        },
-        columnFilter: {
-            inWhere: true,
-        },
        cardVisible: true,
        create: true,
    },
@ -123,6 +110,11 @@ const exprBuilder = (param, value) => {
        :info="t('account.searchInfo')"
        :filter="filter"
    />
+    <RightMenu>
+        <template #right-panel>
+            <AccountFilter data-key="AccountUsers" />
+        </template>
+    </RightMenu>
    <VnTable
        ref="tableRef"
        data-key="AccountUsers"
@ -133,6 +125,8 @@ const exprBuilder = (param, value) => {
        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,10 +10,7 @@ const { t } = useI18n();
    <VnCard
        data-key="Account"
        :descriptor="AccountDescriptor"
-        search-data-key="AccountUsers"
-        :filter="{
-            include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-        }"
+        search-data-key="AccountList"
        :searchbar-props="{
            url: 'VnUsers/preview',
            label: t('account.search'),
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@ -4,9 +4,12 @@ import { computed, ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useRoute } from 'vue-router';
+import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import useNotify from 'src/composables/useNotify.js';
+
 const $props = defineProps({
    hasAccount: {
        type: Boolean,
@ -62,6 +65,19 @@ async function sync() {
 }
 </script>
 <template>
+    <VnChangePassword
+        ref="changePassRef"
+        :ask-old-pass="true"
+        :submit-fn="
+            async (newPassword, oldPassword) => {
+                await axios.patch(`Accounts/change-password`, {
+                    userId: entityId,
+                    newPassword,
+                    oldPassword,
+                });
+            }
+        "
+    />
    <VnConfirm
        v-model="showSyncDialog"
        :message="t('account.card.actions.sync.message')"
@ -92,6 +108,17 @@ async function sync() {
            />
        </template>
    </VnConfirm>
+    <QItem
+        v-if="
+            entityId == account.id &&
+            useAcl().hasAny([{ model: 'Account', props: '*', accessType: 'WRITE' }])
+        "
+        v-ripple
+        clickable
+        @click="$refs.changePassRef.show()"
+    >
+        <QItemSection>{{ t('globals.changePass') }}</QItemSection>
+    </QItem>
    <QItem
        v-if="account.hasAccount"
        v-ripple
@ -138,6 +165,5 @@ async function sync() {
    <QItem v-ripple clickable @click="showSyncDialog = true">
        <QItemSection>{{ t('account.card.actions.sync.name') }}</QItemSection>
    </QItem>
-
    <QSeparator />
 </template>
--- a/src/pages/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/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@ -92,7 +92,7 @@ const onSubmit = async () => {
        notify('globals.dataSaved', 'positive');
        unpaidClient.value = true;
    } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
    } finally {
        isLoading.value = false;
    }
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@ -3,14 +3,11 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useQuasar } from 'quasar';
-
 import VnInput from 'src/components/common/VnInput.vue';
-import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';

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

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

-const showChangePasswordDialog = () => {
-    quasar.dialog({
-        component: CustomerChangePassword,
-        componentProps: {
-            id: route.params.id,
-        },
-    });
-};
-
 async function hasCustomerRole() {
    const { data } = await axios(`Clients/${route.params.id}/hasCustomerRole`);
    canChangePassword.value = data;
 }
 </script>
-
 <template>
    <FormModel
        url="VnUsers/preview"
@ -69,21 +56,29 @@ async function hasCustomerRole() {
        </template>
        <template #moreActions>
            <QBtn
-                :label="t('Change password')"
+                :label="t('globals.changePass')"
                color="primary"
                icon="edit"
                :disable="!canChangePassword"
-                @click="showChangePasswordDialog()"
+                @click="$refs.changePassRef.show"
            />
        </template>
    </FormModel>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Clients/${$route.params.id}/setPassword`, {
+                    newPassword: newPass,
+                });
+            }
+        "
+    />
 </template>
-
 <i18n>
 es:
    Enable web access: Habilitar acceso web
    User: Usuario
    Recovery email: Correo de recuperacion
    This email is used for user to regain access their account: Este correo electrónico se usa para que el usuario recupere el acceso a su cuenta
-    Change password: Cambiar contraseña
 </i18n>
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@ -25,19 +25,31 @@ const { notify } = useNotify();
 const { t } = useI18n();

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

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

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

        await $props.promise();

--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@ -240,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"
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ b/src/pages/Customer/components/CustomerChangePassword.vue
@ -1,138 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import axios from 'axios';
-import { useDialogPluginComponent } from 'quasar';
-
-import useNotify from 'src/composables/useNotify';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FetchData from 'src/components/FetchData.vue';
-
-const { dialogRef } = useDialogPluginComponent();
-const { notify } = useNotify();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: String,
-        required: true,
-    },
-    promise: {
-        type: Function,
-        required: true,
-    },
-});
-const userPasswords = ref({});
-
-const closeButton = ref(null);
-const isLoading = ref(false);
-const newPassword = ref('');
-const requestPassword = ref('');
-
-const onSubmit = async () => {
-    isLoading.value = true;
-
-    if (newPassword.value !== requestPassword.value) {
-        notify(t("Passwords don't match"), 'negative');
-        isLoading.value = false;
-        return;
-    }
-
-    const payload = {
-        newPassword: newPassword.value,
-    };
-    try {
-        await axios.patch(`Clients/${$props.id}/setPassword`, payload);
-    } catch (error) {
-        notify('errors.create', 'negative');
-    } finally {
-        isLoading.value = false;
-        if (closeButton.value) closeButton.value.click();
-    }
-};
-</script>
-
-<template>
-    <QDialog ref="dialogRef">
-        <FetchData
-            @on-fetch="(data) => (userPasswords = data[0])"
-            auto-load
-            url="UserPasswords"
-        />
-        <QCard class="q-pa-lg">
-            <QCardSection>
-                <QForm @submit.prevent="onSubmit">
-                    <span
-                        ref="closeButton"
-                        class="row justify-end close-icon"
-                        v-close-popup
-                    >
-                        <QIcon name="close" size="sm" />
-                    </span>
-
-                    <VnRow class="row q-gutter-md q-mb-md" style="flex-direction: column">
-                        <div class="col">
-                            <VnInput
-                                :label="t('New password')"
-                                clearable
-                                v-model="newPassword"
-                                type="password"
-                            >
-                                <template #append>
-                                    <QIcon name="info" class="cursor-info">
-                                        <QTooltip>
-                                            {{
-                                                t('customer.card.passwordRequirements', {
-                                                    ...userPasswords,
-                                                })
-                                            }}
-                                        </QTooltip>
-                                    </QIcon>
-                                </template>
-                            </VnInput>
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('Request password')"
-                                clearable
-                                v-model="requestPassword"
-                                type="password"
-                            />
-                        </div>
-                    </VnRow>
-
-                    <div class="q-mt-lg row justify-end">
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('globals.cancel')"
-                            :loading="isLoading"
-                            class="q-ml-sm"
-                            color="primary"
-                            flat
-                            type="reset"
-                            v-close-popup
-                        />
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('Change password')"
-                            :loading="isLoading"
-                            color="primary"
-                            type="submit"
-                        />
-                    </div>
-                </QForm>
-            </QCardSection>
-        </QCard>
-    </QDialog>
-</template>
-
-<i18n>
-es:
-    New password: Nueva contraseña
-    Request password: Repetir contraseña
-    Change password: Cambiar contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@ -138,7 +138,7 @@ const onSubmit = async () => {
        notify('globals.dataSaved', 'positive');
        onDataSaved(data);
    } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
    } finally {
        isLoading.value = false;
    }
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@ -1,9 +1,7 @@
 <script setup>
-import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';

-import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@ -11,17 +9,8 @@ import VnSelect from 'src/components/common/VnSelect.vue';

 const route = useRoute();
 const { t } = useI18n();
-
-const workersOptions = ref([]);
-const clientsOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers/search"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
-    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
    <FormModel
        :url="`Departments/${route.params.id}`"
        model="department"
@ -62,7 +51,7 @@ const clientsOptions = ref([]);
                <VnSelect
                    :label="t('department.bossDepartment')"
                    v-model="data.workerFk"
-                    :options="workersOptions"
+                    url="Workers/search"
                    option-value="id"
                    option-label="name"
                    hide-selected
@ -72,7 +61,7 @@ const clientsOptions = ref([]);
                <VnSelect
                    :label="t('department.selfConsumptionCustomer')"
                    v-model="data.clientFk"
-                    :options="clientsOptions"
+                    url="Clients"
                    option-value="id"
                    option-label="name"
                    hide-selected
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@ -45,6 +45,7 @@ const columns = [
            optionValue: 'id',
            useLike: false,
        },
+        columnFilter: false,
    },
    {
        align: 'center',
@ -157,7 +158,7 @@ function round(value) {
                @on-fetch="
                    (data) => {
                        travel = data.find(
-                            (data) => data.warehouseIn.code.toLowerCase() === 'vnh'
+                            (data) => data.warehouseIn?.code.toLowerCase() === 'vnh'
                        );
                    }
                "
@ -165,7 +166,7 @@ function round(value) {
            <VnRow class="travel">
                <div v-if="travel">
                    <span style="color: var(--vn-label-color)">
-                        {{ t('Booked trucks') }}:
+                        {{ t('Purchase Spaces') }}:
                    </span>
                    <span>
                        {{ travel?.m3 }}
@ -236,6 +237,7 @@ function round(value) {
                :footer="true"
                table-height="80vh"
                auto-load
+                :column-search="false"
            >
                <template #column-workerFk="{ row }">
                    <span class="link" @click.stop>
@ -279,7 +281,6 @@ function round(value) {
    display: flex;
    flex-direction: column;
    align-items: center;
-    width: 35%;
 }
 .text-negative {
    color: $negative !important;
@ -289,7 +290,7 @@ function round(value) {
    es:
        Edit travel: Editar envío
        Travel: Envíos
-        Booked trucks: Camiones reservados
+        Purchase Spaces: Espacios de compra
        Buyer: Comprador
        Reserve: Reservado
        Bought: Comprado
--- 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/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@ -18,3 +18,5 @@ myEntries:
    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
@ -21,3 +21,5 @@ myEntries:
    warehouseInFk: Alm. entrada
    daysOnward: Días adelante
    daysAgo: Días atras
+wasteRecalc:
+    recalcOk: Se han recalculado las mermas correctamente
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@ -274,10 +274,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                    :label="t('invoiceIn.summary.company')"
                    :value="entity.company?.code"
                />
-                <VnLv
-                    :label="t('invoiceIn.summary.booked')"
-                    :value="invoiceIn?.isBooked"
-                />
+                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
            </QCard>
            <QCard class="vn-one">
                <QCardSection class="q-pa-none">
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@ -116,7 +116,7 @@ const activities = ref([]);
            <QItem>
                <QItemSection>
                    <QCheckbox
-                        :label="t('params.isBooked')"
+                        :label="t('invoiceIn.isBooked')"
                        v-model="params.isBooked"
                        @update:model-value="searchFn()"
                        toggle-indeterminate
@ -170,7 +170,7 @@ es:
        awb: AWB
        amount: Importe
        issued: Emitida
-        isBooked: Conciliada
+        isBooked: Contabilizada
        account: Cuenta contable
        created: Creada
        dued: Vencida
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@ -65,7 +65,7 @@ const cols = computed(() => [
    {
        align: 'left',
        name: 'isBooked',
-        label: t('invoiceIn.list.isBooked'),
+        label: t('invoiceIn.isBooked'),
        columnFilter: false,
    },
    {
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@ -1,5 +1,6 @@
 invoiceIn:
    serial: Serial
+    isBooked: Is booked
    list:
        ref: Reference
        supplier: Supplier
@ -7,7 +8,6 @@ invoiceIn:
        serial: Serial
        file: File
        issued: Issued
-        isBooked: Is booked
        awb: AWB
        amount: Amount
    card:
@ -31,7 +31,6 @@ invoiceIn:
        sage: Sage withholding
        vat: Undeductible VAT
        company: Company
-        booked: Booked
        expense: Expense
        taxableBase: Taxable base
        rate: Rate
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@ -1,5 +1,6 @@
 invoiceIn:
    serial: Serie
+    isBooked: Contabilizada
    list:
        ref: Referencia
        supplier: Proveedor
@ -7,7 +8,6 @@ invoiceIn:
        shortIssued: F. emisión
        file: Fichero
        issued: Fecha emisión
-        isBooked: Conciliada
        awb: AWB
        amount: Importe
    card:
@ -31,7 +31,6 @@ invoiceIn:
        sage: Retención sage
        vat: Iva no deducible
        company: Empresa
-        booked: Contabilizada
        expense: Gasto
        taxableBase: Base imp.
        rate: Tasa
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@ -9,7 +9,6 @@ import RefundInvoiceForm from 'src/components/RefundInvoiceForm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';

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

 const { notify } = useNotify();
 const router = useRouter();
-const session = useSession();
-const token = session.getToken();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();
--- a/src/pages/InvoiceOut/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();
@ -182,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
@ -206,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
@ -170,7 +170,6 @@ const downloadCSV = async () => {
                }
            }
        "
-        :limit="0"
        :columns="columns"
        auto-load
        :is-editable="false"
--- 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/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/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@ -139,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) {
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@ -15,7 +15,6 @@ salesOrdersTable:
    dateMake: Make date
    client: Client
    salesPerson: Salesperson
-    deleteConfirmTitle: Delete selected elements
    deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
    agency: Agency
    import: Import
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@ -15,7 +15,6 @@ salesOrdersTable:
    dateMake: Fecha de realización
    client: Cliente
    salesPerson: Comercial
-    deleteConfirmTitle: Eliminar los elementos seleccionados
    deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
    agency: Agencia
    import: Importe
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@ -130,4 +130,5 @@ function extractValueTags(items) {
 <i18n>
 es:
    You can search items by name or id: Puedes buscar items por nombre o id
+    Search items: Buscar items
 </i18n>
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@ -247,6 +247,7 @@ function addOrder(value, field, params) {
                        rounded
                        emit-value
                        use-input
+                        sort-by="name ASC"
                        :disable="!selectedCategoryFk"
                        @update:model-value="
                            (value) => {
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@ -20,8 +20,10 @@ const props = defineProps({

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

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

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

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

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

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

@ -32,14 +28,6 @@ const sourceList = ref([]);
        auto-load
        @on-fetch="(data) => (agencyList = data)"
    />
-    <FetchData
-        url="Workers/search"
-        :filter="salesPersonFilter"
-        sort-by="nickname ASC"
-        @on-fetch="(data) => (salesPersonList = data)"
-        :params="{ departmentCodes: ['VT'] }"
-        auto-load
-    />
    <FetchData
        url="Orders/getSourceValues"
        :filter="{ fields: ['value'] }"
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@ -278,7 +278,11 @@ watch(
    >
        <template #column-image="{ row }">
            <div class="image-wrapper">
-                <VnImg :id="parseInt(row?.item?.image)" class="rounded" />
+                <VnImg
+                    :id="parseInt(row?.item?.image)"
+                    class="rounded"
+                    zoom-resolution="1600x900"
+                />
            </div>
        </template>
        <template #column-id="{ row }">
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@ -46,13 +46,13 @@ async function deleteWorCenter(id) {
 }
 </script>
 <template>
+    <FetchData
+        url="workCenters"
+        sort-by="name"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
    <div class="centerCard">
-        <FetchData
-            url="workCenters"
-            sort-by="name"
-            @on-fetch="(data) => (warehouses = data)"
-            auto-load
-        />
        <VnPaginate
            ref="paginate"
            data-key="AgencyWorkCenters"
--- a/src/pages/Route/locale/en.yml
+++ b/src/pages/Route/locale/en.yml
@ -23,3 +23,17 @@ route:
    Summary: Summary
    Route is closed: Route is closed
    Route is not served: Route is not served
+    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
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@ -23,3 +23,17 @@ route:
    Summary: Resumen
    Route is closed: La ruta está cerrada
    Route is not served: La ruta no está servida
+    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
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@ -1,7 +1,5 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';

@ -14,22 +12,9 @@ const props = defineProps({
 });

 const emit = defineEmits(['search']);
-
-const workers = ref();
-
-function setWorkers(data) {
-    workers.value = data;
-}
 </script>

 <template>
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        sort-by="firstName ASC"
-        @on-fetch="setWorkers"
-        auto-load
-    />
    <VnFilterPanel
        :data-key="props.dataKey"
        :search-button="true"
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@ -99,7 +99,11 @@ const setWireTransfer = async () => {
                    :key="index"
                    class="row q-gutter-md q-mb-md"
                >
-                    <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
+                    <VnInput
+                        :label="t('supplier.accounts.iban')"
+                        v-model="row.iban"
+                        :required="true"
+                    >
                        <template #append>
                            <QIcon name="info" class="cursor-info">
                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
@ -113,6 +117,7 @@ const setWireTransfer = async () => {
                        option-label="bic"
                        option-value="id"
                        hide-selected
+                        :required="true"
                        :roles-allowed-to-create="['financial']"
                    >
                        <template #form>
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@ -15,12 +15,12 @@ const route = useRoute();
 const agenciesOptions = ref(null);
 const newAgencyTermForm = reactive({
    agencyFk: null,
-    minimumM3: null,
-    packagePrice: null,
-    kmPrice: null,
-    m3Price: null,
+    minimumM3: 0,
+    packagePrice: 0,
+    kmPrice: 0,
+    m3Price: 0,
    routePrice: null,
-    minimumKm: null,
+    minimumKm: 0,
    supplierFk: route.params.id,
 });

--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@ -3,6 +3,8 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';

 const { t } = useI18n();
 const tableRef = ref();
@ -93,6 +95,11 @@ const columns = computed(() => [

 <template>
    <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
+    <RightMenu>
+        <template #right-panel>
+            <SupplierListFilter data-key="SuppliersList" />
+        </template>
+    </RightMenu>
    <VnTable
        ref="tableRef"
        data-key="SuppliersList"
@ -109,6 +116,7 @@ const columns = computed(() => [
                return data;
            },
        }"
+        :right-search="false"
        order="id ASC"
        :columns="columns"
        auto-load
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@ -49,7 +49,13 @@ async function handleSave() {

 <template>
    <FetchData
-        @on-fetch="(data) => (observationTypes = data)"
+        @on-fetch="
+            (data) =>
+                (observationTypes = data.map((type) => {
+                    type.label = t(`ticketNotes.observationTypes.${type.description}`);
+                    return type;
+                }))
+        "
        auto-load
        url="ObservationTypes"
    />
@ -76,7 +82,7 @@ async function handleSave() {
                            :label="t('ticketNotes.observationType')"
                            :options="observationTypes"
                            hide-selected
-                            option-label="description"
+                            option-label="label"
                            option-value="id"
                            v-model="row.observationTypeFk"
                            :disable="!!row.id"
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@ -663,6 +663,13 @@ watch(
                </QTooltip>
            </QIcon>
        </template>
+        <template #body-cell-picture="{ row }">
+            <QTd>
+                <div class="image-wrapper">
+                    <VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" />
+                </div>
+            </QTd>
+        </template>
        <template #column-image="{ row }">
            <div class="image-wrapper">
                <VnImg :id="parseInt(row?.item?.id)" class="rounded" />
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@ -82,29 +82,6 @@ async function changeState(value) {
    }
 }

-function getNoteValue(description) {
-    switch (description) {
-        case 'ItemPicker':
-            return t('ItemPicker');
-        case 'Packager':
-            return t('Packager');
-        case 'Delivery':
-            return t('Delivery');
-        case 'SalesPerson':
-            return t('SalesPerson');
-        case 'Administrative':
-            return t('Administrative');
-        case 'Weight':
-            return t('Weight');
-        case 'InvoiceOut':
-            return t('InvoiceOut');
-        case 'DropOff':
-            return t('DropOff');
-        case 'Sustitución':
-            return t('Sustitución');
-    }
-}
-
 function toTicketUrl(section) {
    return '#/ticket/' + entityId.value + '/' + section;
 }
@ -276,23 +253,32 @@ function toTicketUrl(section) {
                    :url="toTicketUrl('observation')"
                    :text="t('ticket.pageTitles.notes')"
                />
-                <VnLv
-                    v-for="note in entity.notes"
-                    :key="note.id"
-                    :label="getNoteValue(note.observationType.description)"
-                    :value="note.description"
+                <QVirtualScroll
+                    :items="entity.notes"
+                    v-slot="{ item, index }"
+                    style="max-height: 300px"
+                    separator
                >
-                    <template #value>
-                        <QInput
-                            v-model="note.description"
-                            filled
-                            type="textarea"
-                            class="notes"
-                            readonly
-                            autogrow
-                        />
-                    </template>
-                </VnLv>
+                    <QItem
+                        :key="index"
+                        class="vn-label-value"
+                        style="
+                            display: inline-block;
+                            padding: unset;
+                            min-height: max-content;
+                        "
+                    >
+                        <span class="label" style="margin-right: 4px">
+                            ({{
+                                t(
+                                    `ticketNotes.observationTypes.${item.observationType.description}`
+                                )
+                            }}):
+                        </span>
+
+                        <span>{{ item.description }}</span>
+                    </QItem>
+                </QVirtualScroll>
            </QCard>
            <QCard class="vn-one">
                <VnTitle :text="t('ticket.summary.summaryAmount')" />
@ -621,28 +607,3 @@ function toTicketUrl(section) {
    color: $primary-light;
 }
 </style>
-
-<i18n>
-en:
-    ItemPicker: Item Picker
-    Packager: Packager
-    Delivery: Delivery
-    SalesPerson: Sales Person
-    Administrative: Administrative
-    Weight: Weight
-    InvoiceOut: Invoice Out
-    DropOff: Drop Off
-    Sustitución: Sustitution
-es:
-    ItemPicker: Items
-    Packager: Encajador
-    Delivery: Envío
-    SalesPerson: Comercial
-    Administrative: Administrativa
-    Weight: Peso
-    InvoiceOut: Facturas
-    DropOff: Despacho
-    Sustitución: Sustitución
-    Accepted: Aceptado
-    Denied: Denegado
-</i18n>
--- a/src/pages/Ticket/TicketCreateDialog.vue
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@ -27,7 +27,6 @@ const initialFormState = reactive({
    warehouseId: user.value.warehouseFk,
    landed: null,
 });
-const clientOptions = ref([]);
 const agenciesOptions = ref([]);
 const addressesOptions = ref([]);
 const warehousesOptions = ref([]);
@ -111,12 +110,6 @@ const redirectToTicketList = (_, { id }) => {
 </script>

 <template>
-    <FetchData
-        url="Clients"
-        @on-fetch="(data) => (clientOptions = data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
-        auto-load
-    />
    <FetchData
        url="Warehouses"
        @on-fetch="(data) => (warehousesOptions = data)"
@ -137,7 +130,9 @@ const redirectToTicketList = (_, { id }) => {
                    <VnSelect
                        :label="t('ticket.create.client')"
                        v-model="data.clientId"
-                        :options="clientOptions"
+                        url="Clients"
+                        :fields="['id', 'name', 'defaultAddressFk']"
+                        sort-by="id"
                        option-value="id"
                        option-label="name"
                        hide-selected
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';

 const { t } = useI18n();
 const props = defineProps({
@ -15,7 +16,6 @@ const props = defineProps({
    },
 });

-const workers = ref([]);
 const provinces = ref([]);
 const states = ref([]);
 const agencies = ref([]);
@ -27,12 +27,6 @@ const warehouses = ref([]);
    <FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = 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">
        <template #tags="{ tag, formatFn }">
            <div class="q-gutter-x-xs">
@ -66,23 +60,19 @@ const warehouses = ref([]);
                </QItemSection>
            </QItem>
            <QItem>
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <QSelect
+                <QItemSection>
+                    <VnSelect
                        :label="t('Salesperson')"
                        v-model="params.salesPersonFk"
-                        :options="workers"
+                        url="Workers/activeWithInheritedRole"
+                        :where="{ role: 'salesPerson' }"
                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
+                        option-label="firstName"
+                        :use-like="false"
+                        sort-by="firstName ASC"
                        dense
                        outlined
                        rounded
-                        :input-debounce="0"
                    />
                </QItemSection>
            </QItem>
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@ -14,6 +14,16 @@ ticketNotes:
    description: Description
    removeNote: Remove note
    addNote: Add note
+    observationTypes:
+        ItemPicker: Item picker
+        Packager: Packager
+        Delivery: Delivery
+        SalesPerson: Sales person
+        Administrative: Administrative
+        Weight: Weight
+        InvoiceOut: Invoice Out
+        DropOff: Drop Off
+        Sustitución: Sustitution
 ticketSale:
    id: Id
    visible: Visible
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@ -29,6 +29,18 @@ ticketNotes:
    description: Descripción
    removeNote: Quitar nota
    addNote: Añadir nota
+    observationTypes:
+        ItemPicker: Sacador
+        Packager: Encajador
+        Delivery: Envío
+        SalesPerson: Comercial
+        Administrative: Administrativa
+        Weight: Peso
+        InvoiceOut: Facturas
+        DropOff: Despacho
+        Sustitución: Sustitución
+        Accepted: Aceptado
+        Denied: Denegado
 purchaseRequest:
    Id: Id
    description: Descripción
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@ -30,18 +30,9 @@ const router = useRouter();
 const state = useState();
 const { notify } = useNotify();

-const thermographFilter = {
-    fields: ['id', 'thermographFk'],
-    where: {
-        or: [{ travelFk: null }, { travelFk: route.params.id }],
-    },
-    order: 'thermographFk ASC',
-};
-
 const fetchTravelThermographsRef = ref(null);
 const allowedContentTypes = ref('');
 const user = state.getUser();
-const thermographsOptions = ref([]);
 const dmsTypesOptions = ref([]);
 const companiesOptions = ref([]);
 const warehousesOptions = ref([]);
@ -172,13 +163,6 @@ const onThermographCreated = async (data) => {
        auto-load
        url="Temperatures"
    />
-    <FetchData
-        ref="fetchTravelThermographsRef"
-        url="TravelThermographs"
-        @on-fetch="(data) => (thermographsOptions = data)"
-        :filter="thermographFilter"
-        auto-load
-    />
    <QPage class="column items-center full-width">
        <QForm
            model="travel"
@ -214,7 +198,12 @@ const onThermographCreated = async (data) => {
                    <VnSelectDialog
                        :label="t('travel.thermographs.thermograph')"
                        v-model="thermographForm.travelThermographFk"
-                        :options="thermographsOptions"
+                        url="TravelThermographs"
+                        :fields="['id', 'thermographFk']"
+                        :where="{
+                            or: [{ travelFk: null }, { travelFk: $route.params.id }],
+                        }"
+                        sort-by="thermographFk ASC"
                        option-label="thermographFk"
                        :disable="viewAction === 'edit'"
                        :tooltip="t('New thermograph')"
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@ -124,6 +124,12 @@ defineExpose({ states });
                    lazy-rules
                    is-outlined
                />
+                <VnInput
+                    :label="t('travel.travelList.tableVisibleColumns.daysOnward')"
+                    v-model="params.daysOnward"
+                    lazy-rules
+                    is-outlined
+                />
            </div>
        </template>
    </VnFilterPanel>
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@ -161,15 +161,6 @@ const columns = computed(() => [
        cardVisible: true,
        create: true,
    },
-    {
-        align: 'left',
-        name: 'daysOnward',
-        label: t('travel.travelList.tableVisibleColumns.daysOnward'),
-        visible: false,
-        columnFilter: {
-            inWhere: false,
-        },
-    },
    {
        align: 'right',
        label: '',
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@ -57,9 +57,21 @@ const columns = computed(() => [
        field: 'concept',
        cardVisible: true,
    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        style: 'max-width: 20px; text-align: initial;',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
-
 <template>
    <VnTable
        ref="tableRef"
@ -69,7 +81,7 @@ const columns = computed(() => [
        save-url="WorkerIncomes/crud"
        :create="{
            urlCreate: 'workerIncomes',
-            title: t('Create workerBalance'),
+            title: t('Create balance'),
            onDataSaved: () => tableRef.reload(),
            formInitialData: {
                workerFk: entityId,
@ -81,10 +93,10 @@ const columns = computed(() => [
        :right-search="false"
        :is-editable="true"
        :use-model="true"
+        :default-remove="false"
    />
 </template>
-
 <i18n>
    es:
-        Create workerBalance: Crear balance
+        Create balance: Crear balance
 </i18n>
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@ -3,9 +3,11 @@ import WorkerEventLabel from 'pages/Worker/Card/WorkerEventLabel.vue';
 import FetchData from 'components/FetchData.vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'components/common/VnSelect.vue';
+import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { toDateFormat } from '../../../filters/date';
+const { notify } = useNotify();

 const { t } = useI18n();
 const route = useRoute();
@ -33,6 +35,13 @@ const props = defineProps({
    },
 });

+watch(
+    () => props.contractHolidays,
+    (newValue) => {
+        checkHolidays(newValue);
+    },
+    { deep: true, immediate: true }
+);
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);

 const selectedBusinessFk = computed({
@ -53,12 +62,22 @@ const selectedAbsenceType = computed({
    },
 });

-const generateYears = () => {
+function generateYears() {
    const now = Date.vnNew();
    const maxYear = now.getFullYear() + 1;

    return Array.from({ length: 5 }, (_, i) => String(maxYear - i)) || [];
-};
+}
+
+function checkHolidays(contractHolidays) {
+    if (!contractHolidays) return;
+    if (
+        contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||
+        contractHolidays.hoursEnjoyed > contractHolidays.totalHours
+    ) {
+        notify(t('Vacation days have been exceeded'), 'negative');
+    }
+}

 const absenceTypeList = ref([]);
 const contractList = ref([]);
--- a/src/pages/Worker/Card/WorkerChangePasswordForm.vue
+++ b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
@ -1,99 +0,0 @@
-<script setup>
-import { ref, reactive, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import FormPopup from 'src/components/FormPopup.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const $props = defineProps({
-    id: {
-        type: Object,
-        default: () => {},
-    },
-});
-
-const emit = defineEmits(['onSubmit']);
-
-const { t } = useI18n();
-const { notify } = useNotify();
-
-const formData = reactive({
-    newPassword: null,
-    repeatPassword: null,
-});
-
-const passRequirements = ref([]);
-
-const setPassword = async () => {
-    try {
-        if (!formData.newPassword) {
-            notify(t('You must enter a new password'), 'negative');
-            return;
-        }
-
-        if (formData.newPassword != formData.repeatPassword) {
-            notify(t(`Passwords don't match`), 'negative');
-            return;
-        }
-
-        await axios.patch(`Workers/${$props.id}/setPassword`, {
-            newPass: formData.newPassword,
-        });
-        notify(t('Password changed!'), 'positive');
-        emit('onSubmit');
-    } catch (err) {
-        console.error('Error setting password', err);
-    }
-};
-
-const getPassRequirements = async () => {
-    const { data } = await axios.get('UserPasswords/findOne');
-    passRequirements.value = data;
-};
-
-onMounted(async () => await getPassRequirements());
-</script>
-
-<template>
-    <FormPopup :title="t('Reset password')" @on-submit="setPassword()">
-        <template #form-inputs>
-            <VnRow>
-                <VnInput
-                    :label="t('New password')"
-                    v-model="formData.newPassword"
-                    type="password"
-                    :required="true"
-                    :info="
-                        t('passwordRequirements', {
-                            length: passRequirements.length,
-                            nAlpha: passRequirements.nAlpha,
-                            nUpper: passRequirements.nUpper,
-                            nDigits: passRequirements.nDigits,
-                            nPunct: passRequirements.nPunct,
-                        })
-                    "
-                />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    :label="t('Repeat password')"
-                    v-model="formData.repeatPassword"
-                    type="password"
-                />
-            </VnRow>
-        </template>
-    </FormPopup>
-</template>
-
-<i18n>
-es:
-    Reset password: Restablecer contraseña
-    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/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePasswordForm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
@ -24,18 +24,13 @@ const route = useRoute();
 const { t } = useI18n();
 const state = useState();
 const user = state.getUser();
-const changePasswordFormDialog = ref(null);
-const cardDescriptorRef = ref(null);
 const showEditPhotoForm = ref(false);
 const toggleEditPictureForm = () => {
    showEditPhotoForm.value = !showEditPhotoForm.value;
 };
-
 const entityId = computed(() => {
    return $props.id || route.params.id;
 });
-
-const worker = ref();
 const workerExcluded = ref(false);

 const getIsExcluded = async () => {
@ -61,10 +56,10 @@ const handleExcluded = async () => {

    workerExcluded.value = !workerExcluded.value;
 };
+
 const handlePhotoUpdated = (evt = false) => {
    image.value.reload(evt);
 };
-const refetch = async () => await cardDescriptorRef.value.getData();
 </script>
 <template>
    <CardDescriptor
@ -74,15 +69,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
        url="Workers/descriptor"
        :filter="{ where: { id: entityId } }"
        title="user.nickname"
-        @on-fetch="
-            (data) => {
-                worker = data;
-                getIsExcluded();
-            }
-        "
+        @on-fetch="getIsExcluded"
    >
-        <template #menu="{}">
-            <QItem v-ripple clickable @click="handleExcluded()">
+        <template #menu="{ entity }">
+            <QItem v-ripple clickable @click="handleExcluded">
                <QItemSection>
                    {{
                        workerExcluded
@ -92,16 +82,13 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                </QItemSection>
            </QItem>
            <QItem
-                v-if="!worker.user.emailVerified && user.id != worker.id"
+                v-if="!entity.user.emailVerified && user.id != entity.id"
                v-ripple
                clickable
-                @click="$refs.changePasswordFormDialog.show()"
+                @click="$refs.changePassRef.show"
            >
                <QItemSection>
-                    {{ t('Change password') }}
-                    <QDialog ref="changePasswordFormDialog">
-                        <WorkerChangePasswordForm @on-submit="refetch()" :id="entityId" />
-                    </QDialog>
+                    {{ t('globals.changePass') }}
                </QItemSection>
            </QItem>
        </template>
@ -167,10 +154,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                    <VnLinkPhone :phone-number="entity.phone" />
                </template>
            </VnLv>
-            <VnLv :value="worker?.sip?.extension">
+            <VnLv :value="entity?.sip?.extension">
                <template #label>
                    {{ t('worker.summary.sipExtension') }}
-                    <VnLinkPhone :phone-number="worker?.sip?.extension" />
+                    <VnLinkPhone :phone-number="entity?.sip?.extension" />
                </template>
            </VnLv>
        </template>
@ -201,6 +188,15 @@ const refetch = async () => await cardDescriptorRef.value.getData();
            </QCardActions>
        </template>
    </CardDescriptor>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Workers/${$route.params.id}/setPassword`, { newPass });
+            }
+        "
+        @on-submit="$refs.cardDescriptorRef?.getData"
+    />
 </template>

 <style lang="scss" scoped>
@ -213,5 +209,4 @@ const refetch = async () => await cardDescriptorRef.value.getData();
 es:
    Click to allow the user to be disabled: Marcar para deshabilitar
    Click to exclude the user from getting disabled: Marcar para no deshabilitar
-    Change password: Cambiar contraseña
 </i18n>
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@ -96,10 +96,23 @@ const columns = computed(() => [
        label: t('worker.formation.tableVisibleColumns.hasDiploma'),
        create: true,
    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
 <template>
    <VnTable
+        class="worker-formation"
        ref="tableRef"
        data-key="WorkerFormation"
        :url="`Workers/${entityId}/trainingCourse`"
@ -120,8 +133,15 @@ const columns = computed(() => [
        :right-search="false"
        :is-editable="true"
        :use-model="true"
+        :default-remove="false"
    />
 </template>
+<style lang="scss" scoped>
+:global(.worker-formation thead > tr > th:nth-child(7)),
+:global(.worker-formation thead > tr > th:nth-child(8)) {
+    max-width: 50px;
+}
+</style>
 <i18n>
 es:
    Create training course: Crear curso de formación
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@ -65,6 +65,18 @@ const columns = [
        create: true,
        component: 'input',
    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ];
 </script>
 <template>
@ -87,5 +99,6 @@ const columns = [
        :right-search="false"
        :is-editable="true"
        :use-model="true"
+        :default-remove="false"
    />
 </template>
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@ -0,0 +1,204 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { ref, computed } from 'vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import CrudModel from 'components/CrudModel.vue';
+import axios from 'axios';
+
+const { t } = useI18n();
+
+const crudModelRef = ref();
+const warehousesData = ref([]);
+const itemPackingTypesData = ref([]);
+const sectorsData = ref([]);
+const trainsData = ref([]);
+const machinesData = ref([]);
+const route = useRoute();
+const routeId = computed(() => route.params.id);
+
+const initialData = computed(() => {
+    return {
+        workerFk: routeId.value,
+        numberOfWagons: 2,
+        trainFk: 1,
+        itemPackingTypeFk: 'H',
+        warehouseFk: 60,
+        sectorFk: null,
+        labelerFk: null,
+        linesLimit: 20,
+        volumenLimit: 0.5,
+        sizeLimit: null,
+        isOnReservationMode: 0,
+        machineFk: null,
+    };
+});
+
+async function insert() {
+    await axios.post('Operators', initialData.value);
+    crudModelRef.value.reload();
+}
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md centerCard">
+        <FetchData url="Trains" @on-fetch="(data) => (trainsData = data)" auto-load />
+        <FetchData
+            url="ItemPackingTypes"
+            @on-fetch="(data) => (itemPackingTypesData = data)"
+            auto-load
+        />
+        <FetchData
+            url="Warehouses"
+            @on-fetch="(data) => (warehousesData = data)"
+            auto-load
+        />
+        <FetchData url="Printers" @on-fetch="(data) => (PrintersData = data)" auto-load />
+        <FetchData url="Sectors" @on-fetch="(data) => (sectorsData = data)" auto-load />
+        <FetchData url="Machines" @on-fetch="(data) => (machinesData = data)" auto-load />
+        <CrudModel
+            data-key="workerOperator"
+            url="Operators"
+            primary-key="workerFk"
+            :filter="{ where: { workerFk: route.params.id } }"
+            :data-required="{ workerFk: route.params.id }"
+            ref="crudModelRef"
+            search-url="operator"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <div v-if="rows.length">
+                    <QCard
+                        flat
+                        bordered
+                        :key="row.$index"
+                        v-for="row of rows"
+                        class="card q-px-md q-mb-sm container"
+                    >
+                        <VnRow>
+                            <VnInput
+                                :label="t('worker.operator.numberOfWagons')"
+                                v-model="row.numberOfWagons"
+                            />
+                            <VnSelect
+                                :label="t('worker.operator.train')"
+                                :options="trainsData"
+                                hide-selected
+                                v-model="row.trainFk"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('worker.operator.itemPackingType')"
+                                :options="itemPackingTypesData"
+                                hide-selected
+                                option-label="code"
+                                option-value="code"
+                                v-model="row.itemPackingTypeFk"
+                            />
+                            <VnSelect
+                                :label="t('worker.operator.warehouse')"
+                                :options="warehousesData"
+                                hide-selected
+                                v-model="row.warehouseFk"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('worker.operator.sector')"
+                                :options="sectorsData"
+                                hide-selected
+                                option-label="description"
+                                v-model="row.sectorFk"
+                            />
+                            <VnSelect
+                                :label="t('worker.operator.labeler')"
+                                :options="PrintersData"
+                                hide-selected
+                                option-label="name"
+                                v-model="row.labelerFk"
+                            >
+                                <template #option="scope">
+                                    <QItem v-bind="scope.itemProps">
+                                        <QItemSection>
+                                            <QItemLabel
+                                                >ID: {{ scope.opt?.id }}</QItemLabel
+                                            >
+                                            <QItemLabel caption>
+                                                {{ scope.opt?.id }},
+                                                {{ scope.opt?.name }}
+                                            </QItemLabel>
+                                        </QItemSection>
+                                    </QItem>
+                                </template>
+                            </VnSelect>
+                        </VnRow>
+                        <VnRow>
+                            <VnInput
+                                :label="t('worker.operator.linesLimit')"
+                                v-model="row.linesLimit"
+                                lazy-rules
+                            />
+                            <VnInput
+                                :label="t('worker.operator.volumeLimit')"
+                                v-model="row.volumeLimit"
+                                lazy-rules
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput
+                                :label="t('worker.operator.sizeLimit')"
+                                v-model="row.sizeLimit"
+                                lazy-rules
+                            />
+                            <VnInput
+                                :label="t('worker.operator.isOnReservationMode')"
+                                v-model="row.isOnReservationMode"
+                                lazy-rules
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('worker.operator.machine')"
+                                :options="machinesData"
+                                hide-selected
+                                option-label="plate"
+                                v-model="row.machineFk"
+                            />
+                        </VnRow>
+                    </QCard>
+                </div>
+            </template>
+        </CrudModel>
+        <QPageSticky position="bottom-right" :offset="[25, 25]">
+            <QBtn
+                fab
+                color="primary"
+                icon="add"
+                @click="insert()"
+                v-if="!crudModelRef?.formData?.length"
+            />
+        </QPageSticky>
+    </QPage>
+</template>
+<style lang="scss" scoped>
+.btn-delete {
+    max-width: 4%;
+    margin-top: 30px;
+}
+</style>
+<i18n>
+es:
+    Model: Modelo
+    Serial number: Número de serie
+    Current SIM: SIM actual
+    Add new device: Añadir nuevo dispositivo
+    PDA deallocated: PDA desasignada
+    Remove PDA: Eliminar PDA
+    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
+    You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
+    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+</i18n>
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@ -139,6 +139,7 @@ onBeforeMount(async () => {
                        <VnLinkPhone :phone-number="worker?.sip?.extension" />
                    </template>
                </VnLv>
+                <VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
            </QCard>
        </template>
    </CardSummary>
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@ -326,16 +326,20 @@ const updateData = async () => {
 };

 const getMailStates = async (date) => {
+    const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
+    const month = date.getMonth() + 1;
+    const prevMonth = month == 1 ? 12 : month - 1;
    const params = {
-        month: date.getMonth() + 1,
+        month,
        year: date.getFullYear(),
    };

-    const { data } = await axios.get(
-        `WorkerTimeControls/${route.params.id}/getMailStates`,
-        { params }
-    );
-    workerTimeControlMails.value = data;
+    const curMonthStates = (await axios.get(url, { params })).data;
+    const prevMonthStates = (
+        await axios.get(url, { params: { ...params, month: prevMonth } })
+    ).data;
+
+    workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
 };

 const showWorkerTimeForm = (propValue, formType) => {
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@ -7,7 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';

-const { t } = useI18n();
+const { t, te } = useI18n();
 const props = defineProps({
    dataKey: {
        type: String,
@ -16,6 +16,11 @@ const props = defineProps({
 });

 const departments = ref();
+
+const getLocale = (label) => {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+};
 </script>

 <template>
@ -23,7 +28,7 @@ const departments = ref();
    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
        <template #tags="{ tag, formatFn }">
            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(tag.label) }}: </strong>
                <span>{{ formatFn(tag.value) }}</span>
            </div>
        </template>
@ -64,10 +69,7 @@ const departments = ref();
                </QItemSection>
            </QItem>
            <QItem>
-                <QItemSection v-if="!departments">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="departments">
+                <QItemSection>
                    <VnSelect
                        :label="t('Department')"
                        v-model="params.departmentFk"
@ -82,6 +84,11 @@ const departments = ref();
                    />
                </QItemSection>
            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                </QItemSection>
+            </QItem>
            <QItem>
                <QItemSection>
                    <VnInput
@ -99,23 +106,17 @@ const departments = ref();
 en:
    params:
        search: Contains
-        fi: FI
        firstName: First name
        lastName: Last name
        userName: User
        extension: Extension
-        departmentFk: Department
-        id: ID
 es:
    params:
        search: Contiene
-        fi: NIF
        firstName: Nombre
        lastName: Apellidos
        userName: Usuario
        extension: Extensión
-        departmentFk: Departamento
-        id: ID
    FI: NIF
    First Name: Nombre
    Last Name: Apellidos
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@ -29,6 +29,7 @@ const postcodesOptions = ref([]);

 const user = useState().getUser();
 const defaultPayMethod = ref();
+const bankEntitiesRef = ref();
 const columns = computed(() => [
    {
        align: 'left',
@ -39,13 +40,31 @@ const columns = computed(() => [
    },
    {
        align: 'left',
-        name: 'nickname',
-        label: t('tableColumns.name'),
+        name: 'firstName',
+        label: t('tableColumns.firstName'),
        isTitle: true,
        columnFilter: {
            name: 'firstName',
        },
    },
+    {
+        align: 'left',
+        name: 'lastName',
+        label: t('tableColumns.lastName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'lastName',
+        },
+    },
+    {
+        align: 'left',
+        name: 'nickname',
+        label: t('tableColumns.userName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'userName',
+        },
+    },
    {
        align: 'left',
        name: 'departmentFk',
@ -66,10 +85,17 @@ const columns = computed(() => [
        label: t('tableColumns.email'),
        cardVisible: true,
        columnFilter: {
-            alias: 'mu',
-            inWhere: true,
+            name: 'email',
+        },
+    },
+    {
+        align: 'left',
+        name: 'extension',
+        label: t('tableColumns.extension'),
+        cardVisible: true,
+        columnFilter: {
+            name: 'extension',
        },
-        hidden: true,
    },
    {
        align: 'right',
@ -93,6 +119,12 @@ onBeforeMount(async () => {
    ).data?.payMethodFk;
 });

+async function handleNewBankEntity(data, resp) {
+    await bankEntitiesRef.value.fetch();
+    data.bankEntityFk = resp.id;
+    bankEntitiesOptions.value.push(resp);
+}
+
 function handleLocation(data, location) {
    const { town, code, provinceFk, countryFk } = location ?? {};
    data.postcode = code;
@ -152,6 +184,7 @@ async function autofillBic(worker) {
        auto-load
    />
    <FetchData
+        ref="bankEntitiesRef"
        url="BankEntities"
        @on-fetch="(data) => (bankEntitiesOptions = data)"
        auto-load
@ -180,7 +213,7 @@ async function autofillBic(worker) {
        default-mode="table"
        redirect="worker"
        :right-search="false"
-        auto-load
+        :order="['id DESC']"
    >
        <template #more-create-dialog="{ data }">
            <div class="q-pa-lg full-width">
@ -319,7 +352,9 @@ async function autofillBic(worker) {
                    >
                        <template #form>
                            <CreateBankEntityForm
-                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
+                                @on-data-saved="
+                                    (_, resp) => handleNewBankEntity(data, resp)
+                                "
                            />
                        </template>
                        <template #option="scope">
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@ -1,6 +1,12 @@
 passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
 tableColumns:
    id: ID
-    name: Name
+    firstName: First name
+    lastName: Last Name
+    userName: User Name
    department: Department
    email: Email
+    fi: FI
+    SSN: SSN
+    extension: Extension
+queue: Queue
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@ -6,6 +6,12 @@ External: Externo
 passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
 tableColumns:
    id: ID
-    name: Nombre
+    firstName: Nombre
+    lastName: Apellidos
+    userName: Nombre de usuario
    department: Departamento
    email: Email
+    fi: NIF
+    SSN: NSS
+    extension: Extensión
+queue: Cola
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@ -96,7 +96,7 @@ watch(
                sort-by="code, townFk"
                option-value="geoFk"
                option-label="code"
-                option-filter="code"
+                :filter-options="['code', 'geoFk']"
                hide-selected
                dense
                outlined
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@ -12,7 +12,13 @@ export default {
    component: RouterView,
    redirect: { name: 'EntryMain' },
    menus: {
-        main: ['EntryList', 'MyEntries', 'EntryLatestBuys', 'EntryStockBought'],
+        main: [
+            'EntryList',
+            'MyEntries',
+            'EntryLatestBuys',
+            'EntryStockBought',
+            'EntryWasteRecalc',
+        ],
        card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
    },
    children: [
@ -67,6 +73,15 @@ export default {
                    },
                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
                },
+                {
+                    path: 'waste-recalc',
+                    name: 'EntryWasteRecalc',
+                    meta: {
+                        title: 'wasteRecalc',
+                        icon: 'compost',
+                    },
+                    component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
+                },
            ],
        },
        {
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@ -27,6 +27,7 @@ export default {
            'WorkerBalance',
            'WorkerFormation',
            'WorkerMedical',
+            'WorkerOperator',
        ],
    },
    children: [
@ -168,6 +169,7 @@ export default {
                    meta: {
                        title: 'log',
                        icon: 'vn:History',
+                        acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
                    },
                    component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
                },
@ -207,6 +209,15 @@ export default {
                    },
                    component: () => import('src/pages/Worker/Card/WorkerMedical.vue'),
                },
+                {
+                    name: 'WorkerOperator',
+                    path: 'operator',
+                    meta: {
+                        title: 'operator',
+                        icon: 'person',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerOperator.vue'),
+                },
            ],
        },
    ],
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@ -33,7 +33,8 @@ describe('ClaimDevelopment', () => {
        cy.saveCard();
    });

-    it('should add and remove new line', () => {
+    // TODO: #8112
+    xit('should add and remove new line', () => {
        cy.wait(['@workers', '@workers']);
        cy.addCard();

--- a/test/cypress/integration/claim/claimNotes.spec.js
+++ b/test/cypress/integration/claim/claimNotes.spec.js
@ -1,4 +1,6 @@
 describe('ClaimNotes', () => {
+    const saveBtn = '.q-field__append > .q-btn > .q-btn__content > .q-icon';
+    const firstNote = '.q-infinite-scroll :nth-child(1) > .q-card__section--vert';
    beforeEach(() => {
        cy.login('developer');
        cy.visit(`/#/claim/${2}/notes`);
@ -7,7 +9,7 @@ describe('ClaimNotes', () => {
    it('should add a new note', () => {
        const message = 'This is a new message.';
        cy.get('.q-textarea').type(message);
-        cy.get('.q-field__append > .q-btn > .q-btn__content > .q-icon').click(); //save
-        cy.get(':nth-child(1) > .q-card__section--vert').should('have.text', message);
+        cy.get(saveBtn).click();
+        cy.get(firstNote).should('have.text', message);
    });
 });
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@ -11,7 +11,7 @@ describe('EntryMy when is supplier', () => {

    it('should open buyLabel when is supplier', () => {
        cy.get(
-            '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
+            '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
        ).click();
        cy.get('.q-card__actions > .q-btn').click();
        cy.window().its('open').should('be.called');
--- a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@ -4,12 +4,12 @@ describe('AgencyWorkCenter', () => {
        cy.login('developer');
        cy.visit(`/#/agency/11/workCenter`);
    });
+    const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon';
+    const workCenterCombobox = 'input[role="combobox"]';

    it('assign workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
+        cy.get(createButton).click();
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
        cy.get('.q-notification__message').should('have.text', 'Data created');
    });

@ -22,12 +22,10 @@ describe('AgencyWorkCenter', () => {
    });

    it('error on duplicate workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
+        cy.get(createButton).click();
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
        cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(createButton).click();
        cy.get(
            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
        ).type('workCenterOne{enter}');
--- a/test/cypress/integration/route/routeList.spec.js
+++ b/test/cypress/integration/route/routeList.spec.js
@ -2,7 +2,7 @@ describe('Route', () => {
    beforeEach(() => {
        cy.viewport(1920, 1080);
        cy.login('developer');
-        cy.visit(`/#/route/list`);
+        cy.visit(`/#/route/extended-list`);
    });
    const getVnSelect =
        '> :nth-child(1) > .column > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@ -1,7 +1,8 @@
 /// <reference types="cypress" />
 describe('Ticket descriptor', () => {
-    const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
-    const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)';
+    const listItem = '[role="menu"] .q-list .q-item';
+    const toCloneOpt = 'To clone ticket';
+    const setWeightOpt = 'Set weight';
    const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
    const summaryHeader = '.summaryHeader > div';
    const weight = 25;
@ -14,7 +15,7 @@ describe('Ticket descriptor', () => {
    it('should clone the ticket without warehouse', () => {
        cy.visit('/#/ticket/1/summary');
        cy.openActionsDescriptor();
-        cy.get(toCloneOpt).click();
+        cy.contains(listItem, toCloneOpt).click();
        cy.clickConfirm();
        cy.get(warehouseValue).contains('Warehouse One');
        cy.get(summaryHeader)
@ -28,7 +29,7 @@ describe('Ticket descriptor', () => {
    it('should set the weight of the ticket', () => {
        cy.visit('/#/ticket/10/summary');
        cy.openActionsDescriptor();
-        cy.get(setWeightOpt).click();
+        cy.contains(listItem, setWeightOpt).click();
        cy.intercept('POST', /\/api\/Tickets\/\d+\/setWeight/).as('weight');
        cy.get('.q-dialog input').type(weight);
        cy.clickConfirm();
--- a/Show More
+++ b/Show More