Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-AddSearchbarToWagonModule

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,37 +37,9 @@ const onResponse = (response) => {
 };
 
 const onResponseError = (error) => {
-    let message = '';
+    stateQuery.remove(error.config);
 
-    const response = error.response;
+    if (session.isLoggedIn() && error.response?.status === 401) {
-    const responseData = response && response.data;
-    const responseError = responseData && response.data.error;
-    if (responseError) {
-        message = responseError.message;
-    }
-
-    switch (response?.status) {
-        case 422:
-            if (error.name == 'ValidationError')
-                message +=
-                    ' "' +
-                    responseError.details.context +
-                    '.' +
-                    Object.keys(responseError.details.codes).join(',') +
-                    '"';
-            break;
-        case 500:
-            message = 'errors.statusInternalServerError';
-            break;
-        case 502:
-            message = 'errors.statusBadGateway';
-            break;
-        case 504:
-            message = 'errors.statusGatewayTimeout';
-            break;
-    }
-
-    if (session.isLoggedIn() && response?.status === 401) {
         session.destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
@@ -74,8 +48,6 @@ const onResponseError = (error) => {
         return Promise.reject(error);
     }
 
-    notify(message, 'negative');
-
     return Promise.reject(error);
 };
 

src/boot/mainShortcutMixin.js

@@ -1,38 +0,0 @@
-import routes from 'src/router/modules';
-import { useRouter } from 'vue-router';
-
-let isNotified = false;
-
-export default {
-    created: function () {
-        const router = useRouter();
-        const keyBindingMap = routes
-            .filter((route) => route.meta.keyBinding)
-            .reduce((map, route) => {
-                map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
-                return map;
-            }, {});
-
-        const handleKeyDown = (event) => {
-            const { ctrlKey, altKey, code } = event;
-
-            if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
-                event.preventDefault();
-                router.push(keyBindingMap[code]);
-                isNotified = true;
-            }
-        };
-
-        const handleKeyUp = (event) => {
-            const { ctrlKey, altKey } = event;
-
-            // Resetea la bandera cuando se sueltan las teclas ctrl o alt
-            if (!ctrlKey || !altKey) {
-                isNotified = false;
-            }
-        };
-
-        window.addEventListener('keydown', handleKeyDown);
-        window.addEventListener('keyup', handleKeyUp);
-    },
-};

src/boot/quasar.js

@@ -1,16 +1,51 @@
 import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
-import mainShortcutMixin from './mainShortcutMixin';
 import keyShortcut from './keyShortcut';
 import useNotify from 'src/composables/useNotify.js';
+import { CanceledError } from 'axios';
+
 const { notify } = useNotify();
 
 export default boot(({ app }) => {
     app.mixin(qFormMixin);
-    app.mixin(mainShortcutMixin);
     app.directive('shortcut', keyShortcut);
-    app.config.errorHandler = function (err) {
+    app.config.errorHandler = (error) => {
-        console.error(err);
+        let message;
-        notify('globals.error', 'negative', 'error');
+        const response = error.response;
+        const responseData = response?.data;
+        const responseError = responseData && response.data.error;
+        if (responseError) {
+            message = responseError.message;
+        }
+
+        switch (response?.status) {
+            case 422:
+                if (error.name == 'ValidationError')
+                    message +=
+                        ' "' +
+                        responseError.details.context +
+                        '.' +
+                        Object.keys(responseError.details.codes).join(',') +
+                        '"';
+                break;
+            case 500:
+                message = 'errors.statusInternalServerError';
+                break;
+            case 502:
+                message = 'errors.statusBadGateway';
+                break;
+            case 504:
+                message = 'errors.statusGatewayTimeout';
+                break;
+        }
+
+        console.error(error);
+        if (error instanceof CanceledError) {
+            const env = process.env.NODE_ENV;
+            if (env && env !== 'development') return;
+            message = 'Duplicate request';
+        }
+
+        notify(message ?? 'globals.error', 'negative', 'error');
     };
 });

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({
@@ -102,10 +108,13 @@ watch(
 
 watch(
     () => postcodeFormData.provinceFk,
-    async (newProvinceFk) => {
+    async (newProvinceFk, oldValueFk) => {
-        if (newProvinceFk[0] && newProvinceFk[0] !== postcodeFormData.provinceFk) {
+        if (Array.isArray(newProvinceFk)) {
+            newProvinceFk = newProvinceFk[0];
+        }
+        if (newProvinceFk !== oldValueFk) {
             await townsFetchDataRef.value.fetch({
-                where: { provinceFk: newProvinceFk[0] },
+                where: { provinceFk: newProvinceFk },
             });
         }
     }
@@ -125,16 +134,20 @@ 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" />
+
     <FormModelPopup
         url-create="postcodes"
         model="postcode"
@@ -200,8 +213,10 @@ async function handleCountries(data) {
                     @on-province-created="onProvinceCreated"
                 />
                 <VnSelect
+                    url="Countries"
+                    :sort-by="['name ASC']"
                     :label="t('Country')"
-                    :options="countriesOptions"
+                    @update:options="handleCountries"
                     hide-selected
                     option-label="name"
                     option-value="id"

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/FormModel.vue

@@ -217,9 +217,6 @@ async function save() {
         updateAndEmit('onDataSaved', formData.value, response?.data);
         if ($props.reload) await arrayData.fetch({});
         hasChanges.value = false;
-    } catch (err) {
-        console.error(err);
-        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }

src/components/FormModelPopup.vue

@@ -61,6 +61,7 @@ defineExpose({
                     :loading="isLoading"
                     @click="emit('onDataCanceled')"
                     v-close-popup
+                    data-cy="FormModelPopup_cancel"
                 />
                 <QBtn
                     :label="t('globals.save')"
@@ -70,6 +71,7 @@ defineExpose({
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
+                    data-cy="FormModelPopup_save"
                 />
             </div>
         </template>

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/VnColumn.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { markRaw, computed, defineModel } from 'vue';
+import { markRaw, computed } from 'vue';
 import { QIcon, QCheckbox } from 'quasar';
 import { dashIfEmpty } from 'src/filters';
 

src/components/VnTable/VnFilter.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { markRaw, computed, defineModel } from 'vue';
+import { markRaw, computed } from 'vue';
 import { QCheckbox } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 

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 = [
     {
@@ -150,8 +151,8 @@ const tableModes = [
     },
 ];
 onBeforeMount(() => {
-    setUserParams(route.query[$props.searchUrl]);
+    const urlParams = route.query[$props.searchUrl];
-    hasParams.value = params.value && Object.keys(params.value).length !== 0;
+    hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
 });
 
 onMounted(() => {
@@ -184,7 +185,8 @@ watch(
 
 watch(
     () => route.query[$props.searchUrl],
-    (val) => setUserParams(val)
+    (val) => setUserParams(val),
+    { immediate: true, deep: true }
 );
 
 const isTableMode = computed(() => mode.value == TABLE_MODE);
@@ -315,12 +317,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 +415,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 +428,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)"
             >
@@ -451,7 +458,11 @@ function handleOnDataSaved(_) {
                     />
                 </template>
                 <template #header-cell="{ col }">
-                    <QTh v-if="col.visible ?? true">
+                    <QTh
+                        v-if="col.visible ?? true"
+                        :style="col.headerStyle"
+                        :class="col.headerClass"
+                    >
                         <div
                             class="column self-start q-ml-xs ellipsis"
                             :class="`text-${col?.align ?? 'left'}`"
@@ -811,6 +822,7 @@ es:
         top: 0;
     }
 }
+
 .vnTable {
     thead tr th {
         position: sticky;
@@ -849,6 +861,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/VnComponent.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, defineModel } from 'vue';
+import { computed } from 'vue';
 
 const model = defineModel(undefined, { required: true });
 const $props = defineProps({

src/components/common/VnProgressModal.vue

@@ -9,10 +9,6 @@ const $props = defineProps({
         type: Number, //Progress value (1.0 > x > 0.0)
         required: true,
     },
-    showDialog: {
-        type: Boolean,
-        required: true,
-    },
     cancelled: {
         type: Boolean,
         required: false,
@@ -24,30 +20,22 @@ const emit = defineEmits(['cancel', 'close']);
 
 const dialogRef = ref(null);
 
-const _showDialog = computed({
+const showDialog = defineModel('showDialog', {
-    get: () => $props.showDialog,
+    type: Boolean,
-    set: (value) => {
+    default: false,
-        if (value) dialogRef.value.show();
-    },
 });
 
 const _progress = computed(() => $props.progress);
-
 const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
-
-const cancel = () => {
-    dialogRef.value.hide();
-    emit('cancel');
-};
 </script>
 
 <template>
-    <QDialog ref="dialogRef" v-model="_showDialog" @hide="onDialogHide">
+    <QDialog ref="dialogRef" v-model="showDialog" @hide="emit('close')">
         <QCard class="full-width dialog">
             <QCardSection class="row">
                 <span class="text-h6">{{ t('Progress') }}</span>
                 <QSpace />
-                <QBtn icon="close" flat round dense @click="emit('close')" />
+                <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>
             <QCardSection>
                 <div class="column">
@@ -80,7 +68,7 @@ const cancel = () => {
                     type="button"
                     flat
                     class="text-primary"
-                    @click="cancel()"
+                    v-close-popup
                 >
                     {{ t('globals.cancel') }}
                 </QBtn>

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

src/components/ui/VnConfirm.vue

@@ -30,10 +30,11 @@ const props = defineProps({
     },
 });
 
-defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+const emit = defineEmits(['confirm', 'cancel', ...useDialogPluginComponent.emits]);
-defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
 
-const { dialogRef, onDialogOK } = useDialogPluginComponent();
+const { dialogRef, onDialogHide, onDialogOK, onDialogCancel } =
+    useDialogPluginComponent();
+defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
 
 const title = props.title || t('Confirm');
 const message =
@@ -53,9 +54,14 @@ async function confirm() {
     }
     onDialogOK(props.data);
 }
+
+function cancel() {
+    emit('cancel');
+    onDialogCancel();
+}
 </script>
 <template>
-    <QDialog ref="dialogRef">
+    <QDialog ref="dialogRef" @hide="onDialogHide">
         <QCard class="q-pa-sm">
             <QCardSection class="row items-center q-pb-none">
                 <QAvatar
@@ -67,7 +73,14 @@ async function confirm() {
                 />
                 <span class="text-h6">{{ title }}</span>
                 <QSpace />
-                <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
+                <QBtn
+                    icon="close"
+                    :disable="isLoading"
+                    flat
+                    round
+                    dense
+                    @click="cancel()"
+                />
             </QCardSection>
             <QCardSection class="q-pb-none">
                 <span v-if="message !== false" v-html="message" />
@@ -81,7 +94,7 @@ async function confirm() {
                     color="primary"
                     :disable="isLoading"
                     flat
-                    v-close-popup
+                    @click="cancel()"
                 />
                 <QBtn
                     :label="t('globals.confirm')"

src/components/ui/VnRow.vue

@@ -1,6 +1,3 @@
-<script setup>
-defineProps({ wrap: { type: Boolean, default: false } });
-</script>
 <template>
     <div class="vn-row q-gutter-md q-mb-md">
         <slot />

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/composables/useAdvancedSummary.js

@@ -0,0 +1,11 @@
+import axios from 'axios';
+import { useRole } from './useRole';
+
+export async function useAdvancedSummary(model, id, roles = ['hr']) {
+    if (useRole().hasAny(roles)) {
+        const { data } = await axios.get(`${model}/advancedSummary`, {
+            params: { filter: { where: { id } } },
+        });
+        return Array.isArray(data) ? data[0] : data;
+    }
+}

src/composables/useArrayData.js

@@ -248,6 +248,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
     function updateStateParams() {
         const usesModuleName = userOptions.moduleName;
+        if (!route) return;
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
         newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
 

src/css/app.scss

@@ -288,3 +288,7 @@ input::-webkit-inner-spin-button {
         color: $info;
     }
 }
+
+.no-visible {
+    visibility: hidden;
+}

src/i18n/locale/en.yml

@@ -277,6 +277,8 @@ globals:
         medical: Mutual
         RouteExtendedList: Router
         wasteRecalc: Waste recaclulate
+        operator: Operator
+        parking: Parking
     supplier: Supplier
     created: Created
     worker: Worker
@@ -303,12 +305,15 @@ 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
+    raid: 'Raid {daysInForward} days'
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -366,7 +371,6 @@ entry:
             companyFk: Company
             travelFk: Travel
             isExcludedFromAvailable: Inventory
-            isRaid: Raid
             invoiceAmount: Import
     summary:
         commission: Commission
@@ -377,7 +381,6 @@ entry:
         ordered: Ordered
         confirmed: Confirmed
         booked: Booked
-        raid: Raid
         excludedFromAvailable: Inventory
         travelReference: Reference
         travelAgency: Agency
@@ -410,7 +413,6 @@ entry:
         ordered: Ordered
         confirmed: Confirmed
         booked: Booked
-        raid: Raid
         excludedFromAvailable: Inventory
         agency: Agency
         warehouseOut: Warehouse Out
@@ -473,7 +475,6 @@ entry:
             packingOut: Package out
             landing: Landing
             isExcludedFromAvailable: Es inventory
-            isRaid: Raid
 ticket:
     pageTitles:
         tickets: Tickets
@@ -555,7 +556,6 @@ ticket:
         package: Package
         taxClass: Tax class
         services: Services
-        changeState: Change state
         requester: Requester
         atender: Atender
         request: Request
@@ -661,8 +661,6 @@ parking:
     sector: Sector
     row: Row
     column: Column
-    pageTitles:
-        parking: Parking
     searchBar:
         info: You can search by parking code
         label: Search parking...
@@ -743,6 +741,7 @@ worker:
         locker: Locker
         balance: Balance
         medical: Medical
+        operator: Operator
     list:
         name: Name
         email: Email
@@ -840,6 +839,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
@@ -1027,6 +1038,7 @@ travel:
         warehouseIn: Warehouse In
         delivered: Delivered
         received: Received
+        daysInForward: Days in forward
     thermographs:
         code: Code
         temperature: Temperature
@@ -1040,92 +1052,6 @@ travel:
         warehouse: Warehouse
         travelFileDescription: 'Travel id { travelId }'
         file: File
-item:
-    descriptor:
-        item: Item
-        buyer: Buyer
-        color: Color
-        category: Category
-        stems: Stems
-        visible: Visible
-        available: Available
-        warehouseText: 'Calculated on the warehouse of { warehouseName }'
-        itemDiary: Item diary
-        producer: Producer
-    list:
-        id: Identifier
-        grouping: Grouping
-        packing: Packing
-        description: Description
-        stems: Stems
-        category: Category
-        typeName: Type
-        intrastat: Intrastat
-        isActive: Active
-        size: Size
-        origin: Origin
-        userName: Buyer
-        weightByPiece: Weight/Piece
-        stemMultiplier: Multiplier
-        producer: Producer
-        landed: Landed
-    fixedPrice:
-        itemFk: Item ID
-        groupingPrice: Grouping price
-        packingPrice: Packing price
-        hasMinPrice: Has min price
-        minPrice: Min price
-        started: Started
-        ended: Ended
-        warehouse: Warehouse
-    create:
-        name: Name
-        tag: Tag
-        priority: Priority
-        type: Type
-        intrastat: Intrastat
-        origin: Origin
-    buyRequest:
-        ticketId: 'Ticket ID'
-        shipped: 'Shipped'
-        requester: 'Requester'
-        requested: 'Requested'
-        price: 'Price'
-        attender: 'Atender'
-        item: 'Item'
-        achieved: 'Achieved'
-        concept: 'Concept'
-        state: 'State'
-    summary:
-        basicData: 'Basic data'
-        otherData: 'Other data'
-        description: 'Description'
-        tax: 'Tax'
-        tags: 'Tags'
-        botanical: 'Botanical'
-        barcode: 'Barcode'
-        name: 'Nombre'
-        completeName: 'Nombre completo'
-        family: 'Familia'
-        size: 'Medida'
-        origin: 'Origen'
-        stems: 'Tallos'
-        multiplier: 'Multiplicador'
-        buyer: 'Comprador'
-        doPhoto: 'Do photo'
-        intrastatCode: 'Código intrastat'
-        intrastat: 'Intrastat'
-        ref: 'Referencia'
-        relevance: 'Relevancia'
-        weight: 'Peso (gramos)/tallo'
-        units: 'Unidades/caja'
-        expense: 'Gasto'
-        generic: 'Genérico'
-        recycledPlastic: 'Plástico reciclado'
-        nonRecycledPlastic: 'Plástico no reciclado'
-        minSalesQuantity: 'Cantidad mínima de venta'
-        genus: 'Genus'
-        specie: 'Specie'
 components:
     topbar: {}
     itemsFilterPanel:

src/i18n/locale/es.yml

@@ -281,6 +281,8 @@ globals:
         serial: Facturas por serie
         medical: Mutua
         wasteRecalc: Recalcular mermas
+        operator: Operario
+        parking: Parking
     supplier: Proveedor
     created: Fecha creación
     worker: Trabajador
@@ -311,8 +313,11 @@ globals:
         email: Correo
         SSN: NSS
         fi: NIF
+        myTeam: Mi equipo
     changePass: Cambiar contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
+    changeState: Cambiar estado
+    raid: 'Redada {daysInForward} días'
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -368,7 +373,6 @@ entry:
             companyFk: Empresa
             travelFk: Envio
             isExcludedFromAvailable: Inventario
-            isRaid: Redada
             invoiceAmount: Importe
     summary:
         commission: Comisión
@@ -379,7 +383,6 @@ entry:
         ordered: Pedida
         confirmed: Confirmada
         booked: Contabilizada
-        raid: Redada
         excludedFromAvailable: Inventario
         travelReference: Referencia
         travelAgency: Agencia
@@ -412,7 +415,6 @@ entry:
         ordered: Pedida
         confirmed: Confirmado
         booked: Asentado
-        raid: Redada
         excludedFromAvailable: Inventario
         agency: Agencia
         warehouseOut: Alm. salida
@@ -475,7 +477,6 @@ entry:
             packingOut: Embalaje envíos
             landing: Llegada
             isExcludedFromAvailable: Es inventario
-            isRaid: Redada
 ticket:
     pageTitles:
         tickets: Tickets
@@ -564,7 +565,6 @@ ticket:
         package: Embalaje
         taxClass: Tipo IVA
         services: Servicios
-        changeState: Cambiar estado
         requester: Solicitante
         atender: Comprador
         request: Petición de compra
@@ -708,8 +708,6 @@ parking:
     pickingOrder: Orden de recogida
     row: Fila
     column: Columna
-    pageTitles:
-        parking: Parking
     searchBar:
         info: Puedes buscar por código de parking
         label: Buscar parking...
@@ -750,6 +748,7 @@ worker:
         balance: Balance
         formation: Formación
         medical: Mutua
+        operator: Operario
     list:
         name: Nombre
         email: Email
@@ -838,6 +837,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
@@ -1024,6 +1036,7 @@ travel:
         warehouseIn: Alm. entrada
         delivered: Enviada
         received: Recibida
+        daysInForward: Días redada
     thermographs:
         code: Código
         temperature: Temperatura
@@ -1037,92 +1050,6 @@ travel:
         warehouse: Almacén
         travelFileDescription: 'Id envío { travelId }'
         file: Fichero
-item:
-    descriptor:
-        item: Artículo
-        buyer: Comprador
-        color: Color
-        category: Categoría
-        stems: Tallos
-        visible: Visible
-        available: Disponible
-        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
-        itemDiary: Registro de compra-venta
-        producer: Productor
-    list:
-        id: Identificador
-        grouping: Grouping
-        packing: Packing
-        description: Descripción
-        stems: Tallos
-        category: Reino
-        typeName: Tipo
-        intrastat: Intrastat
-        isActive: Activo
-        size: Medida
-        origin: Origen
-        weightByPiece: Peso (gramos)/tallo
-        userName: Comprador
-        stemMultiplier: Multiplicador
-        producer: Productor
-        landed: F. entrega
-    fixedPrice:
-        itemFk: ID Artículo
-        groupingPrice: Precio grouping
-        packingPrice: Precio packing
-        hasMinPrice: Tiene precio mínimo
-        minPrice: Precio min
-        started: Inicio
-        ended: Fin
-        warehouse: Almacén
-    create:
-        name: Nombre
-        tag: Etiqueta
-        priority: Prioridad
-        type: Tipo
-        intrastat: Intrastat
-        origin: Origen
-    summary:
-        basicData: 'Datos básicos'
-        otherData: 'Otros datos'
-        description: 'Descripción'
-        tax: 'IVA'
-        tags: 'Etiquetas'
-        botanical: 'Botánico'
-        barcode: 'Código de barras'
-        name: 'Nombre'
-        completeName: 'Nombre completo'
-        family: 'Familia'
-        size: 'Medida'
-        origin: 'Origen'
-        stems: 'Tallos'
-        multiplier: 'Multiplicador'
-        buyer: 'Comprador'
-        doPhoto: 'Hacer foto'
-        intrastatCode: 'Código intrastat'
-        intrastat: 'Intrastat'
-        ref: 'Referencia'
-        relevance: 'Relevancia'
-        weight: 'Peso (gramos)/tallo'
-        units: 'Unidades/caja'
-        expense: 'Gasto'
-        generic: 'Genérico'
-        recycledPlastic: 'Plástico reciclado'
-        nonRecycledPlastic: 'Plástico no reciclado'
-        minSalesQuantity: 'Cantidad mínima de venta'
-        genus: 'Genus'
-        specie: 'Specie'
-    buyRequest:
-        ticketId: 'ID Ticket'
-        shipped: 'F. envío'
-        requester: 'Solicitante'
-        requested: 'Solicitado'
-        price: 'Precio'
-        attender: 'Comprador'
-        item: 'Artículo'
-        achieved: 'Conseguido'
-        concept: 'Concepto'
-        state: 'Estado'
 components:
     topbar: {}
     itemsFilterPanel:

src/layouts/MainLayout.vue

@@ -1,7 +1,44 @@
 <script setup>
 import { useQuasar } from 'quasar';
 import Navbar from 'src/components/NavBar.vue';
+import { useRouter } from 'vue-router';
+import routes from 'src/router/modules';
+import { onMounted } from 'vue';
+
 const quasar = useQuasar();
+
+onMounted(() => {
+    let isNotified = false;
+
+    const router = useRouter();
+    const keyBindingMap = routes
+        .filter((route) => route.meta.keyBinding)
+        .reduce((map, route) => {
+            map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
+            return map;
+        }, {});
+
+    const handleKeyDown = (event) => {
+        const { ctrlKey, altKey, code } = event;
+
+        if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
+            event.preventDefault();
+            router.push(keyBindingMap[code]);
+            isNotified = true;
+        }
+    };
+
+    const handleKeyUp = (event) => {
+        const { ctrlKey, altKey } = event;
+
+        if (!ctrlKey || !altKey) {
+            isNotified = false;
+        }
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+    window.addEventListener('keyup', handleKeyUp);
+});
 </script>
 
 <template>

src/pages/Account/AccountAcls.vue

@@ -9,6 +9,8 @@ import { useQuasar } from 'quasar';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
+import FetchData from 'src/components/FetchData.vue';
+import { useValidator } from 'src/composables/useValidator';
 
 defineProps({
     id: {
@@ -23,11 +25,18 @@ const stateStore = useStateStore();
 const quasar = useQuasar();
 
 const tableRef = ref();
-
+const roles = ref();
+const validationsStore = useValidator();
+const { models } = validationsStore;
 const exprBuilder = (param, value) => {
     switch (param) {
         case 'search':
-            return { model: { like: `%${value}%` } };
+            return {
+                or: [
+                    { model: { like: `%${value}%` } },
+                    { property: { like: `%${value}%` } },
+                ],
+            };
         default:
             return { [param]: value };
     }
@@ -47,6 +56,13 @@ const columns = computed(() => [
         label: t('model'),
         cardVisible: true,
         create: true,
+        columnCreate: {
+            label: t('model'),
+            component: 'select',
+            attrs: {
+                options: Object.keys(models),
+            },
+        },
     },
     {
         align: 'left',
@@ -55,9 +71,10 @@ const columns = computed(() => [
         cardVisible: true,
         component: 'select',
         attrs: {
-            url: 'VnRoles',
+            options: roles,
             optionLabel: 'name',
             optionValue: 'name',
+            inputDebounce: 0,
         },
         create: true,
     },
@@ -130,6 +147,11 @@ const deleteAcl = async ({ id }) => {
     />
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
     </QDrawer>
+    <FetchData
+        url="VnRoles?fields=['name']"
+        auto-load
+        @on-fetch="(data) => (roles = data)"
+    />
     <VnTable
         ref="tableRef"
         data-key="AccountAcls"

src/pages/Account/AccountFilter.vue

@@ -33,6 +33,7 @@ const rolesOptions = ref([]);
         :search-button="true"
         :hidden-tags="['search']"
         :redirect="false"
+        search-url="table"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">

src/pages/Account/AccountList.vue

@@ -74,7 +74,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('View Summary'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, AccountSummary),
                 isPrimary: true,

src/pages/Account/Alias/Card/AliasUsers.vue

@@ -46,13 +46,9 @@ const columns = computed(() => [
 ]);
 
 const deleteAlias = async (row) => {
-    try {
     await axios.delete(`${urlPath.value}/${row.id}`);
     notify(t('User removed'), 'positive');
     fetchAliases();
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 watch(

src/pages/Account/Card/AccountMailAlias.vue

@@ -61,23 +61,15 @@ const fetchAccountExistence = async () => {
 };
 
 const deleteMailAlias = async (row) => {
-    try {
     await axios.delete(`${urlPath}/${row.id}`);
     fetchMailAliases();
     notify(t('Unsubscribed from alias!'), 'positive');
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const createMailAlias = async (mailAliasFormData) => {
-    try {
     await axios.post(urlPath, mailAliasFormData);
     notify(t('Subscribed to alias!'), 'positive');
     fetchMailAliases();
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const fetchMailAliases = async () => {

src/pages/Account/Role/AccountRoles.vue

@@ -54,7 +54,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('View Summary'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, RoleSummary),
                 isPrimary: true,

src/pages/Account/Role/Card/SubRoles.vue

@@ -46,29 +46,15 @@ const columns = computed(() => [
 ]);
 
 const deleteSubRole = async (row) => {
-    try {
     await axios.delete(`${urlPath.value}/${row.id}`);
     fetchSubRoles();
-        notify(
+    notify(t('Role removed. Changes will take a while to fully propagate.'), 'positive');
-            t('Role removed. Changes will take a while to fully propagate.'),
-            'positive'
-        );
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const createSubRole = async (subRoleFormData) => {
-    try {
     await axios.post(urlPath.value, subRoleFormData);
-        notify(
+    notify(t('Role added! Changes will take a while to fully propagate.'), 'positive');
-            t('Role added! Changes will take a while to fully propagate.'),
-            'positive'
-        );
     fetchSubRoles();
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 watch(

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/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.ticketSales),
+    },
     {
         align: 'right',
         label: '',
@@ -135,6 +150,23 @@ const setShippedColor = (date) => {
     if (difference == 0) return 'warning';
     if (difference < 0) return 'success';
 };
+
+const getItemPackagingType = (ticketSales) => {
+    if (!ticketSales?.length) return '-';
+
+    const packagingTypes = ticketSales.reduce((types, sale) => {
+        const { itemPackingTypeFk } = sale.item;
+        if (
+            !types.includes(itemPackingTypeFk) &&
+            (itemPackingTypeFk === 'H' || itemPackingTypeFk === 'V')
+        ) {
+            types.push(itemPackingTypeFk);
+        }
+        return types;
+    }, []);
+
+    return dashIfEmpty(packagingTypes.join(', ') || '-');
+};
 </script>
 
 <template>

src/pages/Entry/Card/EntryBasicData.vue

@@ -168,7 +168,6 @@ const onFilterTravelSelected = (formData, id) => {
                     v-model="data.isExcludedFromAvailable"
                     :label="t('entry.basicData.excludedFromAvailable')"
                 />
-                <QCheckbox v-model="data.isRaid" :label="t('entry.basicData.raid')" />
                 <QCheckbox
                     v-if="isAdministrative()"
                     v-model="data.isBooked"

src/pages/Entry/Card/EntryDescriptor.vue

@@ -7,7 +7,6 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 
-import { useState } from 'src/composables/useState';
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import { getUrl } from 'src/composables/getUrl';
@@ -23,7 +22,6 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 const { openReport } = usePrintService();
-const state = useState();
 const entryDescriptorRef = ref(null);
 const url = ref();
 
@@ -32,7 +30,14 @@ const entryFilter = {
         {
             relation: 'travel',
             scope: {
-                fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'],
+                fields: [
+                    'id',
+                    'landed',
+                    'shipped',
+                    'agencyModeFk',
+                    'warehouseOutFk',
+                    'daysInForward',
+                ],
                 include: [
                     {
                         relation: 'agency',
@@ -75,8 +80,6 @@ const data = ref(useCardDescription());
 const setData = (entity) =>
     (data.value = useCardDescription(entity.supplier?.nickname, entity.id));
 
-const currentEntry = computed(() => state.get('entry'));
-
 const getEntryRedirectionFilter = (entry) => {
     let entryTravel = entry && entry.travel;
 
@@ -133,10 +136,10 @@ watch;
                 :value="entity.travel?.warehouseOut?.name"
             />
         </template>
-        <template #icons>
+        <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-md">
                 <QIcon
-                    v-if="currentEntry?.isExcludedFromAvailable"
+                    v-if="entity?.isExcludedFromAvailable"
                     name="vn:inventory"
                     color="primary"
                     size="xs"
@@ -144,12 +147,18 @@ watch;
                     <QTooltip>{{ t('Inventory entry') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="currentEntry?.isRaid"
+                    v-if="entity?.travel?.daysInForward"
                     name="vn:net"
                     color="primary"
                     size="xs"
                 >
-                    <QTooltip>{{ t('Virtual entry') }}</QTooltip>
+                    <QTooltip>
+                        {{
+                            t('globals.raid', {
+                                daysInForward: entity?.travel?.daysInForward,
+                            })
+                        }}</QTooltip
+                    >
                 </QIcon>
             </QCardActions>
         </template>

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>
@@ -260,11 +259,6 @@ const fetchEntryBuys = async () => {
                     v-model="entry.isBooked"
                     :disable="true"
                 />
-                <QCheckbox
-                    :label="t('entry.summary.raid')"
-                    v-model="entry.isRaid"
-                    :disable="true"
-                />
                 <QCheckbox
                     :label="t('entry.summary.excludedFromAvailable')"
                     v-model="entry.isExcludedFromAvailable"

src/pages/Entry/EntryBuysTableDialog.vue

@@ -121,7 +121,7 @@ const entriesTableColumns = computed(() => [
                                         :loading="isLoading"
                                         @click="
                                             openReport(
-                                                `Entries/${props.row.id}/buy-label`
+                                                `Entries/${props.row.id}/buy-label-supplier`
                                             )
                                         "
                                         unelevated

src/pages/Entry/EntryLatestBuys.vue

@@ -23,7 +23,6 @@ const columns = [
                 return {
                     id: row.id,
                     size: '50x50',
-                    width: '50px',
                 };
             },
         },
@@ -34,21 +33,37 @@ const columns = [
         label: t('entry.latestBuys.tableVisibleColumns.itemFk'),
         name: 'itemFk',
         isTitle: true,
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.packing'),
         name: 'packing',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.grouping'),
         name: 'grouping',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.quantity'),
         name: 'quantity',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -59,6 +74,10 @@ const columns = [
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.size'),
         name: 'size',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -84,6 +103,10 @@ const columns = [
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
         name: 'weightByPiece',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -99,26 +122,46 @@ const columns = [
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.entryFk'),
         name: 'entryFk',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.buyingValue'),
         name: 'buyingValue',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.freightValue'),
         name: 'freightValue',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.comissionValue'),
         name: 'comissionValue',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
         name: 'packageValue',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -129,16 +172,28 @@ const columns = [
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.price2'),
         name: 'price2',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.price3'),
         name: 'price3',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.minPrice'),
         name: 'minPrice',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -149,11 +204,19 @@ const columns = [
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.weight'),
         name: 'weight',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.packagingFk'),
         name: 'packagingFk',
+        columnFilter: {
+            component: 'number',
+            inWhere: true,
+        },
     },
     {
         align: 'left',

src/pages/Entry/EntryList.vue

@@ -41,6 +41,10 @@ const entryFilter = {
 };
 
 const columns = computed(() => [
+    {
+        name: 'status',
+        columnFilter: false,
+    },
     {
         align: 'left',
         label: t('entry.list.tableVisibleColumns.id'),
@@ -154,27 +158,8 @@ const columns = computed(() => [
         cardVisible: true,
     },
     {
-        align: 'left',
         label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'),
         name: 'isExcludedFromAvailable',
-        chip: {
-            color: null,
-            condition: (value) => value,
-            icon: 'vn:inventory',
-        },
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        label: t('entry.list.tableVisibleColumns.isRaid'),
-        name: 'isRaid',
-        chip: {
-            color: null,
-            condition: (value) => value,
-            icon: 'vn:net',
-        },
         columnFilter: {
             inWhere: true,
         },
@@ -225,6 +210,26 @@ onMounted(async () => {
         auto-load
         :right-search="false"
     >
+        <template #column-status="{ row }">
+            <div class="row q-gutter-xs">
+                <QIcon
+                    v-if="!!row.isExcludedFromAvailable"
+                    name="vn:inventory"
+                    color="primary"
+                >
+                    <QTooltip>{{
+                        t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
+                    }}</QTooltip>
+                </QIcon>
+                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                    <QTooltip>
+                        {{
+                            t('globals.raid', { daysInForward: row.daysInForward })
+                        }}</QTooltip
+                    >
+                </QIcon>
+            </div>
+        </template>
         <template #column-supplierFk="{ row }">
             <span class="link" @click.stop>
                 {{ row.supplierName }}

src/pages/Entry/locale/en.yml

@@ -1,7 +1,6 @@
 entryList:
     list:
         inventoryEntry: Inventory entry
-        virtualEntry: Virtual entry
 entryFilter:
     filter:
         search: General search

src/pages/Entry/locale/es.yml

@@ -4,7 +4,6 @@ You can search by entry reference: Puedes buscar por referencia de la entrada
 entryList:
     list:
         inventoryEntry: Es inventario
-        virtualEntry: Es una redada
 entryFilter:
     filter:
         search: Búsqueda general

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/Item/Card/ItemBasicData.vue

@@ -63,7 +63,7 @@ const onIntrastatCreated = (response, formData) => {
         <template #form="{ data }">
             <VnRow>
                 <VnSelect
-                    :label="t('itemBasicData.type')"
+                    :label="t('item.basicData.type')"
                     v-model="data.typeFk"
                     :options="itemTypesOptions"
                     option-value="id"
@@ -82,17 +82,26 @@ const onIntrastatCreated = (response, formData) => {
                         </QItem>
                     </template>
                 </VnSelect>
-                <VnInput :label="t('itemBasicData.reference')" v-model="data.comment" />
+                <VnInput :label="t('item.basicData.reference')" v-model="data.comment" />
-                <VnInput :label="t('itemBasicData.relevancy')" v-model="data.relevancy" />
-            </VnRow>
-            <VnRow>
-                <VnInput :label="t('itemBasicData.stems')" v-model="data.stems" />
                 <VnInput
-                    :label="t('itemBasicData.multiplier')"
+                    :label="t('item.basicData.relevancy')"
+                    type="number"
+                    v-model="data.relevancy"
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    :label="t('item.basicData.stems')"
+                    type="number"
+                    v-model="data.stems"
+                />
+                <VnInput
+                    :label="t('item.basicData.multiplier')"
+                    type="number"
                     v-model="data.stemMultiplier"
                 />
                 <VnSelectDialog
-                    :label="t('itemBasicData.generic')"
+                    :label="t('item.basicData.generic')"
                     v-model="data.genericFk"
                     url="Items/withName"
                     :fields="['id', 'name']"
@@ -121,7 +130,7 @@ const onIntrastatCreated = (response, formData) => {
             </VnRow>
             <VnRow>
                 <VnSelectDialog
-                    :label="t('itemBasicData.intrastat')"
+                    :label="t('item.basicData.intrastat')"
                     v-model="data.intrastatFk"
                     :options="intrastatsOptions"
                     option-value="id"
@@ -148,7 +157,7 @@ const onIntrastatCreated = (response, formData) => {
                 </VnSelectDialog>
                 <div class="col">
                     <VnSelect
-                        :label="t('itemBasicData.expense')"
+                        :label="t('item.basicData.expense')"
                         v-model="data.expenseFk"
                         :options="expensesOptions"
                         option-value="id"
@@ -160,64 +169,67 @@ const onIntrastatCreated = (response, formData) => {
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('itemBasicData.weightByPiece')"
+                    :label="t('item.basicData.weightByPiece')"
                     v-model.number="data.weightByPiece"
                     :min="0"
                     type="number"
                 />
                 <VnInput
-                    :label="t('itemBasicData.boxUnits')"
+                    :label="t('item.basicData.boxUnits')"
                     v-model.number="data.packingOut"
                     :min="0"
                     type="number"
                 />
                 <VnInput
-                    :label="t('itemBasicData.recycledPlastic')"
+                    :label="t('item.basicData.recycledPlastic')"
                     v-model.number="data.recycledPlastic"
                     :min="0"
                     type="number"
                 />
                 <VnInput
-                    :label="t('itemBasicData.nonRecycledPlastic')"
+                    :label="t('item.basicData.nonRecycledPlastic')"
                     v-model.number="data.nonRecycledPlastic"
                     :min="0"
                     type="number"
                 />
             </VnRow>
-            <VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
-                <QCheckbox v-model="data.isActive" :label="t('itemBasicData.isActive')" />
+                <QCheckbox
+                    v-model="data.isActive"
+                    :label="t('item.basicData.isActive')"
+                />
                 <QCheckbox
                     v-model="data.hasKgPrice"
-                    :label="t('itemBasicData.hasKgPrice')"
+                    :label="t('item.basicData.hasKgPrice')"
                 />
                 <div>
                     <QCheckbox
                         v-model="data.isFragile"
-                        :label="t('itemBasicData.isFragile')"
+                        :label="t('item.basicData.isFragile')"
                         class="q-mr-sm"
                     />
                     <QIcon name="info" class="cursor-pointer" size="xs">
                         <QTooltip max-width="300px">
-                            {{ t('itemBasicData.isFragileTooltip') }}
+                            {{ t('item.basicData.isFragileTooltip') }}
                         </QTooltip>
                     </QIcon>
                 </div>
                 <div>
                     <QCheckbox
                         v-model="data.isPhotoRequested"
-                        :label="t('itemBasicData.isPhotoRequested')"
+                        :label="t('item.basicData.isPhotoRequested')"
                         class="q-mr-sm"
                     />
                     <QIcon name="info" class="cursor-pointer" size="xs">
                         <QTooltip>
-                            {{ t('itemBasicData.isPhotoRequestedTooltip') }}
+                            {{ t('item.basicData.isPhotoRequestedTooltip') }}
                         </QTooltip>
                     </QIcon>
                 </div>
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('itemBasicData.description')"
+                    :label="t('item.basicData.description')"
                     type="textarea"
                     v-model="data.description"
                     fill-input

src/pages/Item/Card/ItemBotanical.vue

@@ -20,12 +20,6 @@ let itemBotanicalsForm = reactive({ itemFk: null });
 const entityId = computed(() => {
     return route.params.id;
 });
-onMounted(async () => {
-    itemBotanicalsForm.itemFk = entityId.value;
-    itemBotanicals.value = await itemBotanicalsRef.value.fetch();
-    if (itemBotanicals.value.length > 0)
-        Object.assign(itemBotanicalsForm, itemBotanicals.value[0]);
-});
 </script>
 <template>
     <FetchData
@@ -37,11 +31,14 @@ onMounted(async () => {
         @on-fetch="(data) => (itemBotanicals = data)"
     />
     <FormModel
+        url="ItemBotanicals"
         url-update="ItemBotanicals"
-        model="entry"
+        model="item"
         auto-load
-        :form-initial-data="itemBotanicalsForm"
+        :filter="{
-        :clear-store-on-unmount="false"
+            where: { itemFk: entityId },
+        }"
+        @on-fetch="(data) => (itemBotanicalsForm = data)"
     >
         <template #form="{ data }">
             <VnRow>

src/pages/Item/Card/ItemDescriptor.vue

@@ -1,18 +1,18 @@
 <script setup>
 import { computed, ref, onMounted } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
 
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 import RegularizeStockForm from 'components/RegularizeStockForm.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import { dashIfEmpty } from 'src/filters';
+import { useArrayData } from 'src/composables/useArrayData';
+import { cloneItem } from 'src/pages/Item/composables/cloneItem';
 
 const $props = defineProps({
     id: {
@@ -38,9 +38,8 @@ const $props = defineProps({
     },
 });
 
-const quasar = useQuasar();
+const { openCloneDialog } = cloneItem();
 const route = useRoute();
-const router = useRouter();
 const { t } = useI18n();
 const warehouseConfig = ref(null);
 const entityId = computed(() => {
@@ -48,84 +47,52 @@ const entityId = computed(() => {
 });
 
 const regularizeStockFormDialog = ref(null);
-const available = ref(null);
+const mounted = ref();
-const visible = ref(null);
+
+const arrayDataStock = useArrayData('descriptorStock', {
+    url: `Items/${entityId.value}/getVisibleAvailable`,
+});
 
 onMounted(async () => {
     await getItemConfigs();
-    await updateStock();
+    mounted.value = true;
 });
 
 const data = ref(useCardDescription());
 const setData = async (entity) => {
-    try {
     if (!entity) return;
     data.value = useCardDescription(entity.name, entity.id);
     await updateStock();
-    } catch (err) {
-        console.error('Error item');
-    }
 };
 
 const getItemConfigs = async () => {
-    try {
     const { data } = await axios.get('ItemConfigs/findOne');
     if (!data) return;
     return (warehouseConfig.value = data.warehouseFk);
-    } catch (err) {
-        console.error('Error item');
-    }
 };
 const updateStock = async () => {
-    try {
+    if (!mounted.value) return;
-        available.value = null;
+    await getItemConfigs();
-        visible.value = null;
 
     const params = {
-            warehouseFk: $props.warehouseFk,
+        warehouseFk: $props.warehouseFk ?? warehouseConfig.value,
         dated: $props.dated,
     };
 
-        await getItemConfigs();
+    if (!params.warehouseFk) return;
-        if (!params.warehouseFk) {
+
-            params.warehouseFk = warehouseConfig.value;
+    const stock = useArrayData('descriptorStock', {
-        }
+        url: `Items/${entityId.value}/getVisibleAvailable`,
-        const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
+        userParams: params,
-            params,
     });
-        available.value = data.available;
+    const storeData = stock.store.data;
-        visible.value = data.visible;
+    if (storeData?.itemFk == entityId.value) return;
-    } catch (err) {
+    await stock.fetch({});
-        console.error('Error updating stock');
-    }
 };
 
 const openRegularizeStockForm = () => {
     regularizeStockFormDialog.value.show();
 };
-
-const cloneItem = async () => {
-    try {
-        const { data } = await axios.post(`Items/${entityId.value}/clone`);
-        router.push({ name: 'ItemTags', params: { id: data.id } });
-    } catch (err) {
-        console.error('Error cloning item');
-    }
-};
-
-const openCloneDialog = async () => {
-    quasar
-        .dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('All its properties will be copied'),
-                message: t('Do you want to clone this item?'),
-            },
-        })
-        .onOk(async () => {
-            await cloneItem();
-        });
-};
 </script>
 
 <template>
@@ -151,7 +118,7 @@ const openCloneDialog = async () => {
                     </QDialog>
                 </QItemSection>
             </QItem>
-            <QItem v-ripple clickable @click="openCloneDialog()">
+            <QItem v-ripple clickable @click="openCloneDialog(entityId)">
                 <QItemSection>
                     {{ t('globals.clone') }}
                 </QItemSection>
@@ -160,8 +127,8 @@ const openCloneDialog = async () => {
         <template #before>
             <ItemDescriptorImage
                 :entity-id="entityId"
-                :visible="visible"
+                :visible="arrayDataStock.store.data?.visible"
-                :available="available"
+                :available="arrayDataStock.store.data?.available"
             />
         </template>
         <template #body="{ entity }">
@@ -194,6 +161,18 @@ const openCloneDialog = async () => {
                 :value="entity.value7"
             />
         </template>
+        <template #icons="{ entity }">
+            <QCardActions v-if="entity" class="q-gutter-x-md">
+                <QIcon
+                    v-if="!entity.isActive"
+                    name="vn:unavailable"
+                    color="primary"
+                    size="xs"
+                >
+                    <QTooltip>{{ t('Inactive article') }}</QTooltip>
+                </QIcon>
+            </QCardActions>
+        </template>
         <template #actions="{}">
             <QCardActions class="row justify-center">
                 <QBtn
@@ -216,8 +195,7 @@ const openCloneDialog = async () => {
 <i18n>
 es:
     Regularize stock: Regularizar stock
-    All its properties will be copied: Todas sus propiedades serán copiadas
+    Inactive article: Artículo inactivo
-    Do you want to clone this item?: ¿Desea clonar este artículo?
 </i18n>
 
 <style lang="scss" scoped>

src/pages/Item/Card/ItemDescriptorImage.vue

@@ -32,6 +32,10 @@ const editPhotoFormDialog = ref(null);
 const showEditPhotoForm = ref(false);
 const warehouseName = ref(null);
 
+onMounted(async () => {
+    getItemConfigs();
+});
+
 const toggleEditPictureForm = () => {
     showEditPhotoForm.value = !showEditPhotoForm.value;
 };
@@ -56,10 +60,6 @@ const getWarehouseName = async (warehouseFk) => {
     warehouseName.value = data.name;
 };
 
-onMounted(async () => {
-    getItemConfigs();
-});
-
 const handlePhotoUpdated = (evt = false) => {
     image.value.reload(evt);
 };
@@ -134,10 +134,10 @@ es:
     Regularize stock: Regularizar stock
     All it's properties will be copied: Todas sus propiedades serán copiadas
     Do you want to clone this item?: ¿Desea clonar este artículo?
-    warehouseText: Calculated on the warehouse of { warehouseName }
+    warehouseText: Calculado sobre el almacén de { warehouseName }
 
 en:
-    warehouseText: Calculado sobre el almacén de { warehouseName }
+    warehouseText: Calculated on the warehouse of { warehouseName }
 </i18n>
 
 <style lang="scss" scoped>

src/pages/Item/Card/ItemDiary.vue

@@ -17,6 +17,7 @@ import { toDateFormat } from 'src/filters/date.js';
 import { dashIfEmpty } from 'src/filters';
 import { date } from 'quasar';
 import { useState } from 'src/composables/useState';
+import { useArrayData } from 'src/composables/useArrayData';
 import axios from 'axios';
 
 const { t } = useI18n();
@@ -37,6 +38,33 @@ const warehouseFk = ref(null);
 const _showWhatsBeforeInventory = ref(false);
 const inventoriedDate = ref(null);
 
+const originTypeMap = {
+    entry: {
+        descriptor: EntryDescriptorProxy,
+        icon: 'vn:entry',
+        color: 'green',
+    },
+    ticket: {
+        descriptor: TicketDescriptorProxy,
+        icon: 'vn:ticket',
+        color: 'red',
+    },
+    order: {
+        descriptor: OrderDescriptorProxy,
+        icon: 'vn:basket',
+        color: 'yellow',
+    },
+};
+
+const entityTypeMap = {
+    client: {
+        descriptor: CustomerDescriptorProxy,
+    },
+    supplier: {
+        descriptor: SupplierDescriptorProxy,
+    },
+};
+
 const columns = computed(() => [
     {
         name: 'claim',
@@ -105,6 +133,28 @@ const showWhatsBeforeInventory = computed({
     },
 });
 
+onMounted(async () => {
+    today.value.setHours(0, 0, 0, 0);
+    if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
+    else if (user.value) warehouseFk.value = user.value.warehouseFk;
+    itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
+    const { data } = await axios.get('Configs/findOne');
+    inventoriedDate.value = data.inventoried;
+    await fetchItemBalances();
+    await scrollToToday();
+    await updateWarehouse(warehouseFk.value);
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+
+watch(
+    () => router.currentRoute.value.params.id,
+    (newId) => {
+        itemsBalanceFilter.where.itemFk = newId;
+        itemBalancesRef.value.fetch();
+    }
+);
+
 const fetchItemBalances = async () => await itemBalancesRef.value.fetch();
 
 const getBadgeAttrs = (_date) => {
@@ -131,53 +181,15 @@ const formatDateForAttribute = (dateValue) => {
     return dateValue;
 };
 
-const originTypeMap = {
+async function updateWarehouse(warehouseFk) {
-    entry: {
+    const stock = useArrayData('descriptorStock', {
-        descriptor: EntryDescriptorProxy,
+        userParams: {
-        icon: 'vn:entry',
+            warehouseFk,
-        color: 'green',
         },
-    ticket: {
+    });
-        descriptor: TicketDescriptorProxy,
+    await stock.fetch({});
-        icon: 'vn:ticket',
+    stock.store.data.itemFk = route.params.id;
-        color: 'red',
+}
-    },
-    order: {
-        descriptor: OrderDescriptorProxy,
-        icon: 'vn:basket',
-        color: 'yellow',
-    },
-};
-
-const entityTypeMap = {
-    client: {
-        descriptor: CustomerDescriptorProxy,
-    },
-    supplier: {
-        descriptor: SupplierDescriptorProxy,
-    },
-};
-
-onMounted(async () => {
-    today.value.setHours(0, 0, 0, 0);
-    if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
-    else if (user.value) warehouseFk.value = user.value.warehouseFk;
-    itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
-    const { data } = await axios.get('Configs/findOne');
-    inventoriedDate.value = data.inventoried;
-    await fetchItemBalances();
-    await scrollToToday();
-});
-
-onUnmounted(() => (stateStore.rightDrawer = false));
-
-watch(
-    () => router.currentRoute.value.params.id,
-    (newId) => {
-        itemsBalanceFilter.where.itemFk = newId;
-        itemBalancesRef.value.fetch();
-    }
-);
 </script>
 
 <template>
@@ -193,8 +205,9 @@ watch(
         auto-load
         @on-fetch="(data) => (warehousesOptions = data)"
     />
-    <QToolbar class="justify-end">
+    <template v-if="stateStore.isHeaderMounted()">
-        <div id="st-data" class="row">
+        <Teleport to="#st-data">
+            <div class="row">
                 <VnSelect
                     :label="t('itemDiary.warehouse')"
                     :options="warehousesOptions"
@@ -203,7 +216,9 @@ watch(
                     option-value="id"
                     dense
                     v-model="itemsBalanceFilter.where.warehouseFk"
-                @update:model-value="fetchItemBalances"
+                    @update:model-value="
+                        (value) => fetchItemBalances() && updateWarehouse(value)
+                    "
                     class="q-mr-lg"
                 />
                 <QCheckbox
@@ -220,9 +235,9 @@ watch(
                     @update:model-value="fetchItemBalances"
                 />
             </div>
-        <QSpace />
+        </Teleport>
-        <div id="st-actions"></div>
+        <Teleport to="#st-actions"> </Teleport>
-    </QToolbar>
+    </template>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="itemBalances"

src/pages/Item/Card/ItemSummary.vue

@@ -119,7 +119,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
                 <VnLv
                     v-for="(tag, index) in tags"
                     :key="index"
-                    :label="`${tag.priority} ${tag.tag.name}`"
+                    :label="`${tag.priority} ${tag.tag.name}:`"
                     :value="tag.value"
                 />
             </QCard>
@@ -135,7 +135,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
                 <VnLv
                     v-for="(tax, index) in item.taxes"
                     :key="index"
-                    :label="tax.country.country"
+                    :label="tax.country.name"
                     :value="tax.taxClass.description"
                 />
             </QCard>
@@ -155,7 +155,8 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
                     :url="getUrl(entityId, 'barcode')"
                     :text="t('item.summary.barcode')"
                 />
-                <p
+                <div
+                    class="text-bold"
                     v-for="(barcode, index) in item.itemBarcode"
                     :key="index"
                     v-text="barcode.code"

src/pages/Item/Card/ItemTax.vue

@@ -22,7 +22,7 @@ const taxesFilter = {
         {
             relation: 'country',
             scope: {
-                fields: ['country'],
+                fields: ['name'],
             },
         },
     ],
@@ -73,7 +73,7 @@ const submitTaxes = async (data) => {
                 >
                     <VnInput
                         :label="t('tax.country')"
-                        v-model="row.country.country"
+                        v-model="row.country.name"
                         disable
                     />
                     <VnSelect

src/pages/Item/ItemList.vue

@@ -1,584 +1,369 @@
 <script setup>
-import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
-
-import FetchData from 'components/FetchData.vue';
-import FetchedTags from 'components/ui/FetchedTags.vue';
-import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import ItemSummary from '../Item/Card/ItemSummary.vue';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import ItemListFilter from './ItemListFilter.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-import { toDateFormat } from 'src/filters/date.js';
-import { dashIfEmpty } from 'src/filters';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useVnConfirm } from 'composables/useVnConfirm';
-import axios from 'axios';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import { toDate } from 'src/filters';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import ItemSummary from '../Item/Card/ItemSummary.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
+import { cloneItem } from 'src/pages/Item/composables/cloneItem';
 
-const router = useRouter();
+const entityId = computed(() => route.params.id);
-const stateStore = useStateStore();
+const { openCloneDialog } = cloneItem();
-const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const { openConfirmationModal } = useVnConfirm();
+const { t } = useI18n();
+const tableRef = ref();
+const route = useRoute();
 
-const paginateRef = ref(null);
+const itemFilter = {
-const itemTypesOptions = ref([]);
+    include: [
-const originsOptions = ref([]);
+        {
-const buyersOptions = ref([]);
+            relation: 'itemType',
-const intrastatOptions = ref([]);
+            scope: {
-const itemCategoriesOptions = ref([]);
+                fields: ['id', 'name'],
-const visibleColumns = ref([]);
+            },
-const allColumnNames = ref([]);
+        },
-
+        {
-const exprBuilder = (param, value) => {
+            relation: 'intrastat',
-    switch (param) {
+            scope: {
-        case 'category':
+                fields: ['id', 'description'],
-            return { 'ic.name': value };
+            },
-        case 'buyerFk':
+        },
-            return { 'it.workerFk': value };
+        {
-        case 'grouping':
+            relation: 'origin',
-            return { 'b.grouping': value };
+            scope: {
-        case 'packing':
+                fields: ['id', 'name'],
-            return { 'b.packing': value };
+            },
-        case 'origin':
+        },
-            return { 'ori.code': value };
+        {
-        case 'typeFk':
+            relation: 'production',
-            return { 'i.typeFk': value };
+            scope: {
-        case 'intrastat':
+                fields: ['id', 'name'],
-            return { 'intr.description': value };
+            },
-        case 'name':
+        },
-            return { 'i.name': { like: `%${value}%` } };
+    ],
-        case 'producer':
-            return { 'pr.name': { like: `%${value}%` } };
-        case 'id':
-        case 'size':
-        case 'subname':
-        case 'isActive':
-        case 'weightByPiece':
-        case 'stemMultiplier':
-        case 'stems':
-            return { [`i.${param}`]: value };
-    }
 };
-
-const params = reactive({ isFloramondo: false, isActive: true });
-
-const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        params[paramKey] = col.columnFilter.filterValue;
-        await paginateRef.value.addFilter(null, params);
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
-
 const columns = computed(() => [
     {
         label: '',
-        name: 'picture',
+        name: 'image',
         align: 'left',
-        columnFilter: null,
+        columnField: {
+            component: VnImg,
+            attrs: ({ row }) => {
+                return {
+                    id: row?.id,
+                    zoomResolution: '1600x900',
+                    zoom: true,
+                    class: 'rounded',
+                };
+            },
+        },
+        columnFilter: false,
+        cardVisible: true,
     },
     {
         label: t('item.list.id'),
         name: 'id',
-        field: 'id',
         align: 'left',
-        sortable: true,
+        isId: true,
-        columnFilter: {
+        chip: {
-            component: VnInput,
+            condition: () => true,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
         },
+        cardVisible: true,
     },
     {
         label: t('item.list.grouping'),
-        field: 'grouping',
         name: 'grouping',
         align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnInput,
+            component: 'number',
-            type: 'text',
+            inWhere: true,
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
         },
     },
-        format: (val) => dashIfEmpty(val),
-    },
     {
         label: t('item.list.packing'),
-        field: 'packing',
         name: 'packing',
         align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnInput,
+            component: 'number',
-            type: 'text',
+            inWhere: true,
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
         },
     },
-        format: (val) => dashIfEmpty(val),
-    },
     {
         label: t('globals.description'),
-        field: 'name',
         name: 'description',
         align: 'left',
-        sortable: true,
+        create: true,
         columnFilter: {
-            component: VnInput,
+            name: 'search',
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
         },
+        cardVisible: true,
     },
     {
         label: t('item.list.stems'),
-        field: 'stems',
         name: 'stems',
         align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnInput,
+            component: 'number',
-            type: 'text',
+            inWhere: true,
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
         },
+        cardVisible: true,
     },
     {
         label: t('item.list.size'),
-        field: 'size',
         name: 'size',
         align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnInput,
+            component: 'number',
-            type: 'text',
+            inWhere: true,
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
         },
+        cardVisible: true,
     },
     {
         label: t('item.list.typeName'),
-        field: 'typeName',
+        name: 'typeFk',
-        name: 'typeName',
         align: 'left',
-        sortable: true,
+        component: 'select',
-        columnFilter: {
-            component: VnSelect,
-            filterParamKey: 'typeFk',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
         attrs: {
-                options: itemTypesOptions.value,
+            url: 'ItemTypes',
-                'option-value': 'id',
+            fields: ['id', 'name'],
-                'option-label': 'name',
+        },
-                dense: true,
+        columnFilter: {
+            name: 'typeFk',
+            attrs: {
+                url: 'ItemTypes',
+                fields: ['id', 'name'],
             },
         },
+        columnField: {
+            component: null,
+        },
+        create: true,
     },
-
     {
         label: t('item.list.category'),
-        field: 'category',
         name: 'category',
         align: 'left',
-        sortable: true,
+        component: 'select',
         columnFilter: {
-            component: VnSelect,
+            name: 'categoryFk',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
             attrs: {
-                options: itemCategoriesOptions.value,
+                url: 'ItemCategories',
-                'option-value': 'name',
+                fields: ['id', 'name'],
-                'option-label': 'name',
-                dense: true,
             },
         },
+        columnField: {
+            component: null,
+        },
     },
-
     {
         label: t('item.list.intrastat'),
-        field: 'intrastat',
         name: 'intrastat',
         align: 'left',
-        sortable: true,
+        component: 'select',
         columnFilter: {
-            component: VnSelect,
+            name: 'intrastat',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
             attrs: {
-                options: intrastatOptions.value,
+                url: 'Intrastats',
-                'option-value': 'description',
+                optionValue: 'description',
-                'option-label': 'description',
+                optionLabel: 'description',
-                dense: true,
             },
         },
+        columnField: {
+            component: null,
+        },
+        create: true,
+        cardVisible: true,
     },
     {
         label: t('item.list.origin'),
-        field: 'origin',
         name: 'origin',
         align: 'left',
-        sortable: true,
+        component: 'select',
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
         attrs: {
-                options: originsOptions.value,
+            url: 'Origins',
-                'option-value': 'code',
+            optionValue: 'id',
-                'option-label': 'code',
+            optionLabel: 'code',
-                dense: true,
         },
+        columnFilter: {
+            name: 'id',
+            attrs: {
+                url: 'Origins',
+                optionValue: 'id',
+                optionLabel: 'code',
             },
+            inWhere: true,
+            alias: 'ori',
+        },
+        columnField: {
+            component: null,
+        },
+        create: true,
+        cardVisible: true,
     },
     {
         label: t('item.list.userName'),
-        field: 'userName',
         name: 'userName',
         align: 'left',
-        sortable: true,
+        component: 'select',
         columnFilter: {
-            component: VnSelect,
+            name: 'workerFk',
-            filterParamKey: 'buyerFk',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
             attrs: {
-                options: buyersOptions.value,
+                url: 'VnUsers/preview',
-                'option-value': 'id',
+                optionValue: 'id',
-                'option-label': 'nickname',
+                optionLabel: 'nickname',
-                dense: true,
             },
         },
+
+        columnField: {
+            component: null,
+        },
     },
     {
         label: t('item.list.weightByPiece'),
-        field: 'weightByPiece',
         name: 'weightByPiece',
         align: 'left',
-        sortable: true,
+        component: 'input',
+        columnField: {
+            component: null,
+        },
         columnFilter: {
-            component: VnInput,
+            inWhere: true,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
         },
     },
-        format: (val) => dashIfEmpty(val),
-    },
     {
         label: t('item.list.stemMultiplier'),
-        field: 'stemMultiplier',
         name: 'stemMultiplier',
         align: 'left',
-        sortable: true,
+        component: 'input',
+        columnField: {
+            component: null,
+        },
         columnFilter: {
-            component: VnInput,
+            inWhere: true,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
         },
     },
-        format: (val) => dashIfEmpty(val),
-    },
     {
         label: t('item.list.isActive'),
-        field: 'isActive',
         name: 'isActive',
-        align: 'left',
+        align: 'center',
-        sortable: true,
+        component: 'checkbox',
-        columnFilter: null,
     },
     {
         label: t('item.list.producer'),
-        field: 'producer',
         name: 'producer',
         align: 'left',
-        sortable: true,
+        component: 'select',
         columnFilter: {
-            component: VnInput,
+            name: 'producerFk',
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
             attrs: {
-                dense: true,
+                url: 'Producers',
+                optionValue: 'id',
+                optionLabel: 'name',
             },
         },
-        format: (val) => dashIfEmpty(val),
+        columnField: {
+            component: null,
+        },
     },
     {
         label: t('item.list.landed'),
-        field: 'landed',
         name: 'landed',
         align: 'left',
-        sortable: true,
+        component: 'date',
-        format: (val) => dashIfEmpty(toDateFormat(val)),
+        columnField: {
-        columnFilter: null,
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landed)),
     },
     {
+        align: 'right',
         label: '',
-        name: 'actions',
+        name: 'tableActions',
-        align: 'left',
+        actions: [
-        columnFilter: null,
+            {
+                title: t('globals.clone'),
+
+                icon: 'vn:clone',
+                action: openCloneDialog,
+                isPrimary: true,
+            },
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ItemSummary),
+                isPrimary: true,
+            },
+        ],
     },
 ]);
-
-const redirectToItemCreate = () => {
-    router.push({ name: 'ItemCreate' });
-};
-
-const redirectToItemSummary = (id) => {
-    router.push({ name: 'ItemSummary', params: { id } });
-};
-
-const cloneItem = async (itemFk) => {
-    try {
-        const { data } = await axios.post(`Items/${itemFk}/clone`);
-        if (!data) return;
-        router.push({ name: 'ItemTags', params: { id: data.id } });
-    } catch (err) {
-        console.error('Error cloning item', err);
-    }
-};
-
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-    const filteredColumns = columns.value.filter(
-        (col) => col.name !== 'picture' && col.name !== 'actions'
-    );
-    allColumnNames.value = filteredColumns.map((col) => col.name);
-});
-
-onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <FetchData
+    <VnSearchbar
-        url="ItemTypes"
+        data-key="ItemList"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        :label="t('item.searchbar.label')"
-        auto-load
+        :info="t('You can search by id')"
-        @on-fetch="(data) => (itemTypesOptions = data)"
     />
-    <FetchData
+    <VnTable
-        url="ItemCategories"
+        ref="tableRef"
-        :filter="{ fields: ['name'], order: 'name ASC' }"
-        auto-load
-        @on-fetch="(data) => (itemCategoriesOptions = data)"
-    />
-    <FetchData
-        url="Intrastats"
-        :filter="{ fields: ['description'], order: 'description ASC' }"
-        auto-load
-        @on-fetch="(data) => (intrastatOptions = data)"
-    />
-    <FetchData
-        url="Origins"
-        :filter="{ fields: ['code'], order: 'code ASC' }"
-        auto-load
-        @on-fetch="(data) => (originsOptions = data)"
-    />
-    <FetchData
-        url="TicketRequests/getItemTypeWorker"
-        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
-        auto-load
-        @on-fetch="(data) => (buyersOptions = data)"
-    />
-    <VnSubToolbar>
-        <template #st-data>
-            <TableVisibleColumns
-                :all-columns="allColumnNames"
-                table-code="itemsIndex"
-                labels-traductions-path="item.list"
-                @on-config-saved="visibleColumns = ['picture', ...$event, 'actions']"
-            />
-        </template>
-    </VnSubToolbar>
-    <RightMenu>
-        <template #right-panel>
-            <ItemListFilter data-key="ItemList" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <VnPaginate
-            ref="paginateRef"
         data-key="ItemList"
         url="Items/filter"
+        url-create="Items"
+        :create="{
+            urlCreate: 'Items',
+            title: t('Create Item'),
+            onDataSaved: () => tableRef.redirect(),
+            formInitialData: {
+                editorFk: entityId,
+            },
+        }"
         :order="['isActive DESC', 'name', 'id']"
-            :limit="12"
-            :expr-builder="exprBuilder"
-            :user-params="params"
-            :keep-opts="['userParams']"
-            :offset="50"
-            auto-load
-        >
-            <template #body="{ rows }">
-                <QTable
-                    :rows="rows"
         :columns="columns"
-                    row-key="id"
+        auto-load
-                    :pagination="{ rowsPerPage: 0 }"
+        redirect="Item"
-                    class="full-width q-mt-md"
+        :is-editable="false"
-                    :visible-columns="visibleColumns"
+        :filer="itemFilter"
-                    :no-data-label="t('globals.noResults')"
-                    @row-click="(_, row) => redirectToItemSummary(row.id)"
     >
-                    <template #top-row="{ cols }">
+        <template #column-id="{ row }">
-                        <QTr>
+            <span class="link" @click.stop>
-                            <QTd
-                                v-for="(col, index) in cols"
-                                :key="index"
-                                style="max-width: 100px"
-                            >
-                                <component
-                                    :is="col.columnFilter.component"
-                                    v-if="col.columnFilter"
-                                    v-model="col.columnFilter.filterValue"
-                                    v-bind="col.columnFilter.attrs"
-                                    v-on="col.columnFilter.event(col)"
-                                    dense
-                                />
-                            </QTd>
-                        </QTr>
-                    </template>
-                    <template #body-cell-picture="{ row }">
-                        <QTd>
-                            <VnImg
-                                size="50x50"
-                                zoom-resolution="1600x900"
-                                :id="row.id"
-                                class="image"
-                            />
-                        </QTd>
-                    </template>
-                    <template #body-cell-id="{ row }">
-                        <QTd @click.stop>
-                            <QBtn flat color="primary">
                 {{ row.id }}
-                            </QBtn>
                 <ItemDescriptorProxy :id="row.id" />
-                        </QTd>
+            </span>
         </template>
-                    <template #body-cell-userName="{ row }">
+        <template #column-userName="{ row }">
-                        <QTd @click.stop>
+            <span class="link" @click.stop>
-                            <QBtn flat color="primary" dense>
                 {{ row.userName }}
-                            </QBtn>
+                <WorkerDescriptorProxy :id="row.workerFk" />
-                            <WorkerDescriptorProxy :id="row.buyerFk" />
+            </span>
-                        </QTd>
         </template>
-                    <template #body-cell-description="{ row }">
+        <template #column-description="{ row }">
-                        <QTd class="col">
+            <div class="row column full-width justify-between items-start">
-                            <span>{{ row.name }} {{ row.subName }}</span>
+                {{ row?.name }}
-                            <FetchedTags :item="row" />
+                <div v-if="row?.subName" class="subName">
-                        </QTd>
+                    {{ row?.subName.toUpperCase() }}
+                </div>
+            </div>
+            <FetchedTags :item="row" :max-length="6" />
         </template>
-                    <template #body-cell-isActive="{ row }">
+    </VnTable>
-                        <QTd>
-                            <QCheckbox :model-value="!!row.isActive" disable />
-                        </QTd>
-                    </template>
-                    <template #body-cell-actions="{ row }">
-                        <QTd>
-                            <QIcon
-                                @click.stop="
-                                    openConfirmationModal(
-                                        t(`All it's properties will be copied`),
-                                        t('Do you want to clone this item?'),
-                                        () => cloneItem(row.id)
-                                    )
-                                "
-                                class="q-ml-sm"
-                                color="primary"
-                                name="vn:clone"
-                                size="sm"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.clone') }}
-                                </QTooltip>
-                            </QIcon>
-                            <QIcon
-                                @click.stop="viewSummary(row.id, ItemSummary)"
-                                class="q-ml-md"
-                                color="primary"
-                                name="preview"
-                                size="sm"
-                            >
-                                <QTooltip class="text-no-wrap">
-                                    {{ t('Preview') }}
-                                </QTooltip>
-                            </QIcon>
-                        </QTd>
-                    </template>
-                </QTable>
-            </template>
-        </VnPaginate>
-
-        <QPageSticky :offset="[20, 20]">
-            <QBtn
-                @click="redirectToItemCreate()"
-                color="primary"
-                fab
-                icon="add"
-                shortcut="+"
-            />
-            <QTooltip class="text-no-wrap">
-                {{ t('New item') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
 </template>
 
+<style lang="scss" scoped>
+.subName {
+    text-transform: uppercase;
+    color: var(--vn-label-color);
+}
+</style>
 <i18n>
 es:
     New item: Nuevo artículo
-    All it's properties will be copied: Todas sus propiedades serán copiadas
-    Do you want to clone this item?: ¿Desea clonar este artículo?
     Preview: Vista previa
+    Regularize stock: Regularizar stock
 </i18n>

src/pages/Item/ItemRequest.vue

@@ -1,23 +1,17 @@
 <script setup>
-import { ref, computed, onMounted, onBeforeMount, watch } from 'vue';
+import { ref, computed, onMounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import ItemRequestDenyForm from './ItemRequestDenyForm.vue';
-import ItemRequestFilter from './ItemRequestFilter.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSelect from 'components/common/VnSelect.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
-import { toDateFormat } from 'src/filters/date';
+import { dashIfEmpty, toCurrency } from 'filters/index';
-import { toCurrency } from 'filters/index';
 import useNotify from 'src/composables/useNotify.js';
-import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
 import axios from 'axios';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import ItemRequestDenyForm from './ItemRequestDenyForm.vue';
-
+import { toDate } from 'src/filters';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 const { t } = useI18n();
 const { notify } = useNotify();
 const stateStore = useStateStore();
@@ -33,6 +27,12 @@ const arrayData = useArrayData('ItemRequests', {
 });
 const store = arrayData.store;
 
+const userParams = {
+    state: 'pending',
+    daysOnward: 7,
+};
+
+const tableRef = ref();
 watch(
     () => store.data,
     (value) => (itemRequestsOptions.value = value)
@@ -41,89 +41,137 @@ watch(
 const columns = computed(() => [
     {
         label: t('item.buyRequest.ticketId'),
-        name: 'id',
+        name: 'ticketFk',
-        field: 'id',
         align: 'left',
-        sortable: true,
+        isId: true,
+        chip: {
+            condition: () => true,
+        },
+        cardVisible: true,
     },
     {
         label: t('item.buyRequest.shipped'),
-        field: 'shipped',
         name: 'shipped',
         align: 'left',
-        sortable: true,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.shipped)),
+        columnClass: 'shrink',
     },
     {
         label: t('globals.description'),
         field: 'description',
         name: 'description',
         align: 'left',
-        sortable: true,
+        columnClass: 'expand',
     },
     {
         label: t('item.buyRequest.requester'),
-        name: 'requester',
+        name: 'requesterName',
-        align: 'left',
+        component: 'select',
-        sortable: true,
+        columnFilter: {
+            name: 'requesterFk',
+            attrs: {
+                url: 'VnUsers/preview',
+                optionValue: 'id',
+                optionLabel: 'nickname',
+            },
+        },
+        columnField: {
+            component: null,
+        },
+        columnClass: 'shrink',
     },
     {
         label: t('item.buyRequest.requested'),
-        field: 'quantity',
+        name: 'quantity',
-        name: 'requested',
+        columnClass: 'shrink',
-        align: 'left',
-        sortable: true,
     },
     {
         label: t('item.buyRequest.price'),
-        field: 'price',
         name: 'price',
         align: 'left',
-        sortable: true,
+        format: (row) => toCurrency(row.price),
-        format: (val) => toCurrency(val),
+        columnClass: 'shrink',
     },
     {
         label: t('item.buyRequest.attender'),
-        field: 'attender',
+        name: 'attenderName',
-        name: 'attender',
         align: 'left',
-        sortable: true,
+        component: 'select',
+        columnFilter: {
+            name: 'attenderFk',
+            attrs: {
+                url: 'VnUsers/preview',
+                optionValue: 'id',
+                optionLabel: 'nickname',
+            },
+        },
+        columnField: {
+            component: null,
+        },
+        columnClass: 'shrink',
     },
     {
         label: t('item.buyRequest.item'),
-        field: 'item',
         name: 'item',
         align: 'left',
-        sortable: true,
+        component: 'input',
+        columnClass: 'expand',
     },
     {
         label: t('item.buyRequest.achieved'),
-        field: 'achieved',
         name: 'achieved',
         align: 'left',
-        sortable: true,
+        component: 'input',
+        columnClass: 'shrink',
     },
     {
         label: t('item.buyRequest.concept'),
-        field: 'concept',
         name: 'concept',
         align: 'left',
         sortable: true,
+        component: 'input',
+        columnClass: 'expand',
     },
     {
         label: t('item.buyRequest.state'),
-        field: 'state',
         name: 'state',
+        format: (row) => getState(row.isOk),
         align: 'left',
-        sortable: true,
     },
     {
-        label: '',
-        name: 'action',
         align: 'left',
-        columnFilter: null,
+        name: 'daysOnward',
+        label: t('travel.travelList.tableVisibleColumns.daysOnward'),
+        visible: false,
+        columnFilter: {
+            inWhere: false,
+        },
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'denyOptions',
     },
 ]);
 
+const getBadgeColor = (date) => {
+    const today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+
+    const orderLanded = new Date(date);
+    orderLanded.setHours(0, 0, 0, 0);
+
+    const difference = today - orderLanded;
+
+    if (difference == 0) return 'warning';
+    if (difference < 0) return 'success';
+    if (difference > 0) return 'alert';
+};
+
 const changeQuantity = async (request) => {
     try {
         if (request.saleFk) {
@@ -153,7 +201,6 @@ const confirmRequest = async (request) => {
                 `TicketRequests/${request.id}/confirm`,
                 params
             );
-
             request.itemDescription = data.concept;
             request.isOk = true;
             notify(t('globals.dataSaved'), 'positive');
@@ -182,127 +229,95 @@ const onDenyAccept = (_, responseData) => {
     itemRequestsOptions.value[denyRequestIndex.value].response = responseData.response;
     denyRequestId.value = null;
     denyRequestIndex.value = null;
+    tableRef.value.reload();
 };
 
 onMounted(async () => {
     await arrayData.fetch({ append: false });
     stateStore.rightDrawer = true;
 });
-
-onBeforeMount(() => {
-    const today = Date.vnNew();
-    today.setHours(0, 0, 0, 0);
-
-    const nextWeek = Date.vnNew();
-    nextWeek.setHours(23, 59, 59, 59);
-    nextWeek.setDate(nextWeek.getDate() + 7);
-
-    filterParams.value = {
-        from: today,
-        to: nextWeek,
-        state: 'pending',
-    };
-});
 </script>
 
 <template>
-    <VnSearchbar
+    <VnTable
-        data-key="ItemRequests"
+        ref="tableRef"
-        url="TicketRequests/filter"
+        data-key="itemRequest"
-        :label="t('globals.search')"
+        url="ticketRequests/filter"
-        :info="t('You can search by Id or alias')"
+        order="shipped ASC, isOk ASC"
-        :redirect="false"
-    />
-    <RightMenu>
-        <template #right-panel>
-            <ItemRequestFilter data-key="ItemRequests" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <QTable
-            :rows="itemRequestsOptions"
         :columns="columns"
-            row-key="id"
+        :user-params="userParams"
-            :pagination="{ rowsPerPage: 0 }"
+        :is-editable="true"
-            class="full-width q-mt-md"
+        auto-load
-            :no-data-label="t('globals.noResults')"
+        :disable-option="{ card: true }"
+        chip-locale="item.params"
     >
-            <template #body-cell-id="{ row }">
+        <template #column-ticketFk="{ row }">
-                <QTd>
+            <span class="link">
-                    <QBtn flat color="primary"> {{ row.ticketFk }}</QBtn>
+                {{ row.ticketFk }}
                 <TicketDescriptorProxy :id="row.ticketFk" />
-                </QTd>
+            </span>
         </template>
-
+        <template #column-shipped="{ row }">
-            <template #body-cell-shipped="{ row }">
             <QTd>
                 <QBadge
-                        v-if="getDateQBadgeColor(row.shipped)"
+                    :color="getBadgeColor(row.shipped)"
-                        :color="getDateQBadgeColor(row.shipped)"
                     text-color="black"
-                        class="q-ma-none"
+                    class="q-pa-sm"
-                        dense
                     style="font-size: 14px"
                 >
-                        {{ toDateFormat(row.shipped) }}
+                    {{ toDate(row.shipped) }}
                 </QBadge>
-                    <span v-else>{{ toDateFormat(row.shipped) }}</span>
             </QTd>
         </template>
-            <template #body-cell-requester="{ row }">
+        <template #column-attenderName="{ row }">
-                <QTd>
+            <span class="link" @click.stop>
-                    <QBtn flat dense color="primary"> {{ row.requesterName }}</QBtn>
+                {{ row.attenderName }}
+                <WorkerDescriptorProxy :id="row.attenderFk" />
+            </span>
+        </template>
+
+        <template #column-requesterName="{ row }">
+            <span class="link" @click.stop>
+                {{ row.requesterName }}
                 <WorkerDescriptorProxy :id="row.requesterFk" />
-                </QTd>
+            </span>
         </template>
-            <template #body-cell-attender="{ row }">
+
-                <QTd>
+        <template #column-item="{ row }">
-                    <VnSelect
+            <span>
-                        v-model="row.attenderFk"
+                <VnInput v-model.number="row.itemFk" dense />
-                        :where="{ role: 'buyer' }"
+            </span>
-                        sort-by="id"
-                        url="Workers"
-                        hide-selected
-                        option-label="firstName"
-                        option-value="id"
-                        dense
-                    />
-                </QTd>
         </template>
-            <template #body-cell-item="{ row }">
+        <template #column-achieved="{ row }">
-                <QTd>
+            <span>
                 <VnInput
-                        v-model.number="row.itemFk"
                     type="number"
-                        :disable="row.isOk != null"
-                        dense
-                    />
-                </QTd>
-            </template>
-            <template #body-cell-achieved="{ row }">
-                <QTd>
-                    <VnInput
                     v-model.number="row.saleQuantity"
-                        @blur="changeQuantity(row)"
-                        type="number"
                     :disable="!row.itemFk || row.isOk != null"
+                    @blur="changeQuantity(row)"
+                    @keyup.enter="changeQuantity(row)"
                     dense
                 />
-                </QTd>
+            </span>
         </template>
-            <template #body-cell-concept="{ row }">
+        <template #column-concept="{ row }">
-                <QTd>
+            <span @click.stop disabled="row.isOk != null">
-                    <QBtn flat dense color="primary"> {{ row.itemDescription }}</QBtn>
+                {{ row.itemDescription }}
-                    <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
-                </QTd>
         </template>
-            <template #body-cell-state="{ row }">
+        <template #moreFilterPanel="{ params }">
-                <QTd>
+            <VnInputNumber
-                    <span>{{ getState(row.isOk) }}</span>
+                :label="t('params.scopeDays')"
-                </QTd>
+                v-model.number="params.scopeDays"
+                @keyup.enter="(evt) => handleScopeDays(evt.target.value)"
+                @remove="handleScopeDays()"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
         </template>
-            <template #body-cell-action="{ row, rowIndex }">
+        <template #column-denyOptions="{ row, rowIndex }">
-                <QTd>
+            <QTd class="sticky no-padding">
                 <QIcon
                     v-if="row.response?.length"
                     name="insert_drive_file"
@@ -327,14 +342,10 @@ onBeforeMount(() => {
                 </QIcon>
             </QTd>
         </template>
-        </QTable>
+    </VnTable>
     <QDialog ref="denyFormRef" transition-show="scale" transition-hide="scale">
-            <ItemRequestDenyForm
+        <ItemRequestDenyForm :request-id="denyRequestId" @on-data-saved="onDenyAccept" />
-                :request-id="denyRequestId"
-                @on-data-saved="onDenyAccept"
-            />
     </QDialog>
-    </QPage>
 </template>
 
 <i18n>

src/pages/Item/ItemRequestDenyForm.vue

@@ -10,6 +10,7 @@ defineProps({
     requestId: {
         type: Number,
         default: null,
+        required: true,
     },
 });
 
@@ -43,6 +44,7 @@ onMounted(async () => {
                         type="textarea"
                         v-model="data.observation"
                         fill-input
+                        :required="true"
                         autogrow
                     />
                 </div>

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/ItemType/Card/ItemTypeBasicData.vue

@@ -8,12 +8,14 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnAvatar from 'src/components/ui/VnAvatar.vue';
 
 const route = useRoute();
 const { t } = useI18n();
 
 const categoriesOptions = ref([]);
 const temperaturesOptions = ref([]);
+const itemPackingTypesOptions = ref([]);
 </script>
 <template>
     <FetchData
@@ -28,6 +30,16 @@ const temperaturesOptions = ref([]);
         :filter="{ order: 'name ASC', fields: ['code', 'name'] }"
         auto-load
     />
+    <FetchData
+        url="ItemPackingTypes"
+        @on-fetch="(data) => (itemPackingTypesOptions = data)"
+        :filter="{
+            where: { isActive: true },
+            order: 'description ASC',
+            fields: ['code', 'description'],
+        }"
+        auto-load
+    />
     <FormModel
         :url="`ItemTypes/${route.params.id}`"
         :url-update="`ItemTypes/${route.params.id}`"
@@ -41,15 +53,34 @@ const temperaturesOptions = ref([]);
             </VnRow>
             <VnRow>
                 <VnSelect
+                    url="Workers/search"
                     v-model="data.workerFk"
                     :label="t('shared.worker')"
-                    url="Workers"
+                    sort-by="nickname ASC"
-                    sort-by="firstName ASC"
+                    :fields="['id', 'nickname']"
-                    :fields="['id', 'firstName']"
+                    option-label="nickname"
                     option-value="id"
-                    option-label="firstName"
                     hide-selected
+                >
+                    <template #prepend>
+                        <VnAvatar
+                            :worker-id="data.workerFk"
+                            color="primary"
+                            :title="title"
                         />
+                    </template>
+                    <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')"
@@ -68,6 +99,21 @@ const temperaturesOptions = ref([]);
                     option-label="name"
                     hide-selected
                 />
+                <VnInput v-model="data.life" :label="t('shared.life')" />
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    v-model="data.itemPackingTypeFk"
+                    :label="t('shared.itemPackingType')"
+                    :options="itemPackingTypesOptions"
+                    option-value="code"
+                    option-label="description"
+                    hide-selected
+                />
+                <VnInput v-model="data.maxRefs" :label="t('shared.maxRefs')" />
+            </VnRow>
+            <VnRow>
+                <QCheckbox v-model="data.isFragile" :label="t('shared.fragile')" />
             </VnRow>
         </template>
     </FormModel>

src/pages/Item/ItemType/Card/ItemTypeCard.vue

@@ -1,7 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
-import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
+import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
-import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
+import ItemTypeFilter from 'src/pages/Item/ItemType/ItemTypeFilter.vue';
 import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 </script>
 <template>

src/pages/Item/ItemType/Card/ItemTypeLog.vue

@@ -0,0 +1,7 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+
+<template>
+    <VnLog model="ItemType" url="/ItemTypeLogs"></VnLog>
+</template>

src/pages/Item/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/Item/ItemType/ItemTypeFilter.vue

@@ -12,6 +12,39 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['search']);
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        or: [
+                            {
+                                name: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                            {
+                                code: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                        ],
+                    };
+                }
+            }
+    }
+};
 </script>
 
 <template>
@@ -19,6 +52,8 @@ const emit = defineEmits(['search']);
         :data-key="props.dataKey"
         :search-button="true"
         @search="emit('search')"
+        search-url="table"
+        :expr-builder="exprBuilder"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">

src/pages/Item/ItemType/ItemTypeSearchbar.vue

@@ -10,6 +10,7 @@ const { t } = useI18n();
         url="ItemTypes"
         :label="t('Search item type')"
         :info="t('Search itemType by id, name or code')"
+        search-url="table"
     />
 </template>
 <i18n>

src/pages/Item/ItemType/locale/en.yml

@@ -4,6 +4,10 @@ shared:
     worker: Worker
     category: Category
     temperature: Temperature
+    life: Life
+    itemPackingType: Item packing type
+    maxRefs: Maximum references
+    fragile: Fragile
 summary:
     id: id
     life: Life

src/pages/Item/ItemType/locale/es.yml

@@ -4,6 +4,10 @@ shared:
     worker: Trabajador
     category: Reino
     temperature: Temperatura
+    life: Vida
+    itemPackingType: Tipo de embalaje
+    maxRefs: Referencias máximas
+    fragile: Frágil
 summary:
     id: id
     code: Código

src/pages/Item/ItemTypeCreate.vue

@@ -1,86 +0,0 @@
-<script setup>
-import { reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-const { t } = useI18n();
-const router = useRouter();
-
-const newItemTypeForm = reactive({});
-
-const categoriesOptions = ref([]);
-const temperaturesOptions = ref([]);
-
-const redirectToItemTypeBasicData = (_, { id }) => {
-    router.push({ name: 'ItemTypeBasicData', params: { id } });
-};
-</script>
-
-<template>
-    <FetchData
-        url="ItemCategories"
-        @on-fetch="(data) => (categoriesOptions = data)"
-        :filter="{ order: 'name ASC', fields: ['id', 'name'] }"
-        auto-load
-    />
-    <FetchData
-        url="Temperatures"
-        @on-fetch="(data) => (temperaturesOptions = data)"
-        :filter="{ order: 'name ASC', fields: ['code', 'name'] }"
-        auto-load
-    />
-    <QPage>
-        <VnSubToolbar />
-        <FormModel
-            url-create="ItemTypes"
-            model="itemTypeCreate"
-            :form-initial-data="newItemTypeForm"
-            observe-form-changes
-            @on-data-saved="redirectToItemTypeBasicData"
-        >
-            <template #form="{ data }">
-                <VnRow>
-                    <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
-                    <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        v-model="data.workerFk"
-                        :label="t('itemType.shared.worker')"
-                        url="Workers"
-                        sort-by="firstName ASC"
-                        :fields="['id', 'firstName']"
-                        option-value="id"
-                        option-label="firstName"
-                        hide-selected
-                    />
-                    <VnSelect
-                        v-model="data.categoryFk"
-                        :label="t('itemType.shared.category')"
-                        :options="categoriesOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        v-model="data.temperatureFk"
-                        :label="t('itemType.shared.temperature')"
-                        :options="temperaturesOptions"
-                        option-value="code"
-                        option-label="name"
-                        hide-selected
-                    />
-                </VnRow>
-            </template>
-        </FormModel>
-    </QPage>
-</template>

src/pages/Item/ItemTypeList.vue

@@ -1,113 +1,159 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
+import { ref, computed } from 'vue';
-
+import ItemTypeSearchbar from 'src/pages/Item/ItemType/ItemTypeSearchbar.vue';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
+import FetchData from 'components/FetchData.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
-import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
-import ItemTypeSearchbar from '../ItemType/ItemTypeSearchbar.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import ItemTypeFilter from './ItemType/ItemTypeFilter.vue';
 
-const router = useRouter();
 const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
+const tableRef = ref();
+const itemCategoriesOptions = ref([]);
+const temperatureOptions = ref([]);
 
-const redirectToItemTypeSummary = (id) => {
+const columns = computed(() => [
-    router.push({ name: 'ItemTypeSummary', params: { id } });
-};
-
-const redirectToCreateView = () => {
-    router.push({ name: 'ItemTypeCreate' });
-};
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return {
-                name: { like: `%${value}%` },
-            };
-        case 'code':
-            return {
-                code: { like: `%${value}%` },
-            };
-        case 'search':
-            if (value) {
-                if (!isNaN(value)) {
-                    return { id: value };
-                } else {
-                    return {
-                        or: [
     {
-                                name: {
+        align: 'left',
-                                    like: `%${value}%`,
+        name: 'id',
+        label: t('id'),
+        isId: true,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'code',
+        label: t('code'),
+        isTitle: true,
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('name'),
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('worker'),
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'Workers/search',
+            optionLabel: 'nickname',
+            optionValue: 'id',
+        },
+        cardVisible: true,
+        visible: true,
+        columnField: {
+            component: 'userLink',
+            attrs: ({ row }) => {
+                return {
+                    workerId: row?.worker?.id,
+                    name: row.worker?.user?.name,
+                    defaultName: true,
+                };
+            },
+        },
+        columnFilter: {
+            name: 'workerFk',
         },
     },
     {
-                                code: {
+        align: 'left',
-                                    like: `%${value}%`,
+        name: 'categoryFk',
+        label: t('ItemCategory'),
+        create: true,
+        component: 'select',
+        attrs: {
+            options: itemCategoriesOptions.value,
         },
+        cardVisible: false,
+        visible: false,
     },
-                        ],
+    {
-                    };
+        align: 'left',
-                }
+        name: 'Temperature',
-            }
+        label: t('Temperature'),
-    }
+        create: true,
-};
+        component: 'select',
+        attrs: {
+            options: temperatureOptions.value,
+        },
+        cardVisible: false,
+        visible: false,
+    },
+]);
 </script>
 
 <template>
-    <ItemTypeSearchbar />
+    <FetchData
+        url="ItemCategories"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
+        @on-fetch="(data) => (itemCategoriesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Temperatures"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
+        @on-fetch="(data) => (temperatureOptions = data)"
+        auto-load
+    />
     <RightMenu>
         <template #right-panel>
             <ItemTypeFilter data-key="ItemTypeList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
+    <ItemTypeSearchbar />
-        <div class="vn-card-list">
+    <VnTable
-            <VnPaginate
+        ref="tableRef"
         data-key="ItemTypeList"
         url="ItemTypes"
-                :order="['name']"
+        :create="{
+            urlCreate: 'ItemTypes',
+            title: t('Create ItemTypes'),
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {},
+        }"
+        :user-filter="{
+            include: {
+                relation: 'worker',
+                scope: {
+                    fields: ['id'],
+                    include: {
+                        relation: 'user',
+                        scope: {
+                            fields: ['id', 'name'],
+                        },
+                    },
+                },
+            },
+        }"
+        order="name ASC"
+        :columns="columns"
         auto-load
-                :expr-builder="exprBuilder"
+        :right-search="false"
-            >
+        :is-editable="false"
-                <template #body="{ rows }">
+        :use-model="true"
-                    <CardList
+        redirect="item/item-type"
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="row.code"
-                        @click="redirectToItemTypeSummary(row.id)"
-                        :id="row.id"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('Name')" :value="row.name" />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, ItemTypeSummary)"
-                                color="primary"
-                                type="submit"
     />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-    <QPageSticky :offset="[20, 20]">
-        <QBtn
-            fab
-            icon="add"
-            color="primary"
-            @click="redirectToCreateView()"
-            shortcut="+"
-        />
-        <QTooltip>
-            {{ t('New item type') }}
-        </QTooltip>
-    </QPageSticky>
 </template>
+
+<i18n>
+    es:
+        id: Id
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        ItemCategory: Reino
+        Temperature: Temperatura
+        Create ItemTypes: Crear familia
+    en:
+        code: Code
+        name: Name
+        worker: Worker
+        ItemCategory: ItemCategory
+        Temperature: Temperature
+</i18n>

src/pages/Item/composables/cloneItem.js

@@ -0,0 +1,36 @@
+import axios from 'axios';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+
+export function cloneItem() {
+    const { t } = useI18n();
+
+    const quasar = useQuasar();
+    const router = useRouter();
+    const cloneItem = async (entityId) => {
+        const { id } = entityId;
+        try {
+            const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
+            router.push({ name: 'ItemTags', params: { id: data.id } });
+        } catch (err) {
+            console.error('Error cloning item');
+        }
+    };
+
+    const openCloneDialog = async (entityId) => {
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('item.descriptor.clone.title'),
+                    message: t('item.descriptor.clone.subTitle'),
+                },
+            })
+            .onOk(async () => {
+                await cloneItem(entityId);
+            });
+    };
+    return { openCloneDialog };
+}

src/pages/Item/locale/en.yml

@@ -88,3 +88,127 @@ itemType:
         worker: Worker
         category: Category
         temperature: Temperature
+item:
+    params:
+        daysOnward: Days onward
+        search: General search
+        ticketFk: Ticket id
+        attenderFk: Atender
+        clientFk: Client id
+        warehouseFk: Warehouse
+        requesterFk: Salesperson
+        from: From
+        to: To
+        mine: For me
+        state: State
+        myTeam: My team
+    searchbar:
+        label: Search item
+    descriptor:
+        item: Item
+        buyer: Buyer
+        color: Color
+        category: Category
+        stems: Stems
+        visible: Visible
+        available: Available
+        warehouseText: 'Calculated on the warehouse of { warehouseName }'
+        itemDiary: Item diary
+        producer: Producer
+        clone:
+            title: All its properties will be copied
+            subTitle: Do you want to clone this item?
+    list:
+        id: Identifier
+        grouping: Grouping
+        packing: Packing
+        description: Description
+        stems: Stems
+        category: Category
+        typeName: Type
+        intrastat: Intrastat
+        isActive: Active
+        size: Size
+        origin: Origin
+        userName: Buyer
+        weightByPiece: Weight/Piece
+        stemMultiplier: Multiplier
+        producer: Producer
+        landed: Landed
+    basicData:
+        type: Type
+        reference: Reference
+        relevancy: Relevancy
+        stems: Stems
+        multiplier: Multiplier
+        generic: Generic
+        intrastat: Intrastat
+        expense: Expense
+        weightByPiece: Weight/Piece
+        boxUnits: Units/Box
+        recycledPlastic: Recycled Plastic
+        nonRecycledPlastic: Non recycled plastic
+        isActive: Active
+        hasKgPrice: Price in kg
+        isFragile: Fragile
+        isFragileTooltip: Is shown at website, app that this item cannot travel (wreath, palms, ...)
+        isPhotoRequested: Do photo
+        isPhotoRequestedTooltip: This item does need a photo
+        description: Description
+    fixedPrice:
+        itemFk: Item ID
+        groupingPrice: Grouping price
+        packingPrice: Packing price
+        hasMinPrice: Has min price
+        minPrice: Min price
+        started: Started
+        ended: Ended
+        warehouse: Warehouse
+    create:
+        name: Name
+        tag: Tag
+        priority: Priority
+        type: Type
+        intrastat: Intrastat
+        origin: Origin
+    buyRequest:
+        ticketId: 'Ticket ID'
+        shipped: 'Shipped'
+        requester: 'Requester'
+        requested: 'Requested'
+        price: 'Price'
+        attender: 'Attender'
+        item: 'Item'
+        achieved: 'Achieved'
+        concept: 'Concept'
+        state: 'State'
+    summary:
+        basicData: 'Basic data'
+        otherData: 'Other data'
+        description: 'Description'
+        tax: 'Tax'
+        tags: 'Tags'
+        botanical: 'Botanical'
+        barcode: 'Barcode'
+        name: 'Nombre'
+        completeName: 'Nombre completo'
+        family: 'Familia'
+        size: 'Medida'
+        origin: 'Origen'
+        stems: 'Tallos'
+        multiplier: 'Multiplicador'
+        buyer: 'Comprador'
+        doPhoto: 'Do photo'
+        intrastatCode: 'Código intrastat'
+        intrastat: 'Intrastat'
+        ref: 'Referencia'
+        relevance: 'Relevancia'
+        weight: 'Peso (gramos)/tallo'
+        units: 'Unidades/caja'
+        expense: 'Gasto'
+        generic: 'Genérico'
+        recycledPlastic: 'Plástico reciclado'
+        nonRecycledPlastic: 'Plástico no reciclado'
+        minSalesQuantity: 'Cantidad mínima de venta'
+        genus: 'Genus'
+        specie: 'Specie'

src/pages/Item/locale/es.yml

@@ -88,3 +88,129 @@ itemType:
         worker: Trabajador
         category: Reino
         temperature: Temperatura
+params:
+    state: asfsdf
+item:
+    params:
+        daysOnward: Días adelante
+        search: Búsqueda general
+        ticketFk: Id ticket
+        attenderFk: Comprador
+        clientFk: Id cliente
+        warehouseFk: Almacén
+        requesterFk: Comercial
+        from: Desde
+        to: Hasta
+        mine: Para mi
+        state: Estado
+        myTeam: Mi equipo
+    searchbar:
+        label: Buscar artículo
+    descriptor:
+        item: Artículo
+        buyer: Comprador
+        color: Color
+        category: Categoría
+        stems: Tallos
+        visible: Visible
+        available: Disponible
+        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
+        itemDiary: Registro de compra-venta
+        producer: Productor
+        clone:
+            title: Todas sus propiedades serán copiadas
+            subTitle: ¿Desea clonar este artículo?
+    list:
+        id: Identificador
+        grouping: Grouping
+        packing: Packing
+        description: Descripción
+        stems: Tallos
+        category: Reino
+        typeName: Tipo
+        intrastat: Intrastat
+        isActive: Activo
+        size: Medida
+        origin: Origen
+        weightByPiece: Peso (gramos)/tallo
+        userName: Comprador
+        stemMultiplier: Multiplicador
+        producer: Productor
+        landed: F. entrega
+    basicData:
+        type: Tipo
+        reference: Referencia
+        relevancy: Relevancia
+        stems: Tallos
+        multiplier: Multiplicador
+        generic: Genérico
+        intrastat: Intrastat
+        expense: Gasto
+        weightByPiece: Peso (gramos)/tallo
+        boxUnits: Unidades/caja
+        recycledPlastic: Plastico reciclado
+        nonRecycledPlastic: Plático no reciclado
+        isActive: Activo
+        hasKgPrice: Precio en kg
+        isFragile: Frágil
+        isFragileTooltip: Se muestra en la web, app que este artículo no puede viajar (coronas, palmas, ...)
+        isPhotoRequested: Hacer foto
+        isPhotoRequestedTooltip: Este artículo necesita una foto
+        description: Descripción
+    fixedPrice:
+        itemFk: ID Artículo
+        groupingPrice: Precio grouping
+        packingPrice: Precio packing
+        hasMinPrice: Tiene precio mínimo
+        minPrice: Precio min
+        started: Inicio
+        ended: Fin
+        warehouse: Almacén
+    create:
+        name: Nombre
+        tag: Etiqueta
+        priority: Prioridad
+        type: Tipo
+        intrastat: Intrastat
+        origin: Origen
+    summary:
+        basicData: 'Datos básicos'
+        otherData: 'Otros datos'
+        description: 'Descripción'
+        tax: 'IVA'
+        tags: 'Etiquetas'
+        botanical: 'Botánico'
+        barcode: 'Código de barras'
+        name: 'Nombre'
+        completeName: 'Nombre completo'
+        family: 'Familia'
+        size: 'Medida'
+        origin: 'Origen'
+        stems: 'Tallos'
+        multiplier: 'Multiplicador'
+        buyer: 'Comprador'
+        doPhoto: 'Hacer foto'
+        intrastatCode: 'Código intrastat'
+        intrastat: 'Intrastat'
+        ref: 'Referencia'
+        relevance: 'Relevancia'
+        weight: 'Peso (gramos)/tallo'
+        units: 'Unidades/caja'
+        expense: 'Gasto'
+        generic: 'Genérico'
+        recycledPlastic: 'Plástico reciclado'
+        nonRecycledPlastic: 'Plástico no reciclado'
+        minSalesQuantity: 'Cantidad mínima de venta'
+        genus: 'Genus'
+        specie: 'Specie'
+    buyRequest:
+        ticketId: 'ID Ticket'
+        shipped: 'F. envío'
+        requester: 'Solicitante'
+        requested: 'Solicitado'
+        price: 'Precio'
+        attender: 'Comprador'
+        item: 'Artículo'
+        achieved: 'Conseguido'
+        concept: 'Concepto'
+        state: 'Estado'

src/pages/Parking/Card/ParkingCard.vue

@@ -2,17 +2,11 @@
 import VnCard from 'components/common/VnCard.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
 import ParkingFilter from 'pages/Parking/ParkingFilter.vue';
-
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
 </script>
 <template>
     <VnCard
         data-key="Parking"
         base-url="Parkings"
-        :filter="filter"
         :descriptor="ParkingDescriptor"
         :filter-panel="ParkingFilter"
         search-data-key="ParkingList"

src/pages/Parking/Card/ParkingDescriptor.vue

@@ -29,6 +29,7 @@ const filter = {
         :url="`Parkings/${entityId}`"
         title="code"
         :filter="filter"
+        :to-module="{ name: 'ParkingList' }"
     >
         <template #body="{ entity }">
             <VnLv :label="t('globals.code')" :value="entity.code" />

src/pages/Parking/ParkingList.vue

@@ -22,7 +22,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 
 function exprBuilder(param, value) {
@@ -55,10 +54,9 @@ function exprBuilder(param, value) {
             <VnPaginate
                 data-key="ParkingList"
                 url="Parkings"
-                :filter="filter"
+                :user-filter="filter"
                 :expr-builder="exprBuilder"
                 :limit="20"
-                auto-load
                 order="code"
             >
                 <template #body="{ rows }">

src/pages/Route/RouteAutonomous.vue

@@ -126,7 +126,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('Preview'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 isPrimary: true,
                 action: (row) => viewSummary(row?.routeFk, RouteSummary),

src/pages/Route/RouteExtendedList.vue

@@ -204,7 +204,7 @@ const columns = computed(() => [
                 isPrimary: true,
             },
             {
-                title: t('route.components.smartCard.viewSummary'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row?.id, RouteSummary),
                 isPrimary: true,

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,8 +58,7 @@ const agencyByWarehouseFilter = computed(() => ({
     },
 }));
 
-function zoneWhere() {
+const zoneWhere = computed(() => {
-    if (formData?.value?.agencyModeFk) {
     return formData.value?.agencyModeFk
         ? {
               shipped: formData.value?.shipped,
@@ -62,8 +67,7 @@ function zoneWhere() {
               warehouseFk: formData.value?.warehouseFk,
           }
         : {};
-    }
+});
-}
 
 const getLanded = async (params) => {
     try {
@@ -108,32 +112,20 @@ const getShipped = async (params) => {
 };
 
 const onChangeZone = async (zoneId) => {
-    try {
     formData.value.agencyModeFk = null;
     const { data } = await axios.get(`Zones/${zoneId}`);
     formData.value.agencyModeFk = data.agencyModeFk;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const onChangeAddress = async (addressId) => {
-    try {
     formData.value.nickname = null;
     const { data } = await axios.get(`Addresses/${addressId}`);
     formData.value.nickname = data.nickname;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const getClientDefaultAddress = async (clientId) => {
-    try {
     const { data } = await axios.get(`Clients/${clientId}`);
     if (data) addressId.value = data.defaultAddressFk;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const clientAddressesList = async (value) => {
@@ -270,7 +262,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 +418,7 @@ onMounted(() => onFormModelInit());
                 :rules="validate('basicData.agency')"
             />
             <VnSelect
+                ref="zoneSelectRef"
                 :label="t('basicData.zone')"
                 v-model="zoneId"
                 option-value="id"
@@ -424,11 +427,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/BasicData/TicketBasicDataView.vue

@@ -70,7 +70,6 @@ const isFormInvalid = () => {
 };
 
 const getPriceDifference = async () => {
-    try {
     const params = {
         landed: formData.value.landed,
         addressId: formData.value.addressFk,
@@ -84,15 +83,10 @@ const getPriceDifference = async () => {
         params
     );
     formData.value.sale = data;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const submit = async () => {
-    try {
+    if (!formData.value.option) return notify(t('basicData.chooseAnOption'), 'negative');
-        if (!formData.value.option)
-            return notify(t('basicData.chooseAnOption'), 'negative');
 
     const params = {
         clientFk: formData.value.clientFk,
@@ -121,9 +115,6 @@ const submit = async () => {
     const ticketToMove = data.id;
     notify(t('basicData.unroutedTicket'), 'positive');
     router.push({ name: 'TicketSummary', params: { id: ticketToMove } });
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const submitWithNegatives = async () => {

src/pages/Ticket/Card/ExpeditionNewTicket.vue

@@ -34,10 +34,7 @@ const newTicketFormData = reactive({});
 const date = new Date();
 
 const createTicket = async () => {
-    try {
+    const expeditionIds = $props.selectedExpeditions.map((expedition) => expedition.id);
-        const expeditionIds = $props.selectedExpeditions.map(
-            (expedition) => expedition.id
-        );
     const params = {
         clientId: $props.ticket.clientFk,
         landed: newTicketFormData.landed,
@@ -51,9 +48,6 @@ const createTicket = async () => {
     const { data } = await axios.post('Expeditions/moveExpeditions', params);
     notify(t('globals.dataSaved'), 'positive');
     router.push({ name: 'TicketSummary', params: { id: data.id } });
-    } catch (error) {
-        console.error(error);
-    }
 };
 </script>
 

src/pages/Ticket/Card/TicketComponents.vue

@@ -150,31 +150,19 @@ const getTotal = computed(() => {
 });
 
 const getComponentsSum = async () => {
-    try {
     const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
     componentsList.value = data;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const getTheoricalCost = async () => {
-    try {
     const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
     theoricalCost.value = data;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const getTicketVolume = async () => {
-    try {
     if (!ticketData.value) return;
     const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
     ticketVolume.value = data[0].volume;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 onMounted(() => {

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,48 @@ 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) {
+    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 +493,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 +507,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 +533,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 +542,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 +746,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',
@@ -187,18 +163,12 @@ const showNewTicketDialog = (withRoute = false) => {
 };
 
 const deleteExpedition = async () => {
-    try {
+    const expeditionIds = selectedRows.value.map((expedition) => expedition.id);
-        const expeditionIds = selectedExpeditions.value.map(
-            (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) {
-        console.error(error);
-    }
 };
 
 const showLog = async (expedition) => {
@@ -207,7 +177,6 @@ const showLog = async (expedition) => {
 };
 
 const getExpeditionState = async (expedition) => {
-    try {
     const filter = {
         where: { expeditionFk: expedition.id },
         order: ['created DESC'],
@@ -216,20 +185,11 @@ const getExpeditionState = async (expedition) => {
     const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
         params: { filter: JSON.stringify(filter) },
     });
-        const { data: scannedStates } = await axios.get(`ExpeditionStates`, {
-            params: { filter: JSON.stringify(filter), fields: ['id', 'isScanned'] },
-        });
 
-        expeditionsLogsData.value = expeditionStates.map((state) => {
+    expeditionsLogsData.value = expeditionStates.map((state) => ({
-            const scannedState = scannedStates.find((s) => s.id === state.id);
-            return {
         ...state,
-                isScanned: scannedState ? scannedState.isScanned : false,
+        isScanned: !!state.isScanned,
-            };
+    }));
-        });
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 onMounted(async () => {
@@ -242,9 +202,36 @@ 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
+                    data-cy="change-state"
+                    :disable="!hasSelectedRows"
+                    color="primary"
+                    :label="t('globals.changeState')"
+                    :select-props="{
+                        options: expeditionStateTypes,
+                        optionLabel: 'description',
+                        optionValue: 'code',
+                    }"
+                    :promise="
+                        async (stateCode) => {
+                            await axios.post('ExpeditionStates/addExpeditionState', {
+                                expeditions: selectedRows.map(({ id }) => {
+                                    return { expeditionFk: id, stateCode };
+                                }),
+                            });
+                            vnTableRef.tableRef.clearSelection();
+                            vnTableRef.reload();
+                        }
+                    "
+                />
                 <QBtnDropdown
                     ref="btnDropdownRef"
                     color="primary"
@@ -298,11 +285,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"
@@ -311,6 +298,16 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             selection: 'multiple',
         }"
         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 +321,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">
@@ -345,11 +342,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-isScanned="{ row }">
                 <QTd style="text-align: center">
-                    <QCheckbox disable v-model="row.isScanned">
+                    <QCheckbox disable v-model="row.isScanned" />
-                        {{
-                            row.isScanned === 1 ? t('expedition.yes') : t('expedition.no')
-                        }}
-                    </QCheckbox>
                 </QTd>
             </template>
         </QTable>

src/pages/Ticket/Card/TicketSale.vue

@@ -2,6 +2,7 @@
 import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
+import { useQuasar } from 'quasar';
 
 import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
@@ -22,6 +23,8 @@ 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';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -31,7 +34,7 @@ const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
 const editPriceProxyRef = ref(null);
 const stateBtnDropdownRef = ref(null);
-
+const quasar = useQuasar();
 const arrayData = useArrayData('ticketData');
 const { store } = arrayData;
 const selectedRows = ref([]);
@@ -50,6 +53,7 @@ const transfer = ref({
     sales: [],
 });
 const tableRef = ref([]);
+const canProceed = ref();
 
 watch(
     () => route.params.id,
@@ -213,7 +217,9 @@ const addSale = async (sale) => {
     }
 };
 
-const changeQuantity = (sale) => {
+const changeQuantity = async (sale) => {
+    canProceed.value = await isSalePrepared(sale);
+    if (!canProceed.value) return;
     if (
         !sale.itemFk ||
         sale.quantity == null ||
@@ -225,6 +231,8 @@ const changeQuantity = (sale) => {
 };
 
 const updateConcept = async (sale) => {
+    canProceed.value = await isSalePrepared(sale);
+    if (!canProceed.value) return;
     try {
         const data = { newConcept: sale.concept };
         await axios.post(`Sales/${sale.id}/updateConcept`, data);
@@ -285,6 +293,8 @@ const onOpenEditDiscountPopover = async (sale) => {
 };
 
 const updatePrice = async (sale) => {
+    canProceed.value = await isSalePrepared(sale);
+    if (!canProceed.value) return;
     try {
         const newPrice = edit.value.price;
         if (newPrice != null && newPrice != sale.price) {
@@ -299,12 +309,18 @@ const updatePrice = async (sale) => {
     }
 };
 
-const changeDiscount = (sale) => {
+const changeDiscount = async (sale) => {
+    canProceed.value = await isSalePrepared(sale);
+    if (!canProceed.value) return;
     const newDiscount = edit.value.discount;
     if (newDiscount != null && newDiscount != sale.discount) updateDiscount([sale]);
 };
 
 const updateDiscount = async (sales, newDiscount = null) => {
+    for (const sale of sales) {
+        const canProceed = await isSalePrepared(sale);
+        if (!canProceed) return;
+    }
     const saleIds = sales.map((sale) => sale.id);
     const _newDiscount = newDiscount || edit.value.discount;
     const params = {
@@ -432,7 +448,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 const items = ref([]);
 const newRow = ref({});
 
-const updateItem = (row) => {
+const updateItem = async (row) => {
+    canProceed.value = await isSalePrepared(row);
+    if (!canProceed.value) return;
     const selectedItem = items.value.find((item) => item.id === row.itemFk);
     if (selectedItem) {
         row.item = selectedItem;
@@ -475,6 +493,55 @@ const endNewRow = (row) => {
     }
 };
 
+async function isSalePrepared(item) {
+    const filter = {
+        params: {
+            where: { ticketFk: route.params.id },
+            order: ['concept ASC', 'quantity DESC'],
+        },
+    };
+    const { data } = await axios.get(`SaleTrackings/${route.params.id}/filter`, {
+        params: {
+            filter: JSON.stringify(filter),
+        },
+    });
+
+    const matchingSale = data.find((sale) => sale.itemFk === item.itemFk);
+    if (!matchingSale) {
+        return true;
+    }
+
+    if (
+        matchingSale.hasSaleGroupDetail ||
+        matchingSale.isControled ||
+        matchingSale.isPrepared ||
+        matchingSale.isPrevious ||
+        matchingSale.isPreviousSelected
+    ) {
+        try {
+            await new Promise((resolve, reject) => {
+                quasar
+                    .dialog({
+                        component: VnConfirm,
+                        componentProps: {
+                            title: t('Item prepared'),
+                            message: t(
+                                'This item is already prepared. Do you want to continue?'
+                            ),
+                            data: item,
+                        },
+                    })
+                    .onOk(() => resolve(true))
+                    .onCancel(() => reject(new Error('cancelled')));
+            });
+        } catch (error) {
+            tableRef.value.reload();
+            return false;
+        }
+    }
+    return true;
+}
+
 watch(
     () => newRow.value.itemFk,
     (newItemFk) => {
@@ -538,6 +605,7 @@ watch(
                     :ticket-config="ticketConfig"
                     @get-mana="getMana()"
                     @update-discounts="updateDiscount"
+                    @refresh-table="resetChanges"
                 />
                 <QBtn
                     color="primary"
@@ -768,6 +836,8 @@ watch(
                 <TicketEditManaProxy
                     :mana="mana"
                     :new-price="getNewPrice"
+                    :uses-mana="usesMana"
+                    :mana-code="manaCode"
                     @save="changeDiscount(row)"
                 >
                     <VnInput
@@ -775,6 +845,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>
@@ -814,4 +887,6 @@ es:
     You are going to delete lines of the ticket: Vas a eliminar lineas del ticket
     Add item: Añadir artículo
     Transfer lines: Transferir líneas
+    Item prepared: Artículo preparado
+    This item is already prepared. Do you want to continue?: Este artículo ya esta preparado. Desea continuar?
 </i18n>

src/pages/Ticket/Card/TicketSaleMoreActions.vue

@@ -14,7 +14,7 @@ import { toDateFormat } from 'src/filters/date';
 import { useRole } from 'src/composables/useRole';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
-const emit = defineEmits(['updateDiscounts', 'getMana']);
+const emit = defineEmits(['updateDiscounts', 'getMana', 'refreshTable']);
 
 const props = defineProps({
     disable: {
@@ -107,6 +107,7 @@ const calculateSalePrice = async () => {
 
     await axios.post(`Sales/recalculatePrice`, props.sales);
     notify(t('globals.dataSaved'), 'positive');
+    emit('refreshTable', props.sales);
 };
 
 const changeMultipleDiscount = () => {
@@ -165,14 +166,10 @@ const createRefund = async (withWarehouse) => {
         negative: true,
     };
 
-    try {
     const { data } = await axios.post('Tickets/cloneAll', params);
     const [refundTicket] = data;
     notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
     push({ name: 'TicketSale', params: { id: refundTicket.id } });
-    } catch (error) {
-        console.error(error);
-    }
 };
 </script>
 

src/pages/Ticket/Card/TicketSaleTracking.vue

@@ -150,7 +150,6 @@ const shelvingsTableColumns = computed(() => [
 ]);
 
 const getSaleTrackings = async (sale) => {
-    try {
     const filter = {
         where: { saleFk: sale.saleFk },
         order: ['itemFk DESC'],
@@ -159,9 +158,6 @@ const getSaleTrackings = async (sale) => {
         params: { filter: JSON.stringify(filter) },
     });
     saleTrackings.value = data;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const showLog = async (sale) => {
@@ -170,7 +166,6 @@ const showLog = async (sale) => {
 };
 
 const getItemShelvingSales = async (sale) => {
-    try {
     const filter = {
         where: { saleFk: sale.saleFk },
     };
@@ -178,9 +173,6 @@ const getItemShelvingSales = async (sale) => {
         params: { filter: JSON.stringify(filter) },
     });
     itemShelvingsSales.value = data;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const showShelving = async (sale) => {
@@ -189,20 +181,15 @@ const showShelving = async (sale) => {
 };
 
 const updateQuantity = async (sale) => {
-    try {
     if (oldQuantity.value === sale.quantity) return;
     const params = {
         quantity: sale.quantity,
     };
     await axios.patch(`ItemShelvingSales/${sale.id}`, params);
     oldQuantity.value = null;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const updateParking = async (sale) => {
-    try {
     const filter = {
         fields: ['id'],
         where: {
@@ -216,9 +203,6 @@ const updateParking = async (sale) => {
         parkingFk: sale.parkingFk,
     };
     await axios.patch(`Shelvings/${data.id}`, params);
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const updateShelving = async (sale) => {
@@ -241,7 +225,6 @@ const updateShelving = async (sale) => {
 };
 
 const saleTrackingNew = async (sale, stateCode, isChecked) => {
-    try {
     const params = {
         saleFk: sale.saleFk,
         isChecked,
@@ -250,52 +233,33 @@ const saleTrackingNew = async (sale, stateCode, isChecked) => {
     };
     await axios.post(`SaleTrackings/new`, params);
     notify(t('globals.dataSaved'), 'positive');
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const saleTrackingDel = async ({ saleFk }, stateCode) => {
-    try {
     const params = {
         saleFk,
         stateCodes: [stateCode],
     };
     await axios.post(`SaleTrackings/delete`, params);
     notify(t('globals.dataSaved'), 'positive');
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const clickSaleGroupDetail = async (sale) => {
-    try {
     if (!sale.saleGroupDetailFk) return;
 
     await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`);
     sale.hasSaleGroupDetail = false;
     notify(t('globals.dataSaved'), 'positive');
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const clickPreviousSelected = (sale) => {
-    try {
     qCheckBoxController(sale, 'isPreviousSelected');
     if (!sale.isPreviousSelected) sale.isPrevious = false;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const clickPrevious = (sale) => {
-    try {
     qCheckBoxController(sale, 'isPrevious');
     if (sale.isPrevious) sale.isPreviousSelected = true;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const qCheckBoxController = (sale, action) => {
@@ -306,7 +270,6 @@ const qCheckBoxController = (sale, action) => {
         isPreviousSelected: 'PREVIOUS_PREPARATION',
     };
     const stateCode = STATE_CODES[action];
-    try {
     if (!sale[action]) {
         saleTrackingNew(sale, stateCode, true);
         sale[action] = true;
@@ -314,9 +277,6 @@ const qCheckBoxController = (sale, action) => {
         saleTrackingDel(sale, stateCode);
         sale[action] = false;
     }
-    } catch (error) {
-        console.error(error);
-    }
 };
 </script>
 

src/pages/Ticket/Card/TicketService.vue

@@ -46,7 +46,6 @@ watch(
 onMounted(async () => await getDefaultTaxClass());
 
 const createRefund = async () => {
-    try {
     if (!selected.value.length) return;
 
     const params = {
@@ -63,13 +62,9 @@ const createRefund = async () => {
         'positive'
     );
     router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const getDefaultTaxClass = async () => {
-    try {
     let filter = {
         where: { code: 'G' },
     };
@@ -77,9 +72,6 @@ const getDefaultTaxClass = async () => {
         params: { filter: JSON.stringify(filter) },
     });
     defaultTaxClass.value = data;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const columns = computed(() => [

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/Card/TicketVolume.vue

@@ -75,7 +75,6 @@ const columns = computed(() => [
 ]);
 
 const applyVolumes = async (salesData) => {
-    try {
     if (!salesData.length) return;
 
     sales.value = salesData;
@@ -88,9 +87,6 @@ const applyVolumes = async (salesData) => {
     });
 
     packingTypeVolume.value = data.packingTypeVolume;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 onMounted(() => (stateStore.rightDrawer = true));

src/pages/Ticket/TicketAdvance.vue

@@ -1,24 +1,19 @@
 <script setup>
-import { onMounted, ref, computed, reactive } from 'vue';
+import { ref, computed, reactive, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnProgress from 'src/components/common/VnProgressModal.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketAdvanceFilter from './TicketAdvanceFilter.vue';
-
 import { dashIfEmpty, toCurrency } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
-import { useArrayData } from 'composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import { useState } from 'src/composables/useState';
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const state = useState();
 const { t } = useI18n();
@@ -29,109 +24,58 @@ const user = state.getUser();
 const itemPackingTypesOptions = ref([]);
 const zonesOptions = ref([]);
 const selectedTickets = ref([]);
-
+const vnTableRef = ref({});
-const exprBuilder = (param, value) => {
+const originElRef = ref(null);
-    switch (param) {
+const destinationElRef = ref(null);
-        case 'id':
+let today = Date.vnNew().toISOString();
-        case 'futureId':
+const tomorrow = new Date(today);
-        case 'liters':
+tomorrow.setDate(tomorrow.getDate() + 1);
-        case 'futureLiters':
+const userParams = reactive({
-        case 'lines':
+    dateFuture: tomorrow,
-        case 'futureLines':
+    dateToAdvance: today,
-        case 'totalWithVat':
+    warehouseFk: user.value.warehouseFk,
-        case 'futureTotalWithVat':
+    ipt: 'H',
-        case 'futureZone':
+    futureIpt: 'H',
-        case 'notMovableLines':
+    isFullMovable: true,
-        case 'futureZoneFk':
-            return { [param]: value };
-        case 'iptColFilter':
-            return { ipt: { like: `%${value}%` } };
-        case 'futureIptColFilter':
-            return { futureIpt: { like: `%${value}%` } };
-    }
-};
-
-const userParams = reactive({});
-
-const arrayData = useArrayData('AdvanceTickets', {
-    url: 'Tickets/getTicketsAdvance',
-    userParams: userParams,
-    exprBuilder: exprBuilder,
-    limit: 0,
 });
-const { store } = arrayData;
-const tickets = computed(() =>
-    (store.data || []).map((ticket, index) => ({ ...ticket, index: index }))
-);
-
-const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        userParams[paramKey] = col.columnFilter.filterValue;
-        await arrayData.addFilter({ params: userParams });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
 
 const ticketColumns = computed(() => [
     {
         label: '',
         name: 'icons',
-        align: 'left',
+        hidden: true,
-        columnFilter: null,
+        headerClass: 'horizontal-separator',
     },
     {
-        label: t('advanceTickets.ticketId'),
-        name: 'ticketId',
         align: 'center',
-        sortable: true,
+        label: t('advanceTickets.ticketId'),
-        columnFilter: {
+        name: 'id',
-            component: VnInput,
+        headerClass: 'horizontal-separator',
-            type: 'text',
-            filterValue: null,
-            filterParamKey: 'id',
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
+        align: 'left',
         label: t('advanceTickets.ipt'),
         name: 'ipt',
-        field: 'ipt',
-        align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnSelect,
+            component: 'select',
-            filterParamKey: 'iptColFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
             attrs: {
-                options: itemPackingTypesOptions.value,
+                url: 'itemPackingTypes',
-                'option-value': 'code',
+                fields: ['code', 'description'],
-                'option-label': 'description',
+                where: { isActive: true },
-                dense: true,
+                optionValue: 'code',
+                optionLabel: 'description',
+                inWhere: false,
             },
         },
-        format: (val) => dashIfEmpty(val),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.ipt),
+        headerClass: 'horizontal-separator',
     },
     {
+        align: 'left',
         label: t('advanceTickets.state'),
         name: 'state',
-        align: 'left',
+        headerClass: 'horizontal-separator',
-        sortable: true,
+        hidden: true,
-        columnFilter: null,
     },
     {
         label: t('advanceTickets.preparation'),
@@ -139,171 +83,105 @@ const ticketColumns = computed(() => [
         field: 'preparation',
         align: 'left',
         sortable: true,
-        columnFilter: null,
+        headerClass: 'horizontal-separator',
+        columnFilter: false,
     },
     {
-        label: t('advanceTickets.liters'),
-        name: 'liters',
-        field: 'liters',
         align: 'left',
-        sortable: true,
+        label: t('advanceTickets.liters'),
-        columnFilter: {
+        headerClass: 'horizontal-separator',
-            component: VnInput,
+        name: 'liters',
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
+        align: 'left',
         label: t('advanceTickets.lines'),
         name: 'lines',
-        field: 'lines',
+        headerClass: 'horizontal-separator',
-        align: 'left',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
+        align: 'left',
         label: t('advanceTickets.import'),
-        field: 'import',
+        name: 'totalWithVat',
-        name: 'import',
+        hidden: true,
-        align: 'left',
+        headerClass: 'horizontal-separator',
-        sortable: true,
+        format: (row) => toCurrency(row.totalWithVat),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureId'),
         name: 'futureId',
-        align: 'left',
+        headerClass: 'vertical-separator horizontal-separator',
-        sortable: true,
+        columnClass: 'vertical-separator',
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            filterParamKey: 'futureId',
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureIpt'),
         name: 'futureIpt',
-        field: 'futureIpt',
-        align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnSelect,
+            component: 'select',
-            filterParamKey: 'futureIptColFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
             attrs: {
-                options: itemPackingTypesOptions.value,
+                url: 'itemPackingTypes',
-                'option-value': 'code',
+                fields: ['code', 'description'],
-                'option-label': 'description',
+                where: { isActive: true },
-                dense: true,
+                optionValue: 'code',
+                optionLabel: 'description',
             },
         },
-        format: (val) => dashIfEmpty(val),
+        headerClass: 'horizontal-separator',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.futureIpt),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureState'),
         name: 'futureState',
-        align: 'left',
+        headerClass: 'horizontal-separator',
-        sortable: true,
+        hidden: true,
-        columnFilter: null,
-        format: (val) => dashIfEmpty(val),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureLiters'),
+        headerClass: 'horizontal-separator',
         name: 'futureLiters',
-        field: 'futureLiters',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureZone'),
-        name: 'futureZoneName',
+        name: 'futureZoneFk',
-        field: 'futureZoneName',
+        columnClass: 'expand',
-        align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnSelect,
+            component: 'select',
-            type: 'select',
+            inWhere: true,
-            filterValue: null,
-            filterParamKey: 'futureZoneFk',
-            event: getInputEvents,
             attrs: {
-                options: zonesOptions.value,
+                url: 'Zones',
-                'option-value': 'id',
+                fields: ['id', 'name'],
-                'option-label': 'name',
-                dense: true,
             },
         },
-        format: (val) => dashIfEmpty(val),
+        columnField: {
+            component: null,
+        },
+        headerClass: 'horizontal-separator',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.futureZoneName),
     },
     {
+        align: 'left',
         label: t('advanceTickets.notMovableLines'),
+        headerClass: 'horizontal-separator',
         name: 'notMovableLines',
-        field: 'notMovableLines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureLines'),
+        headerClass: 'horizontal-separator',
         name: 'futureLines',
-        field: 'futureLines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('advanceTickets.futureImport'),
-        name: 'futureImport',
         align: 'left',
-        sortable: true,
+        label: t('advanceTickets.futureImport'),
-        columnFilter: null,
+        name: 'futureTotalWithVat',
+        hidden: true,
+        headerClass: 'horizontal-separator',
+        format: (row) => toCurrency(row.futureTotalWithVat),
     },
 ]);
 
@@ -329,7 +207,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
     const query = `tickets/${ticket.futureId}/componentUpdate`;
     if (!ticket.landed) {
         const newLanded = await getLanded({
-            shipped: userParams.dateToAdvance,
+            shipped: vnTableRef.value.params.dateToAdvance,
             addressFk: ticket.futureAddressFk,
             agencyModeFk: ticket.agencyModeFk ?? ticket.futureAgencyModeFk,
             warehouseFk: ticket.futureWarehouseFk,
@@ -352,7 +230,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
         zoneFk: ticket.zoneFk ?? ticket.futureZoneFk,
         warehouseFk: ticket.futureWarehouseFk,
         companyFk: ticket.futureCompanyFk,
-        shipped: userParams.dateToAdvance,
+        shipped: vnTableRef.value.params.dateToAdvance,
         landed: ticket.landed,
         isDeleted: false,
         isWithoutNegatives,
@@ -364,7 +242,6 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
 };
 
 const moveTicketsAdvance = async () => {
-    try {
     let ticketsToMove = [];
     for (const ticket of selectedTickets.value) {
         if (!ticket.id) {
@@ -387,13 +264,9 @@ const moveTicketsAdvance = async () => {
 
     const params = { tickets: ticketsToMove };
     await axios.post('Tickets/merge', params);
-        arrayData.fetch({ append: false });
+    vnTableRef.value.reload();
     selectedTickets.value = [];
-        if (ticketsToMove.length)
+    if (ticketsToMove.length) notify(t('advanceTickets.moveTicketSuccess'), 'positive');
-            notify(t('advanceTickets.moveTicketSuccess'), 'positive');
-    } catch (error) {
-        console.error('Error moving tickets', error);
-    }
 };
 
 const progressLength = ref(0);
@@ -434,10 +307,8 @@ const splitTickets = async () => {
                 progressAdd(ticket.futureId);
             }
         }
-    } catch (error) {
-        console.error('Error splitting tickets', error);
     } finally {
-        arrayData.fetch({ append: false });
+        vnTableRef.value.reload();
     }
 };
 
@@ -455,19 +326,52 @@ const handleCloseProgressDialog = () => {
 
 const handleCancelProgress = () => (cancelProgress.value = true);
 
-onMounted(async () => {
+watch(
-    let today = Date.vnNew();
+    () => vnTableRef.value.tableRef?.$el,
-    const tomorrow = new Date(today);
+    ($el) => {
-    tomorrow.setDate(tomorrow.getDate() + 1);
+        if (!$el) return;
-    userParams.dateFuture = tomorrow;
+        const head = $el.querySelector('thead');
-    userParams.dateToAdvance = today;
+        const firstRow = $el.querySelector('thead > tr');
-    userParams.scopeDays = 1;
-    userParams.warehouseFk = user.value.warehouseFk;
-    const filter = { limit: 0 };
-    await arrayData.addFilter({ filter, userParams });
-});
-</script>
 
+        const newRow = document.createElement('tr');
+        destinationElRef.value = document.createElement('th');
+        originElRef.value = document.createElement('th');
+
+        newRow.classList.add('bg-header');
+        destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
+        originElRef.value.classList.add('text-uppercase', 'color-vn-label');
+
+        destinationElRef.value.setAttribute('colspan', '7');
+        originElRef.value.setAttribute('colspan', '9');
+
+        destinationElRef.value.textContent = `${t(
+            'advanceTickets.destination'
+        )} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
+        originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
+            vnTableRef.value.params.dateFuture
+        )}`;
+
+        newRow.append(destinationElRef.value, originElRef.value);
+        head.insertBefore(newRow, firstRow);
+    },
+    { once: true, inmmediate: true }
+);
+
+watch(
+    () => vnTableRef.value.params,
+    () => {
+        if (originElRef.value && destinationElRef.value) {
+            destinationElRef.value.textContent = `${t(
+                'advanceTickets.destination'
+            )} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
+            originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
+                vnTableRef.value.params.dateFuture
+            )}`;
+        }
+    },
+    { deep: true }
+);
+</script>
 <template>
     <FetchData
         url="itemPackingTypes"
@@ -488,11 +392,6 @@ onMounted(async () => {
         auto-load
         @on-fetch="(data) => (zonesOptions = data)"
     />
-    <VnSearchbar
-        data-key="WeeklyTickets"
-        :label="t('weeklyTickets.search')"
-        :info="t('weeklyTickets.searchInfo')"
-    />
     <VnSubToolbar>
         <template #st-data>
             <QBtn
@@ -536,79 +435,30 @@ onMounted(async () => {
     </VnSubToolbar>
     <RightMenu>
         <template #right-panel>
-            <TicketAdvanceFilter data-key="AdvanceTickets" />
+            <TicketAdvanceFilter data-key="advanceTickets" />
         </template>
     </RightMenu>
     <QPage class="column items-center q-pa-md">
-        <QTable
+        <VnTable
-            :rows="tickets"
+            data-key="advanceTickets"
+            ref="vnTableRef"
+            url="Tickets/getTicketsAdvance"
+            search-url="advanceTickets"
+            :user-params="userParams"
+            :limit="0"
             :columns="ticketColumns"
-            row-key="index"
+            :table="{
-            selection="multiple"
+                'row-key': '$index',
+                selection: 'multiple',
+            }"
             v-model:selected="selectedTickets"
             :pagination="{ rowsPerPage: 0 }"
             :no-data-label="t('globals.noResults')"
-            style="max-width: 99%"
+            :right-search="false"
+            auto-load
+            :disable-option="{ card: true }"
         >
-            <template #header="props">
+            <template #column-icons="{ row }">
-                {{ userParams.scopeDays }}
-                <QTr :props="props">
-                    <QTh
-                        class="horizontal-separator text-uppercase color-vn-label"
-                        colspan="7"
-                        translate
-                    >
-                        {{ t('advanceTickets.destination') }}
-                        {{ toDateFormat(userParams.dateToAdvance) }}
-                    </QTh>
-                    <QTh
-                        class="horizontal-separator text-uppercase color-vn-label"
-                        colspan="9"
-                        translate
-                    >
-                        {{ t('advanceTickets.origin') }}
-                        {{ toDateFormat(userParams.dateFuture) }}
-                    </QTh>
-                </QTr>
-                <QTr>
-                    <QTh>
-                        <QCheckbox v-model="props.selected" />
-                    </QTh>
-                    <QTh
-                        v-for="(col, index) in ticketColumns"
-                        :key="index"
-                        :class="{ 'vertical-separator': col.name === 'futureId' }"
-                    >
-                        {{ col.label }}
-                    </QTh>
-                </QTr>
-            </template>
-            <template #top-row="{ cols }">
-                <QTr>
-                    <QTd />
-                    <QTd
-                        v-for="(col, index) in cols"
-                        :key="index"
-                        style="max-width: 100px"
-                    >
-                        <component
-                            :is="col.columnFilter.component"
-                            v-if="col.columnFilter"
-                            v-model="col.columnFilter.filterValue"
-                            v-bind="col.columnFilter.attrs"
-                            v-on="col.columnFilter.event(col)"
-                            dense
-                        />
-                    </QTd>
-                </QTr>
-            </template>
-            <template #header-cell-availableLines="{ col }">
-                <QTh class="vertical-separator">
-                    {{ col.label }}
-                </QTh>
-            </template>
-            <template #body-cell-icons="{ row }">
-                <QTd class="q-gutter-x-xs">
                 <QIcon
                     v-if="row.futureAgency !== row.agency && row.agency"
                     color="primary"
@@ -632,19 +482,14 @@ onMounted(async () => {
                         </span>
                     </QTooltip>
                 </QIcon>
-                </QTd>
             </template>
-
+            <template #column-id="{ row }">
-            <template #body-cell-ticketId="{ row }">
-                <QTd>
                 <QBtn flat class="link">
                     {{ row.id }}
                     <TicketDescriptorProxy :id="row.id" />
                 </QBtn>
-                </QTd>
             </template>
-            <template #body-cell-state="{ row }">
+            <template #column-state="{ row }">
-                <QTd>
                 <QBadge
                     v-if="row.state"
                     text-color="black"
@@ -655,10 +500,8 @@ onMounted(async () => {
                     {{ row.state }}
                 </QBadge>
                 <span v-else> {{ dashIfEmpty(row.state) }}</span>
-                </QTd>
             </template>
-            <template #body-cell-import="{ row }">
+            <template #column-import="{ row }">
-                <QTd>
                 <QBadge
                     :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
                     :color="totalPriceColor(row.totalWithVat)"
@@ -667,18 +510,14 @@ onMounted(async () => {
                 >
                     {{ toCurrency(row.totalWithVat || 0) }}
                 </QBadge>
-                </QTd>
             </template>
-            <template #body-cell-futureId="{ row }">
+            <template #column-futureId="{ row }">
-                <QTd class="vertical-separator">
                 <QBtn flat class="link" dense>
                     {{ row.futureId }}
                     <TicketDescriptorProxy :id="row.futureId" />
                 </QBtn>
-                </QTd>
             </template>
-            <template #body-cell-futureState="{ row }">
+            <template #column-futureState="{ row }">
-                <QTd>
                 <QBadge
                     text-color="black"
                     :color="row.futureClassColor"
@@ -687,23 +526,18 @@ onMounted(async () => {
                 >
                     {{ row.futureState }}
                 </QBadge>
-                </QTd>
             </template>
-            <template #body-cell-futureImport="{ row }">
+            <template #column-futureImport="{ row }">
-                <QTd>
                 <QBadge
-                        :text-color="
+                    :text-color="isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'"
-                            isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'
-                        "
                     :color="totalPriceColor(row.futureTotalWithVat)"
                     class="q-ma-none"
                     dense
                 >
                     {{ toCurrency(row.futureTotalWithVat || 0) }}
                 </QBadge>
-                </QTd>
             </template>
-        </QTable>
+        </VnTable>
         <VnProgress
             :progress="progressPercentage"
             :cancelled="cancelProgress"
@@ -722,11 +556,11 @@ onMounted(async () => {
 </template>
 
 <style scoped lang="scss">
-.vertical-separator {
+:deep(.vertical-separator) {
     border-left: 4px solid white !important;
 }
 
-.horizontal-separator {
+:deep(.horizontal-separator) {
-    border-bottom: 4px solid white !important;
+    border-top: 4px solid white !important;
 }
 </style>

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,
@@ -27,7 +27,6 @@ const warehousesOptions = ref([]);
 const itemPackingTypes = ref([]);
 
 const getItemPackingTypes = async () => {
-    try {
     const filter = {
         where: { isActive: true },
     };
@@ -38,9 +37,11 @@ const getItemPackingTypes = async () => {
         description: t(ipt.description),
         code: ipt.code,
     }));
-    } catch (error) {
+};
-        console.error(error);
+
-    }
+const getLocale = (val) => {
+    const param = `params.${val}`;
+    return te(param) ? t(param) : t(`globals.${param}`);
 };
 
 onMounted(async () => await getItemPackingTypes());
@@ -53,6 +54,7 @@ onMounted(async () => await getItemPackingTypes());
         auto-load
     />
     <VnFilterPanel
+        search-url="advanceTickets"
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
@@ -60,7 +62,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>
@@ -96,6 +98,7 @@ onMounted(async () => await getItemPackingTypes());
                         dense
                         outlined
                         rounded
+                        :use-like="false"
                     >
                     </VnSelect>
                 </QItemSection>
@@ -113,6 +116,7 @@ onMounted(async () => await getItemPackingTypes());
                         dense
                         outlined
                         rounded
+                        :use-like="false"
                     >
                     </VnSelect>
                 </QItemSection>
@@ -136,6 +140,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/TicketFilter.vue

@@ -20,11 +20,31 @@ 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="AlertLevels"
+        @on-fetch="
+            (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">
@@ -90,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
@@ -114,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
@@ -176,6 +228,7 @@ const warehouses = ref([]);
                             option-label="name"
                             emit-value
                             map-options
+                            use-input
                             dense
                             outlined
                             rounded
@@ -196,6 +249,7 @@ const warehouses = ref([]);
                             option-label="name"
                             emit-value
                             map-options
+                            use-input
                             dense
                             outlined
                             rounded
@@ -216,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>
@@ -245,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
@@ -278,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/TicketFutureFilter.vue

@@ -24,7 +24,6 @@ const itemPackingTypes = ref([]);
 const stateOptions = ref([]);
 
 const getItemPackingTypes = async () => {
-    try {
     const filter = {
         where: { isActive: true },
     };
@@ -35,22 +34,15 @@ const getItemPackingTypes = async () => {
         description: t(ipt.description),
         code: ipt.code,
     }));
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const getGroupedStates = async () => {
-    try {
     const { data } = await axios.get('AlertLevels');
     stateOptions.value = data.map((state) => ({
         id: state.id,
         name: t(`futureTickets.${state.code}`),
         code: state.code,
     }));
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 onMounted(async () => {

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',
@@ -202,7 +204,7 @@ const columns = computed(() => [
                 action: (row) => redirectToLines(row.id),
             },
             {
-                title: t('ticketList.summary'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 isPrimary: true,
                 action: (row) => viewSummary(row.id, TicketSummary),
@@ -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/Card/TravelBasicData.vue

@@ -72,6 +72,16 @@ const agenciesOptions = ref([]);
             </VnRow>
             <VnRow>
                 <VnInput v-model="data.m3" label="m3" />
+                <VnInput
+                    :label="t('travel.basicData.daysInForward')"
+                    v-model="data.daysInForward"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-info">
+                            <QTooltip>{{ t('raidDays') }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </VnInput>
             </VnRow>
             <VnRow>
                 <QCheckbox
@@ -86,3 +96,10 @@ const agenciesOptions = ref([]);
         </template>
     </FormModel>
 </template>
+
+<i18n>
+es:
+    raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo
+en:
+    raidDays: When filling, a raid is generated. Enter the number of days the travel will automatically forward in time
+</i18n>

src/pages/Travel/Card/TravelDescriptor.vue

@@ -32,6 +32,7 @@ const filter = {
         'warehouseOutFk',
         'cargoSupplierFk',
         'agencyModeFk',
+        'daysInForward',
     ],
     include: [
         {
@@ -77,6 +78,22 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
             <VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
             <VnLv :label="t('globals.totalEntries')" :value="entity.totalEntries" />
         </template>
+        <template #icons="{ entity }">
+            <QCardActions class="q-gutter-x-md">
+                <QIcon
+                    v-if="entity.daysInForward"
+                    name="vn:net"
+                    color="primary"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{
+                            t('globals.raid', { daysInForward: entity.daysInForward })
+                        }}</QTooltip
+                    >
+                </QIcon>
+            </QCardActions>
+        </template>
         <template #actions="{ entity }">
             <QCardActions>
                 <QBtn

src/pages/Travel/Card/TravelSummary.vue

@@ -303,6 +303,10 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <VnLv :label="t('globals.reference')" :value="travel.ref" />
                 <VnLv label="m³" :value="travel.m3" />
                 <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
+                <VnLv
+                    :label="t('travel.basicData.daysInForward')"
+                    :value="travel?.daysInForward"
+                />
             </QCard>
             <QCard class="full-width">
                 <VnTitle :text="t('travel.summary.entries')" />

src/pages/Travel/TravelList.vue

@@ -45,6 +45,10 @@ const redirectCreateEntryView = (travelData) => {
 };
 
 const columns = computed(() => [
+    {
+        name: 'status',
+        columnFilter: false,
+    },
     {
         align: 'left',
         name: 'id',
@@ -221,6 +225,17 @@ const columns = computed(() => [
         :is-editable="false"
         :use-model="true"
     >
+        <template #column-status="{ row }">
+            <div class="row">
+                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                    <QTooltip>
+                        {{
+                            t('globals.raid', { daysInForward: row.daysInForward })
+                        }}</QTooltip
+                    >
+                </QIcon>
+            </div>
+        </template>
         <template #column-shipped="{ row }">
             <QBadge
                 text-color="black"

src/pages/Worker/Card/WorkerBasicData.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -8,32 +8,22 @@ import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
 
-const route = useRoute();
 const { t } = useI18n();
-
 const educationLevels = ref([]);
 const countries = ref([]);
 const maritalStatus = [
     { code: 'M', name: t('Married') },
     { code: 'S', name: t('Single') },
 ];
+const advancedSummary = ref({});
 
-const workerFilter = {
+onBeforeMount(async () => {
-    include: [
+    advancedSummary.value =
-        {
+        (await useAdvancedSummary('Workers', +useRoute().params.id)) ?? {};
-            relation: 'user',
+});
-            scope: {
-                fields: ['name', 'emailVerified'],
-                include: { relation: 'emailUser', scope: { fields: ['email'] } },
-            },
-        },
-        { relation: 'sip', scope: { fields: ['extension', 'secret'] } },
-        { relation: 'department', scope: { include: { relation: 'department' } } },
-    ],
-};
 </script>
-
 <template>
     <FetchData
         :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
@@ -48,10 +38,16 @@ const workerFilter = {
         auto-load
     />
     <FormModel
-        :filter="workerFilter"
+        :filter="{ where: { id: +$route.params.id } }"
-        :url="`Workers/${route.params.id}`"
+        url="Workers/summary"
+        :url-update="`Workers/${$route.params.id}`"
         auto-load
         model="Worker"
+        @on-fetch="
+            async (data) => {
+                Object.assign(data, advancedSummary);
+            }
+        "
     >
         <template #form="{ data }">
             <VnRow>
@@ -134,7 +130,7 @@ const workerFilter = {
                 <VnInput v-model="data.fi" :label="t('fi')" />
                 <VnInputDate :label="t('birth')" v-model="data.birth" />
             </VnRow>
-            <VnRow>
+            <VnRow wrap>
                 <QCheckbox
                     size="sm"
                     :label="t('isFreelance')"

src/pages/Worker/Card/WorkerCard.vue

@@ -6,7 +6,7 @@ import WorkerFilter from '../WorkerFilter.vue';
 <template>
     <VnCard
         data-key="Worker"
-        base-url="Workers"
+        custom-url="Workers/summary"
         :descriptor="WorkerDescriptor"
         :filter-panel="WorkerFilter"
         search-data-key="WorkerList"

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -17,6 +17,11 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    dataKey: {
+        type: String,
+        required: false,
+        default: 'workerData',
+    },
 });
 const image = ref(null);
 
@@ -65,7 +70,7 @@ const handlePhotoUpdated = (evt = false) => {
     <CardDescriptor
         ref="cardDescriptorRef"
         module="Worker"
-        data-key="workerData"
+        :data-key="dataKey"
         url="Workers/descriptor"
         :filter="{ where: { id: entityId } }"
         title="user.nickname"