package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.42.0",
+    "version": "24.44.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

src/boot/axios.js

@@ -2,9 +2,11 @@ import axios from 'axios';
 import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
 import useNotify from 'src/composables/useNotify.js';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 
 const session = useSession();
 const { notify } = useNotify();
+const stateQuery = useStateQueryStore();
 const baseUrl = '/api/';
 
 axios.defaults.baseURL = baseUrl;
@@ -15,7 +17,7 @@ const onRequest = (config) => {
     if (token.length && !config.headers.Authorization) {
         config.headers.Authorization = token;
     }
-
+    stateQuery.add(config);
     return config;
 };
 
@@ -24,10 +26,10 @@ const onRequestError = (error) => {
 };
 
 const onResponse = (response) => {
-    const { method } = response.config;
+    const config = response.config;
+    stateQuery.remove(config);
 
-    const isSaveRequest = method === 'patch';
+    if (config.method === 'patch') {
-    if (isSaveRequest) {
         notify('globals.dataSaved', 'positive');
     }
 
@@ -35,6 +37,8 @@ const onResponse = (response) => {
 };
 
 const onResponseError = (error) => {
+    stateQuery.remove(error.config);
+
     let message = '';
 
     const response = error.response;

src/boot/defaults/qInput.js

@@ -0,0 +1,4 @@
+import { QInput } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QInput, 'dense', true);

src/boot/defaults/qSelect.js

@@ -0,0 +1,4 @@
+import { QSelect } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QSelect, 'dense', true);

src/boot/quasar.defaults.js

@@ -1 +1,3 @@
 export * from './defaults/qTable';
+export * from './defaults/qInput';
+export * from './defaults/qSelect';

src/components/CreateBankEntityForm.vue

@@ -31,8 +31,8 @@ const countriesFilter = {
 
 const countriesOptions = ref([]);
 
-const onDataSaved = (formData, requestResponse) => {
+const onDataSaved = (...args) => {
-    emit('onDataSaved', formData, requestResponse);
+    emit('onDataSaved', ...args);
 };
 
 onMounted(async () => {

src/components/CreateNewPostcodeForm.vue

@@ -79,14 +79,20 @@ async function onProvinceCreated(data) {
 watch(
     () => [postcodeFormData.countryFk],
     async (newCountryFk, oldValueFk) => {
-        if (!!oldValueFk[0] && newCountryFk[0] !== oldValueFk[0]) {
+        if (Array.isArray(newCountryFk)) {
+            newCountryFk = newCountryFk[0];
+        }
+        if (Array.isArray(oldValueFk)) {
+            oldValueFk = oldValueFk[0];
+        }
+        if (!!oldValueFk && newCountryFk !== oldValueFk) {
             postcodeFormData.provinceFk = null;
             postcodeFormData.townFk = null;
         }
-        if ((newCountryFk, newCountryFk !== postcodeFormData.countryFk)) {
+        if (oldValueFk !== newCountryFk) {
             await provincesFetchDataRef.value.fetch({
                 where: {
-                    countryFk: newCountryFk[0],
+                    countryFk: newCountryFk,
                 },
             });
             await townsFetchDataRef.value.fetch({
@@ -103,9 +109,12 @@ watch(
 watch(
     () => postcodeFormData.provinceFk,
     async (newProvinceFk) => {
-        if (newProvinceFk[0] && newProvinceFk[0] !== postcodeFormData.provinceFk) {
+        if (Array.isArray(newProvinceFk)) {
+            newProvinceFk = newProvinceFk[0];
+        }
+        if (newProvinceFk !== postcodeFormData.provinceFk) {
             await townsFetchDataRef.value.fetch({
-                where: { provinceFk: newProvinceFk[0] },
+                where: { provinceFk: newProvinceFk },
             });
         }
     }
@@ -125,16 +134,26 @@ async function handleCountries(data) {
     <FetchData
         ref="provincesFetchDataRef"
         @on-fetch="handleProvinces"
+        :sort-by="['name ASC']"
+        :limit="30"
         auto-load
         url="Provinces/location"
     />
     <FetchData
         ref="townsFetchDataRef"
+        :sort-by="['name ASC']"
+        :limit="30"
         @on-fetch="handleTowns"
         auto-load
         url="Towns/location"
     />
-    <FetchData @on-fetch="handleCountries" auto-load url="Countries" />
+    <FetchData
+        @on-fetch="handleCountries"
+        :sort-by="['name ASC']"
+        :limit="30"
+        auto-load
+        url="Countries"
+    />
     <FormModelPopup
         url-create="postcodes"
         model="postcode"

src/components/CreateNewProvinceForm.vue

@@ -46,6 +46,8 @@ const onDataSaved = (dataSaved, requestResponse) => {
             },
         }"
         url="Autonomies/location"
+        :sort-by="['name ASC']"
+        :limit="30"
     />
     <FormModelPopup
         :title="t('New province')"

src/components/NavBar.vue

@@ -3,6 +3,7 @@ import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 import { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
 import UserPanel from 'components/UserPanel.vue';
@@ -12,6 +13,7 @@ import VnAvatar from './ui/VnAvatar.vue';
 const { t } = useI18n();
 const stateStore = useStateStore();
 const quasar = useQuasar();
+const stateQuery = useStateQueryStore();
 const state = useState();
 const user = state.getUser();
 const appName = 'Lilium';
@@ -50,6 +52,14 @@ const pinnedModulesRef = ref();
                 </QBtn>
             </RouterLink>
             <VnBreadcrumbs v-if="$q.screen.gt.sm" />
+            <QSpinner
+                color="primary"
+                class="q-ml-md"
+                :class="{
+                    'no-visible': !stateQuery.isLoading().value,
+                }"
+                size="xs"
+            />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>
             <QSpace />

src/components/VnSelectProvince.vue

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

src/components/VnTable/VnTable.vue

@@ -134,6 +134,7 @@ const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
 const tableFilterRef = ref([]);
+const tableRef = ref();
 
 const tableModes = [
     {
@@ -315,12 +316,20 @@ defineExpose({
     selected,
     CrudModelRef,
     params,
+    tableRef,
 });
 
 function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
+
+function handleScroll() {
+    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
+    const { scrollHeight, scrollTop, clientHeight } = tMiddle;
+    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
+    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
+}
 </script>
 <template>
     <QDrawer
@@ -405,8 +414,10 @@ function handleOnDataSaved(_) {
         </template>
         <template #body="{ rows }">
             <QTable
+                ref="tableRef"
                 v-bind="table"
                 class="vnTable"
+                :class="{ 'last-row-sticky': $props.footer }"
                 :columns="splittedColumns.columns"
                 :rows="rows"
                 v-model:selected="selected"
@@ -416,12 +427,7 @@ function handleOnDataSaved(_) {
                 flat
                 :style="isTableMode && `max-height: ${tableHeight}`"
                 :virtual-scroll="isTableMode"
-                @virtual-scroll="
+                @virtual-scroll="handleScroll"
-                    (event) =>
-                        event.index > rows.length - 2 &&
-                        ($props.crudModel?.paginate ?? true) &&
-                        CrudModelRef.vnPaginateRef.paginate()
-                "
                 @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                 @update:selected="emit('update:selected', $event)"
             >
@@ -811,6 +817,7 @@ es:
         top: 0;
     }
 }
+
 .vnTable {
     thead tr th {
         position: sticky;
@@ -849,6 +856,9 @@ es:
     table tbody th {
         position: relative;
     }
+}
+
+.last-row-sticky {
     tbody:nth-last-child(1) {
         @extend .bg-header;
         position: sticky;

src/components/common/VnBtnSelect.vue

@@ -0,0 +1,19 @@
+<script setup>
+import VnSelect from './VnSelect.vue';
+
+defineProps({
+    selectProps: { type: Object, required: true },
+    promise: { type: Function, default: () => {} },
+});
+</script>
+<template>
+    <QBtnDropdown v-bind="$attrs" color="primary">
+        <VnSelect
+            v-bind="selectProps"
+            hide-selected
+            hide-dropdown-icon
+            focus-on-mount
+            @update:model-value="promise"
+        />
+    </QBtnDropdown>
+</template>

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>

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>

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
+                <VnDate v-model="popupDate" @update:model-value="manageDate" />
-                    v-model="popupDate"
-                    :landscape="true"
-                    :today-btn="true"
-                    :options="$attrs.options"
-                    @update:model-value="
-                        (date) => {
-                            formattedDate = date;
-                            isPopupOpen = false;
-                        }
-                    "
-                />
             </QMenu>
+            <QDialog v-else v-model="isPopupOpen">
+                <VnDate v-model="popupDate" @update:model-value="manageDate" />
+            </QDialog>
         </QInput>
     </div>
 </template>

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>

src/components/common/VnSelect.vue

@@ -141,6 +141,7 @@ function findKeyInOptions() {
 function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+    emit('update:options', data);
 }
 
 function filter(val, options) {
@@ -227,6 +228,8 @@ function nullishToTrue(value) {
 }
 
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+
+defineExpose({ opts: myOptions });
 </script>
 
 <template>
@@ -283,15 +286,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>

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>

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"

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">

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>
+        <QCardSection class="q-px-xs q-my-none q-py-none">
-            <QInput
+            <VnRow class="full-width">
-                v-model="newNote"
+                <VnSelect
-                class="full-width"
+                    :label="t('Observation type')"
-                type="textarea"
+                    v-if="selectType"
-                :label="t('Add note here...')"
+                    url="ObservationTypes"
-                filled
+                    v-model="newNote.observationTypeFk"
-                size="lg"
+                    option-label="description"
-                autogrow
+                    style="flex: 0.15"
-                autofocus
+                    :required="true"
-                @keyup="handleKeyUp"
+                    @keyup.enter.stop="insert"
-                clearable
+                />
-            >
+                <VnInput
-                <template #append>
+                    v-model.trim="newNote.text"
-                    <QBtn
+                    type="textarea"
-                        :title="t('Save (Enter)')"
+                    :label="t('Add note here...')"
-                        icon="save"
+                    filled
-                        color="primary"
+                    size="lg"
-                        flat
+                    autogrow
-                        @click="insert"
+                    @keyup.enter.stop="insert"
-                    />
+                    clearable
-                </template>
+                    :required="true"
-            </QInput>
+                >
+                    <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
+                            <div>
-                                :name="`${note.worker.user.nickname}`"
+                                <VnUserLink
-                                :worker-id="note.worker.id"
+                                    :name="`${note.worker.user.nickname}`"
-                            />
+                                    :worker-id="note.worker.id"
-                            {{ toDateHourMin(note.created) }}
+                                />
+                                <QBadge
+                                    class="q-ml-xs"
+                                    outline
+                                    color="grey"
+                                    v-if="selectType && note.observationTypeFk"
+                                >
+                                    {{
+                                        observationTypes.find(
+                                            (ot) => ot.id === note.observationTypeFk
+                                        )?.description
+                                    }}
+                                </QBadge>
+                            </div>
+                            <span v-text="toDateHourMin(note.created)" />
                         </div>
                     </QCardSection>
                     <QCardSection class="q-pa-xs q-my-none q-py-none">
@@ -131,12 +174,6 @@ onBeforeRouteLeave((to, from, next) => {
 <style lang="scss" scoped>
 .q-card {
     width: 90%;
-    @media (max-width: $breakpoint-sm) {
-        width: 100%;
-    }
-    &__section {
-        word-wrap: break-word;
-    }
 }
 .q-dialog .q-card {
     width: 400px;
@@ -150,11 +187,28 @@ onBeforeRouteLeave((to, from, next) => {
     opacity: 0;
     background-color: $primary;
 }
+
+.vn-row > :nth-child(2) {
+    margin-left: 0;
+}
+
+@media (max-width: $breakpoint-xs) {
+    .vn-row > :deep(*) {
+        margin-left: 0;
+    }
+    .q-card {
+        width: 100%;
+
+        &__section {
+            padding: 0;
+        }
+    }
+}
 </style>
 <i18n>
     es:
         Add note here...: Añadir nota aquí...
         New note: Nueva nota
         Save (Enter): Guardar (Intro)
-
+        Observation type: Tipo de observación
 </i18n>

src/components/ui/VnPaginate.vue

@@ -56,7 +56,7 @@ const props = defineProps({
     },
     offset: {
         type: Number,
-        default: 0,
+        default: undefined,
     },
     skeleton: {
         type: Boolean,

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;
     }

src/components/ui/VnToSummary.vue

@@ -0,0 +1,33 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { defineProps } from 'vue';
+
+const props = defineProps({
+    routeName: {
+        type: String,
+        required: true,
+    },
+    entityId: {
+        type: [String, Number],
+        required: true,
+    },
+    url: {
+        type: String,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const id = props.entityId;
+</script>
+
+<template>
+    <router-link
+        v-if="route?.name !== routeName"
+        :to="{ name: routeName, params: { id: id } }"
+        class="header link"
+        :href="url"
+    >
+        <QIcon name="open_in_new" color="white" size="sm" />
+    </router-link>
+</template>

src/components/ui/VnUsesMana.vue

@@ -0,0 +1,55 @@
+<script setup>
+import { defineProps, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
+const props = defineProps({
+    usesMana: {
+        type: Boolean,
+        required: true,
+    },
+    manaCode: {
+        type: String,
+        required: true,
+    },
+    manaVal: {
+        type: String,
+        default: 'mana',
+    },
+    manaLabel: {
+        type: String,
+        default: 'Promotion mana',
+    },
+    manaClaimVal: {
+        type: String,
+        default: 'manaClaim',
+    },
+    claimLabel: {
+        type: String,
+        default: 'Claim mana',
+    },
+});
+
+const manaCode = ref(props.manaCode);
+</script>
+
+<template>
+    <div class="column q-gutter-y-sm q-mt-sm">
+        <QRadio
+            v-model="manaCode"
+            dense
+            :val="manaVal"
+            :label="t(manaLabel)"
+            :dark="true"
+            class="q-mb-sm"
+        />
+        <QRadio
+            v-model="manaCode"
+            dense
+            :val="manaClaimVal"
+            :label="t(claimLabel)"
+            :dark="true"
+            class="q-mb-sm"
+        />
+    </div>
+</template>

src/css/app.scss

@@ -288,14 +288,7 @@ input::-webkit-inner-spin-button {
         color: $info;
     }
 }
-.q-field__inner {
+
-    .q-field__control {
+.no-visible {
-        min-height: auto !important;
+    visibility: hidden;
-        display: flex;
-        align-items: flex-end;
-        padding-bottom: 2px;
-        .q-field__native.row {
-            min-height: auto !important;
-        }
-    }
 }

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
@@ -301,12 +304,14 @@ globals:
         from: From
         To: To
         stateFk: State
-        departmentFk: Department
         email: Email
         SSN: SSN
         fi: FI
+        myTeam: My team
+        departmentFk: Department
     changePass: Change password
     deleteConfirmTitle: Delete selected elements
+    changeState: Change state
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -553,7 +558,6 @@ ticket:
         package: Package
         taxClass: Tax class
         services: Services
-        changeState: Change state
         requester: Requester
         atender: Atender
         request: Request
@@ -741,6 +745,7 @@ worker:
         locker: Locker
         balance: Balance
         medical: Medical
+        operator: Operator
     list:
         name: Name
         email: Email
@@ -838,6 +843,18 @@ worker:
             debit: Debt
             credit: Have
             concept: Concept
+    operator:
+        numberOfWagons: Number of wagons
+        train: Train
+        itemPackingType: Item packing type
+        warehouse: Warehouse
+        sector: Sector
+        labeler: Printer
+        linesLimit: Lines limit
+        volumeLimit: Volume limit
+        sizeLimit: Size limit
+        isOnReservationMode: Reservation mode
+        machine: Machine
 wagon:
     pageTitles:
         wagons: Wagons

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
@@ -309,8 +312,10 @@ globals:
         email: Correo
         SSN: NSS
         fi: NIF
+        myTeam: Mi equipo
     changePass: Cambiar contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
+    changeState: Cambiar estado
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -562,7 +567,6 @@ ticket:
         package: Embalaje
         taxClass: Tipo IVA
         services: Servicios
-        changeState: Cambiar estado
         requester: Solicitante
         atender: Comprador
         request: Petición de compra
@@ -748,6 +752,7 @@ worker:
         balance: Balance
         formation: Formación
         medical: Mutua
+        operator: Operario
     list:
         name: Nombre
         email: Email
@@ -836,6 +841,19 @@ worker:
             debit: Debe
             credit: Haber
             concept: Concepto
+    operator:
+        numberOfWagons: Número de vagones
+        train: tren
+        itemPackingType: Tipo de embalaje
+        warehouse: Almacén
+        sector: Sector
+        labeler: Impresora
+        linesLimit: Líneas límite
+        volumeLimit: Volumen límite
+        sizeLimit: Tamaño límite
+        isOnReservationMode: Modo de reserva
+        machine: Máquina
+
 wagon:
     pageTitles:
         wagons: Vagones

src/pages/Claim/Card/ClaimSummary.vue

@@ -204,7 +204,7 @@ function claimUrl(section) {
                 top
                 color="black"
                 text-color="white"
-                :label="t('ticket.summary.changeState')"
+                :label="t('globals.changeState')"
             >
                 <QList>
                     <QVirtualScroll

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>

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) => {
+        if (!obsId.value)
-            return { clientFk: item.clientFk, text: newObservation.value };
+            obsId.value = (
-        });
+                await axios.get('ObservationTypes/findOne', {
-        await axios.post('ClientObservations', data);
+                    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();
 

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
-                    <VnSelect
+                    :label="t('Observation type')"
-                        :label="t('Observation type')"
+                    :options="observationTypes"
-                        :options="observationTypes"
+                    hide-selected
-                        hide-selected
+                    option-label="description"
-                        option-label="description"
+                    option-value="id"
-                        option-value="id"
+                    v-model="note.observationTypeFk"
-                        v-model="note.observationTypeFk"
+                />
-                    />
+                <VnInput
-                </div>
+                    :label="t('Description')"
-                <div class="col">
+                    :rules="validate('route.description')"
-                    <VnInput
+                    clearable
-                        :label="t('Description')"
+                    v-model="note.description"
-                        :rules="validate('route.description')"
+                />
-                        clearable
+                <QIcon
-                        v-model="note.description"
+                    :style="{ flex: 0, 'align-self': $q.screen.gt.xs ? 'end' : 'center' }"
-                    />
+                    @click.stop="deleteNote(note.id, index)"
-                </div>
+                    class="cursor-pointer"
-                <div class="flex items-center">
+                    color="primary"
-                    <QIcon
+                    name="delete"
-                        @click.stop="deleteNote(note.id, index)"
+                    size="sm"
-                        class="cursor-pointer"
+                >
-                        color="primary"
+                    <QTooltip>
-                        name="delete"
+                        {{ t('Remove note') }}
-                        size="sm"
+                    </QTooltip>
-                    >
+                </QIcon>
-                        <QTooltip>
-                            {{ t('Remove note') }}
-                        </QTooltip>
-                    </QIcon>
-                </div>
             </VnRow>
-
             <QBtn
                 @click.stop="addNote()"
                 class="cursor-pointer add-icon q-mt-md"

src/pages/Customer/components/CustomerSummaryTable.vue

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

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

src/pages/Entry/Card/EntrySummary.vue

@@ -11,6 +11,7 @@ import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
+import VnToSummary from 'src/components/ui/VnToSummary.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -163,14 +164,12 @@ const fetchEntryBuys = async () => {
         data-key="EntrySummary"
     >
         <template #header-left>
-            <router-link
+            <VnToSummary
                 v-if="route?.name !== 'EntrySummary'"
-                :to="{ name: 'EntrySummary', params: { id: entityId } }"
+                :route-name="'EntrySummary'"
-                class="header link"
+                :entity-id="entityId"
-                :href="entryUrl"
+                :url="entryUrl"
-            >
+            />
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </router-link>
         </template>
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>

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>

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

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

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
+                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
-                    :label="t('invoiceIn.summary.booked')"
-                    :value="invoiceIn?.isBooked"
-                />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">

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

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,
     },
     {

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

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

src/pages/InvoiceOut/Card/InvoiceOutSummary.vue

@@ -78,7 +78,7 @@ const ticketsColumns = ref([
         align: 'left',
     },
     {
-        name: 'quantity',
+        name: 'nickname',
         label: t('invoiceOut.summary.nickname'),
         field: (row) => row.nickname,
         sortable: true,
@@ -172,11 +172,11 @@ const ticketsColumns = ref([
                             </QBtn>
                         </QTd>
                     </template>
-                    <template #body-cell-quantity="{ value, row }">
+                    <template #body-cell-nickname="{ value, row }">
                         <QTd>
                             <QBtn class="no-uppercase link" flat dense>
                                 {{ value }}
-                                <CustomerDescriptorProxy :id="row.id" />
+                                <CustomerDescriptorProxy :id="row.clientFk" />
                             </QBtn>
                         </QTd>
                     </template>

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">

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"

src/pages/InvoiceOut/InvoiceOutNegativeBases.vue

@@ -170,7 +170,6 @@ const downloadCSV = async () => {
                 }
             }
         "
-        :limit="0"
         :columns="columns"
         auto-load
         :is-editable="false"

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"

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>

src/pages/Item/ItemRequest.vue

@@ -229,7 +229,7 @@ onBeforeMount(() => {
         >
             <template #body-cell-id="{ row }">
                 <QTd>
-                    <QBtn flat color="primary"> {{ row.ticketFk }}</QBtn>
+                    <QBtn flat class="link"> {{ row.ticketFk }}</QBtn>
                     <TicketDescriptorProxy :id="row.ticketFk" />
                 </QTd>
             </template>
@@ -251,22 +251,35 @@ onBeforeMount(() => {
             </template>
             <template #body-cell-requester="{ row }">
                 <QTd>
-                    <QBtn flat dense color="primary"> {{ row.requesterName }}</QBtn>
+                    <QBtn flat dense class="link"> {{ row.requesterName }}</QBtn>
                     <WorkerDescriptorProxy :id="row.requesterFk" />
                 </QTd>
             </template>
             <template #body-cell-attender="{ row }">
                 <QTd>
                     <VnSelect
+                        url="Workers/search"
                         v-model="row.attenderFk"
-                        :where="{ role: 'buyer' }"
+                        :params="{ departmentCodes: ['shopping'] }"
-                        sort-by="id"
+                        :fields="['id', 'nickname']"
-                        url="Workers"
+                        sort-by="nickname ASC"
                         hide-selected
-                        option-label="firstName"
+                        option-label="nickname"
                         option-value="id"
                         dense
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt?.nickname }},
+                                        {{ scope.opt?.code }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QTd>
             </template>
             <template #body-cell-item="{ row }">
@@ -292,7 +305,7 @@ onBeforeMount(() => {
             </template>
             <template #body-cell-concept="{ row }">
                 <QTd>
-                    <QBtn flat dense color="primary"> {{ row.itemDescription }}</QBtn>
+                    <QBtn flat dense class="link"> {{ row.itemDescription }}</QBtn>
                     <ItemDescriptorProxy :id="row.itemFk" />
                 </QTd>
             </template>

src/pages/Item/ItemRequestFilter.vue

@@ -174,6 +174,16 @@ const decrement = (paramsObj, key) => {
                     </VnSelect>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.myTeam"
+                        :label="t('params.myTeam')"
+                        @update:model-value="searchFn()"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
             <QCard bordered>
                 <QItem>
                     <QItemSection>
@@ -274,11 +284,11 @@ en:
         to: To
         mine: For me
         state: State
+        myTeam: My team
     dateFiltersTooltip: Cannot choose a range of dates and days onward at the same time
     denied: Denied
     accepted: Accepted
     pending: Pending
-
 es:
     params:
         search: Búsqueda general
@@ -291,6 +301,7 @@ es:
         to: Hasta
         mine: Para mi
         state: Estado
+        myTeam: Mi equipo
     dateFiltersTooltip: No se puede seleccionar un rango de fechas y días en adelante a la vez
     denied: Denegada
     accepted: Aceptada

src/pages/Item/ItemTypeCreate.vue

@@ -15,7 +15,6 @@ const router = useRouter();
 
 const newItemTypeForm = reactive({});
 
-const workersOptions = ref([]);
 const categoriesOptions = ref([]);
 const temperaturesOptions = ref([]);
 
@@ -25,12 +24,6 @@ const redirectToItemTypeBasicData = (_, { id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Workers"
-        @on-fetch="(data) => (workersOptions = data)"
-        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
-        auto-load
-    />
     <FetchData
         url="ItemCategories"
         @on-fetch="(data) => (categoriesOptions = data)"
@@ -59,13 +52,27 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                 </VnRow>
                 <VnRow>
                     <VnSelect
+                        url="Workers/search"
                         v-model="data.workerFk"
-                        :label="t('itemType.shared.worker')"
+                        :label="t('shared.worker')"
-                        :options="workersOptions"
+                        sort-by="nickname ASC"
+                        :fields="['id', 'nickname']"
+                        :params="{ departmentCodes: ['shopping'] }"
+                        option-label="nickname"
                         option-value="id"
-                        option-label="firstName"
                         hide-selected
-                    />
+                        ><template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt?.nickname }},
+                                        {{ scope.opt?.code }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                     <VnSelect
                         v-model="data.categoryFk"
                         :label="t('itemType.shared.category')"

src/pages/ItemType/Card/ItemTypeBasicData.vue

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

src/pages/ItemType/Card/ItemTypeSummary.vue

@@ -6,6 +6,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import VnToSummary from 'src/components/ui/VnToSummary.vue';
 
 onUpdated(() => summaryRef.value.fetch());
 
@@ -55,6 +56,11 @@ async function setItemTypeData(data) {
             >
                 <QIcon name="open_in_new" color="white" size="sm" />
             </router-link>
+            <VnToSummary
+                v-if="route?.name !== 'ItemTypeSummary'"
+                :route-name="'ItemTypeSummary'"
+                :entity-id="entityId"
+            />
         </template>
         <template #header>
             <span>

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) {

src/pages/Order/Card/OrderCreateDialog.vue

@@ -126,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')"
@@ -165,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">

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'] }"

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 }">

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"

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>

src/pages/Supplier/Card/SupplierAgencyTermCreate.vue

@@ -15,12 +15,12 @@ const route = useRoute();
 const agenciesOptions = ref(null);
 const newAgencyTermForm = reactive({
     agencyFk: null,
-    minimumM3: null,
+    minimumM3: 0,
-    packagePrice: null,
+    packagePrice: 0,
-    kmPrice: null,
+    kmPrice: 0,
-    m3Price: null,
+    m3Price: 0,
     routePrice: null,
-    minimumKm: null,
+    minimumKm: 0,
     supplierFk: route.params.id,
 });
 

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

src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue

@@ -12,6 +12,7 @@ import VnInputTime from 'components/common/VnInputTime.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { useAcl } from 'src/composables/useAcl';
 import { useValidator } from 'src/composables/useValidator';
 import { toTimeFormat } from 'filters/date.js';
 
@@ -28,14 +29,17 @@ const { validate } = useValidator();
 const { notify } = useNotify();
 const router = useRouter();
 const { t } = useI18n();
-const agencyFetchRef = ref(null);
+const canEditZone = useAcl().hasAny([
-const zonesFetchRef = ref(null);
+    { model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
+]);
 
+const agencyFetchRef = ref();
 const warehousesOptions = ref([]);
 const companiesOptions = ref([]);
 const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
+const zoneSelectRef = ref();
 const formData = ref($props.formData);
 
 watch(
@@ -44,6 +48,8 @@ watch(
     { deep: true }
 );
 
+onMounted(() => onFormModelInit());
+
 const agencyByWarehouseFilter = computed(() => ({
     fields: ['id', 'name'],
     order: 'name ASC',
@@ -52,18 +58,16 @@ const agencyByWarehouseFilter = computed(() => ({
     },
 }));
 
-function zoneWhere() {
+const zoneWhere = computed(() => {
-    if (formData?.value?.agencyModeFk) {
+    return formData.value?.agencyModeFk
-        return formData.value?.agencyModeFk
+        ? {
-            ? {
+              shipped: formData.value?.shipped,
-                  shipped: formData.value?.shipped,
+              addressFk: formData.value?.addressFk,
-                  addressFk: formData.value?.addressFk,
+              agencyModeFk: formData.value?.agencyModeFk,
-                  agencyModeFk: formData.value?.agencyModeFk,
+              warehouseFk: formData.value?.warehouseFk,
-                  warehouseFk: formData.value?.warehouseFk,
+          }
-              }
+        : {};
-            : {};
+});
-    }
-}
 
 const getLanded = async (params) => {
     try {
@@ -270,7 +274,17 @@ const redirectToCustomerAddress = () => {
     });
 };
 
-onMounted(() => onFormModelInit());
+async function getZone(options) {
+    if (!zoneId.value) return;
+
+    const zone = options.find((z) => z.id == zoneId.value);
+    if (zone) return;
+
+    const { data } = await axios.get('Zones/' + zoneId.value, {
+        params: { filter: JSON.stringify({ fields: ['id', 'name'] }) },
+    });
+    zoneSelectRef.value.opts.push(data);
+}
 </script>
 <template>
     <FetchData
@@ -416,6 +430,7 @@ onMounted(() => onFormModelInit());
                 :rules="validate('basicData.agency')"
             />
             <VnSelect
+                ref="zoneSelectRef"
                 :label="t('basicData.zone')"
                 v-model="zoneId"
                 option-value="id"
@@ -424,11 +439,10 @@ onMounted(() => onFormModelInit());
                 :fields="['id', 'name']"
                 sort-by="id"
                 :where="zoneWhere"
-                hide-selected
-                map-options
-                :required="true"
-                @focus="zonesFetchRef.fetch()"
                 :rules="validate('basicData.zone')"
+                :required="true"
+                :disable="!canEditZone"
+                @update:options="getZone"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">

src/pages/Ticket/Card/TicketDescriptorMenu.vue

@@ -3,7 +3,7 @@ import axios from 'axios';
 import { ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { usePrintService } from 'composables/usePrintService';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -23,6 +23,7 @@ const props = defineProps({
         required: true,
     },
 });
+const route = useRoute();
 
 const { push, currentRoute } = useRouter();
 const { dialog, notify } = useQuasar();
@@ -40,6 +41,8 @@ const isEditable = ref();
 const hasInvoicing = useAcl('invoicing');
 const hasPdf = ref();
 const weight = ref();
+const hasDocuwareFile = ref();
+const quasar = useQuasar();
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -331,10 +334,49 @@ async function handleInvoiceOutData() {
     });
     hasPdf.value = data[0]?.hasPdf;
 }
+
+async function docuwareDownload() {
+    await axios.get(`Tickets/${ticketId}/docuwareDownload`);
+}
+
+async function hasDocuware() {
+    const { data } = await axios.post(`Docuwares/${ticketId}/checkFile`, {
+        fileCabinet: 'deliveryNote',
+        signed: true,
+    });
+    hasDocuwareFile.value = data;
+}
+
+async function uploadDocuware(force) {
+    console.log('force: ', force);
+    if (!force)
+        return quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('Send PDF to tablet'),
+                    message: t('Are you sure you want to replace this delivery note?'),
+                },
+            })
+            .onOk(async () => {
+                uploadDocuware(true);
+            });
+
+    const { data } = await axios.post(`Docuwares/upload`, {
+        fileCabinet: 'deliveryNote',
+        ticketIds: [parseInt(ticketId)],
+    });
+
+    if (data) notify({ message: t('PDF sent!'), type: 'positive' });
+}
 </script>
 <template>
     <FetchData
-        :url="`Tickets/${ticketId}/isEditable`"
+        :url="
+            route.path.startsWith('/ticket')
+                ? `Tickets/${ticketId}/isEditable`
+                : `Tickets/${ticket}/isEditable`
+        "
         auto-load
         @on-fetch="handleFetchData"
     />
@@ -452,7 +494,13 @@ async function handleInvoiceOutData() {
         <QItemSection side>
             <QIcon name="keyboard_arrow_right" />
         </QItemSection>
-        <QMenu anchor="top end" self="top start" auto-close bordered>
+        <QMenu
+            anchor="top end"
+            self="top start"
+            auto-close
+            bordered
+            @click="hasDocuware()"
+        >
             <QList>
                 <QItem @click="openDeliveryNote('deliveryNote')" v-ripple clickable>
                     <QItemSection>{{ t('as PDF') }}</QItemSection>
@@ -460,6 +508,14 @@ async function handleInvoiceOutData() {
                 <QItem @click="openDeliveryNote('withoutPrices')" v-ripple clickable>
                     <QItemSection>{{ t('as PDF without prices') }}</QItemSection>
                 </QItem>
+                <QItem
+                    v-if="hasDocuwareFile"
+                    @click="docuwareDownload()"
+                    v-ripple
+                    clickable
+                >
+                    <QItemSection>{{ t('as PDF signed') }}</QItemSection>
+                </QItem>
                 <QItem
                     @click="openDeliveryNote('deliveryNote', 'csv')"
                     v-ripple
@@ -478,7 +534,7 @@ async function handleInvoiceOutData() {
         <QItemSection side>
             <QIcon name="keyboard_arrow_right" />
         </QItemSection>
-        <QMenu anchor="top end" self="top start" auto-close>
+        <QMenu anchor="top end" self="top start" auto-close @click="hasDocuware()">
             <QList>
                 <QItem
                     @click="sendDeliveryNoteConfirmation('deliveryNote')"
@@ -487,11 +543,7 @@ async function handleInvoiceOutData() {
                 >
                     <QItemSection>{{ t('Send PDF') }}</QItemSection>
                 </QItem>
-                <QItem
+                <QItem @click="uploadDocuware(!hasDocuwareFile)" v-ripple clickable>
-                    @click="sendDeliveryNoteConfirmation('withoutPrices')"
-                    v-ripple
-                    clickable
-                >
                     <QItemSection>{{ t('Send PDF to tablet') }}</QItemSection>
                 </QItem>
                 <QItem
@@ -695,4 +747,6 @@ es:
     invoiceIds: "Se han generado las facturas con los siguientes ids: {invoiceIds}"
     This ticket will be removed from current route! Continue anyway?: ¡Se eliminará el ticket de la ruta actual! ¿Continuar de todas formas?
     You are going to delete this ticket: Vas a eliminar este ticket
+    as PDF signed: como PDF firmado
+    Are you sure you want to replace this delivery note?: ¿Seguro que quieres reemplazar este albarán?
 </i18n>

src/pages/Ticket/Card/TicketEditMana.vue

@@ -1,8 +1,8 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import { toCurrency } from 'src/filters';
+import VnUsesMana from 'components/ui/VnUsesMana.vue';
 
 const $props = defineProps({
     mana: {
@@ -13,12 +13,21 @@ const $props = defineProps({
         type: Number,
         default: 0,
     },
+    usesMana: {
+        type: Boolean,
+        default: false,
+    },
+    manaCode: {
+        type: String,
+        default: 'mana',
+    },
 });
 
 const emit = defineEmits(['save', 'cancel']);
 
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
+const manaCode = ref($props.manaCode);
 
 const save = () => {
     emit('save');
@@ -47,6 +56,9 @@ const cancel = () => {
                     </div>
                 </div>
             </div>
+            <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
+                <VnUsesMana :mana-code="manaCode" />
+            </div>
             <div class="row">
                 <QBtn
                     color="primary"

src/pages/Ticket/Card/TicketExpedition.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
+import { onMounted, ref, computed, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -15,6 +15,8 @@ import useNotify from 'src/composables/useNotify.js';
 import { toDateTimeFormat } from 'src/filters/date';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnBtnSelect from 'src/components/common/VnBtnSelect.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
@@ -23,50 +25,24 @@ const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
 const newTicketDialogRef = ref(null);
 const logsTableDialogRef = ref(null);
-const tableRef = ref();
+const vnTableRef = ref();
 const expeditionsLogsData = ref([]);
 const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
 const newTicketWithRoute = ref(false);
 const selectedRows = ref([]);
 const hasSelectedRows = computed(() => selectedRows.value.length > 0);
-
+const expeditionStateTypes = ref([]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'expeditionFk':
-            return { id: value };
-        case 'packageItemName':
-            return { packagingItemFk: value };
-    }
-};
 
 const expeditionsFilter = computed(() => ({
     where: { ticketFk: route.params.id },
     order: ['created DESC'],
 }));
 
-const expeditionsArrayData = useArrayData('ticketExpeditions', {
-    url: 'Expeditions/filter',
-    filter: expeditionsFilter.value,
-    exprBuilder: exprBuilder,
-});
-
 const ticketArrayData = useArrayData('ticketData');
 const ticketStore = ticketArrayData.store;
 const ticketData = computed(() => ticketStore.data);
 
-const refetchExpeditions = async () => {
-    await expeditionsArrayData.applyFilter({
-        filter: expeditionsFilter.value,
-    });
-};
-
-watch(
-    () => route.params.id,
-    async () => await refetchExpeditions(),
-    { immediate: true }
-);
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -188,12 +164,10 @@ const showNewTicketDialog = (withRoute = false) => {
 
 const deleteExpedition = async () => {
     try {
-        const expeditionIds = selectedExpeditions.value.map(
+        const expeditionIds = selectedRows.value.map((expedition) => expedition.id);
-            (expedition) => expedition.id
-        );
         const params = { expeditionIds };
         await axios.post('Expeditions/deleteExpeditions', params);
-        await refetchExpeditions();
+        vnTableRef.value.reload();
         selectedExpeditions.value = [];
         notify(t('expedition.expeditionRemoved'), 'positive');
     } catch (error) {
@@ -242,9 +216,34 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
+    <FetchData
+        url="expeditionStateTypes"
+        @on-fetch="(data) => (expeditionStateTypes = data)"
+        auto-load
+    />
     <VnSubToolbar>
         <template #st-actions>
             <QBtnGroup push class="q-gutter-x-sm" flat>
+                <VnBtnSelect
+                    :disable="!hasSelectedRows"
+                    color="primary"
+                    :label="t('globals.changeState')"
+                    :select-props="{
+                        options: expeditionStateTypes,
+                        optionLabel: 'description',
+                    }"
+                    :promise="
+                        async (stateTypeFk) => {
+                            await vnTableRef.CrudModelRef.saveChanges({
+                                updates: selectedRows.map(({ id }) => ({
+                                    data: { stateTypeFk },
+                                    where: { id },
+                                })),
+                            });
+                            vnTableRef.tableRef.clearSelection();
+                        }
+                    "
+                />
                 <QBtnDropdown
                     ref="btnDropdownRef"
                     color="primary"
@@ -298,11 +297,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QBtnGroup>
         </template>
     </VnSubToolbar>
-
     <VnTable
-        ref="tableRef"
+        ref="vnTableRef"
         data-key="TicketExpedition"
         url="Expeditions/filter"
+        search-url="expeditions"
         :columns="columns"
         :filter="expeditionsFilter"
         v-model:selected="selectedRows"
@@ -310,7 +309,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             'row-key': 'id',
             selection: 'multiple',
         }"
+        save-url="Expeditions/crud"
         auto-load
+        :expr-builder="
+            (param, value) => {
+                switch (param) {
+                    case 'expeditionFk':
+                        return { id: value };
+                    case 'packageItemName':
+                        return { packagingItemFk: value };
+                }
+            }
+        "
         order="created DESC"
     >
         <template #column-packagingItemFk="{ row }">
@@ -324,7 +334,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <ExpeditionNewTicket
             :ticket="ticketData"
             :with-route="newTicketWithRoute"
-            :selected-expeditions="selectedExpeditions"
+            :selected-expeditions="selectedRows"
         />
     </QDialog>
     <QDialog ref="logsTableDialogRef" transition-show="scale" transition-hide="scale">

src/pages/Ticket/Card/TicketSale.vue

@@ -22,6 +22,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnUsesMana from 'src/components/ui/VnUsesMana.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -663,6 +664,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" />
@@ -761,6 +769,8 @@ watch(
                 <TicketEditManaProxy
                     :mana="mana"
                     :new-price="getNewPrice"
+                    :uses-mana="usesMana"
+                    :mana-code="manaCode"
                     @save="changeDiscount(row)"
                 >
                     <VnInput
@@ -768,6 +778,9 @@ watch(
                         :label="t('ticketSale.discount')"
                         type="number"
                     />
+                    <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
+                        <VnUsesMana :mana-code="manaCode" />
+                    </div>
                 </TicketEditManaProxy>
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>

src/pages/Ticket/Card/TicketSummary.vue

@@ -19,6 +19,8 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
+import VnToSummary from 'src/components/ui/VnToSummary.vue';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -68,7 +70,7 @@ function isEditable() {
 
 async function changeState(value) {
     try {
-        stateBtnDropdownRef.value.hide();
+        stateBtnDropdownRef.value?.hide();
         const formData = {
             ticketFk: entityId.value,
             code: value,
@@ -85,6 +87,10 @@ async function changeState(value) {
 function toTicketUrl(section) {
     return '#/ticket/' + entityId.value + '/' + section;
 }
+function isOnTicketCard() {
+    const currentPath = route.path;
+    return currentPath.startsWith('/ticket');
+}
 </script>
 
 <template>
@@ -99,6 +105,14 @@ function toTicketUrl(section) {
         :url="`Tickets/${entityId}/summary`"
         data-key="TicketSummary"
     >
+        <template #header-left>
+            <VnToSummary
+                v-if="route?.name !== 'TicketSummary'"
+                :route-name="'TicketSummary'"
+                :entity-id="entityId"
+                :url="ticketUrl"
+            />
+        </template>
         <template #header="{ entity }">
             <div>
                 Ticket #{{ entity.id }} - {{ entity.client?.name }} ({{
@@ -112,7 +126,7 @@ function toTicketUrl(section) {
                 ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
-                :label="t('ticket.summary.changeState')"
+                :label="t('globals.changeState')"
                 :disable="!isEditable()"
             >
                 <VnSelect

src/pages/Ticket/TicketAdvance.vue

@@ -463,6 +463,9 @@ onMounted(async () => {
     userParams.dateToAdvance = today;
     userParams.scopeDays = 1;
     userParams.warehouseFk = user.value.warehouseFk;
+    userParams.ipt = 'H';
+    userParams.futureIpt = 'H';
+    userParams.isFullMovable = true;
     const filter = { limit: 0 };
     await arrayData.addFilter({ filter, userParams });
 });

src/pages/Ticket/TicketAdvanceFilter.vue

@@ -11,7 +11,7 @@ import axios from 'axios';
 import { onMounted } from 'vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -43,6 +43,11 @@ const getItemPackingTypes = async () => {
     }
 };
 
+const getLocale = (val) => {
+    const param = `params.${val}`;
+    return te(param) ? t(param) : t(`globals.${param}`);
+};
+
 onMounted(async () => await getItemPackingTypes());
 </script>
 
@@ -60,7 +65,7 @@ onMounted(async () => await getItemPackingTypes());
     >
         <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>
@@ -136,6 +141,19 @@ onMounted(async () => await getItemPackingTypes());
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('globals.params.departmentFk')"
+                        v-model="params.departmentFk"
+                        url="Departments"
+                        :fields="['id', 'name']"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect

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

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,24 +16,37 @@ const props = defineProps({
     },
 });
 
-const workers = ref([]);
 const provinces = ref([]);
 const states = ref([]);
 const agencies = ref([]);
 const warehouses = ref([]);
+const groupedStates = ref([]);
+
+const getGroupedStates = (data) => {
+    for (const state of data) {
+        groupedStates.value.push({
+            id: state.id,
+            name: t(`${state.code}`),
+            code: state.code,
+        });
+    }
+};
 </script>
 
 <template>
     <FetchData url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load />
     <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"
+        url="AlertLevels"
-        :filter="{ where: { role: 'salesPerson' } }"
+        @on-fetch="
-        @on-fetch="(data) => (workers = data)"
+            (data) => {
+                getGroupedStates(data);
+            }
+        "
         auto-load
     />
+    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = 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 +80,19 @@ const warehouses = ref([]);
                 </QItemSection>
             </QItem>
             <QItem>
-                <QItemSection v-if="!workers">
+                <QItemSection>
-                    <QSkeleton type="QInput" class="full-width" />
+                    <VnSelect
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <QSelect
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
-                        :options="workers"
+                        url="Workers/activeWithInheritedRole"
+                        :where="{ role: 'salesPerson' }"
                         option-value="id"
-                        option-label="name"
+                        option-label="firstName"
-                        emit-value
+                        :use-like="false"
-                        map-options
+                        sort-by="firstName ASC"
-                        use-input
                         dense
                         outlined
                         rounded
-                        :input-debounce="0"
                     />
                 </QItemSection>
             </QItem>
@@ -100,12 +110,35 @@ const warehouses = ref([]);
                         option-label="name"
                         emit-value
                         map-options
+                        use-input
                         dense
                         outlined
                         rounded
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection v-if="!groupedStates">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="groupedStates">
+                    <QSelect
+                        :label="t('Grouped state')"
+                        v-model="params.groupedStates"
+                        @update:model-value="searchFn()"
+                        :options="groupedStates"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                        sort-by="name ASC"
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -124,6 +157,15 @@ const warehouses = ref([]);
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.nickname"
+                        :label="t('Nickname')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
@@ -186,6 +228,7 @@ const warehouses = ref([]);
                             option-label="name"
                             emit-value
                             map-options
+                            use-input
                             dense
                             outlined
                             rounded
@@ -206,6 +249,7 @@ const warehouses = ref([]);
                             option-label="name"
                             emit-value
                             map-options
+                            use-input
                             dense
                             outlined
                             rounded
@@ -226,12 +270,22 @@ const warehouses = ref([]);
                             option-label="name"
                             emit-value
                             map-options
+                            use-input
                             dense
                             outlined
                             rounded
                         />
                     </QItemSection>
                 </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.collectionFk"
+                            :label="t('Collection')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
             </QExpansionItem>
         </template>
     </VnFilterPanel>
@@ -255,6 +309,11 @@ en:
         provinceFk: Province
         agencyModeFk: Agency
         warehouseFk: Warehouse
+    FREE: Free
+    ON_PREPARATION: On preparation
+    PACKED: Packed
+    DELIVERED: Delivered
+    ON_PREVIOUS: ON_PREVIOUS
 es:
     params:
         search: Contiene
@@ -288,4 +347,12 @@ es:
     Yes: Si
     No: No
     Days onward: Días adelante
+    Grouped state: Estado agrupado
+    FREE: Libre
+    ON_PREPARATION: En preparación
+    PACKED: Encajado
+    DELIVERED: Servido
+    ON_PREVIOUS: ON_PREVIOUS
+    Collection: Colección
+    Nickname: Nombre mostrado
 </i18n>

src/pages/Ticket/TicketList.vue

@@ -95,6 +95,7 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
+        columnClass: 'expand',
         format: (row, dashIfEmpty) => dashIfEmpty(row.salesPerson),
     },
     {
@@ -153,11 +154,6 @@ const columns = computed(() => [
         },
         columnClass: 'expand',
     },
-    {
-        align: 'left',
-        name: 'refFk',
-        label: t('ticketList.ref'),
-    },
     {
         align: 'left',
         name: 'zoneFk',
@@ -191,6 +187,12 @@ const columns = computed(() => [
         },
         format: (row) => toCurrency(row.totalWithVat),
     },
+    {
+        align: 'left',
+        name: 'packing',
+        label: t('ticketSale.packaging'),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.packing),
+    },
     {
         align: 'right',
         name: 'tableActions',
@@ -548,7 +550,7 @@ function setReference(data) {
         </template>
         <template #column-salesPersonFk="{ row }">
             <span class="link" @click.stop>
-                {{ row.salesPerson }}
+                {{ dashIfEmpty(row.userName) }}
                 <CustomerDescriptorProxy :id="row.salesPersonFk" />
             </span>
         </template>
@@ -577,16 +579,16 @@ function setReference(data) {
                     {{ row.state }}
                 </QChip>
             </span>
+            <span v-else-if="row.state === 'Entregado'">
+                <span class="link" @click.stop>
+                    {{ row.refFk }}
+                    <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
+                </span>
+            </span>
             <span v-else>
                 {{ row.state }}
             </span>
         </template>
-        <template #column-refFk="{ row }">
-            <span class="link" @click.stop>
-                {{ dashIfEmpty(row.refFk) }}
-                <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
-            </span>
-        </template>
         <template #column-zoneFk="{ row }">
             <span class="link" @click.stop>
                 {{ dashIfEmpty(row.zoneName) }}

src/pages/Ticket/locale/es.yml

@@ -100,7 +100,7 @@ weeklyTickets:
 advanceTickets:
     preparation: Preparación
     origin: Origen
-    destination: Destinatario
+    destination: Destino
     originAgency: 'Agencia origen: {agency}'
     destinationAgency: 'Agencia destino: {agency}'
     ticketId: ID

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>

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: '',

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([]);

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>

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>

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',
@@ -118,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;
@@ -177,6 +184,7 @@ async function autofillBic(worker) {
         auto-load
     />
     <FetchData
+        ref="bankEntitiesRef"
         url="BankEntities"
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         auto-load
@@ -344,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">

src/pages/Worker/locale/en.yml

@@ -9,3 +9,4 @@ tableColumns:
     fi: FI
     SSN: SSN
     extension: Extension
+queue: Queue

src/pages/Worker/locale/es.yml

@@ -14,3 +14,4 @@ tableColumns:
     fi: NIF
     SSN: NSS
     extension: Extensión
+queue: Cola

src/pages/Zone/ZoneDeliveryPanel.vue

@@ -94,9 +94,9 @@ watch(
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
                 sort-by="code, townFk"
-                option-value="code"
+                option-value="geoFk"
                 option-label="code"
-                option-filter="code"
+                :filter-options="['code', 'geoFk']"
                 hide-selected
                 dense
                 outlined

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'),
+                },
             ],
         },
         {

src/router/modules/worker.js

@@ -27,6 +27,7 @@ export default {
             'WorkerBalance',
             'WorkerFormation',
             'WorkerMedical',
+            'WorkerOperator',
         ],
     },
     children: [
@@ -208,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'),
+                },
             ],
         },
     ],

src/stores/useStateQueryStore.js

@@ -0,0 +1,31 @@
+import { ref, computed } from 'vue';
+import { defineStore } from 'pinia';
+
+export const useStateQueryStore = defineStore('stateQueryStore', () => {
+    const queries = ref(new Set());
+
+    function add(query) {
+        queries.value.add(query);
+        return query;
+    }
+
+    function isLoading() {
+        return computed(() => queries.value.size);
+    }
+
+    function remove(query) {
+        queries.value.delete(query);
+    }
+
+    function reset() {
+        queries.value = new Set();
+    }
+
+    return {
+        add,
+        isLoading,
+        remove,
+        queries,
+        reset,
+    };
+});

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();
 

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(saveBtn).click();
-        cy.get(':nth-child(1) > .q-card__section--vert').should('have.text', message);
+        cy.get(firstNote).should('have.text', message);
     });
 });

test/cypress/integration/client/clientAddress.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client consignee', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/address', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/client/clientBalance.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client balance', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/balance', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/client/clientBasicData.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client basic data', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/basic-data', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/client/clientBillingData.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client billing data', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/billing-data', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/client/clientCredits.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client credits', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/credits', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/client/clientFiscalData.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client fiscal data', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/fiscal-data', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/client/clientGreuges.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client greuges', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/greuges', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/client/clientList.spec.js

@@ -0,0 +1,63 @@
+/// <reference types="cypress" />
+describe('Client list', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('/#/customer/list', {
+            timeout: 5000,
+            onBeforeLoad(win) {
+                cy.stub(win, 'open');
+            },
+        });
+    });
+
+    it('Client list create new client', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        const data = {
+            Name: { val: 'Name 1' },
+            'Social name': { val: 'TEST 1' },
+            'Tax number': { val: '20852113Z' },
+            'Web user': { val: 'user_test_1' },
+            Street: { val: 'C/ STREET 1' },
+            Email: { val: 'user.test@1.com' },
+            'Business type': { val: 'Otros', type: 'select' },
+            'Sales person': { val: 'salesboss', type: 'select' },
+            Location: { val: '46000, Valencia(Province one), España', type: 'select' },
+        };
+        cy.fillInForm(data);
+
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+
+        cy.checkNotification('created');
+        cy.url().should('include', '/summary');
+    });
+    it('Client list search client', () => {
+        const search = 'Jessica Jones';
+        cy.searchByLabel('Name', search);
+
+        cy.get('.title > span').should('have.text', search);
+        let id = null;
+        cy.get('.q-item > .q-item__label').then((text) => {
+            id = text.text().trim().split('#')[1];
+            cy.get('.q-item > .q-item__label').should('have.text', ` #${id}`);
+            cy.url().should('include', `/customer/${id}/summary`);
+        });
+    });
+
+    it('Client founded create ticket', () => {
+        const search = 'Jessica Jones';
+        cy.searchByLabel('Name', search);
+        cy.clickButtonsDescriptor(2);
+        cy.waitForElement('#formModel');
+        cy.waitForElement('.q-form');
+        cy.checkValueForm(1, search);
+    });
+    it('Client founded create order', () => {
+        const search = 'Jessica Jones';
+        cy.searchByLabel('Name', search);
+        cy.clickButtonsDescriptor(4);
+        cy.waitForElement('#formModel');
+        cy.waitForElement('.q-form');
+        cy.checkValueForm(2, search);
+    });
+});

test/cypress/integration/client/clientNotes.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client notes', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/notes', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/client/clientRecoveries.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client recoveries', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/recoveries', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/client/clientWebAccess.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client web-access', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/web-access', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/client/credit-management/clientCreditContracts.spec.js

@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Client credit opinion', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/credit-management/credit-contracts', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});