Merge branch 'dev' into 6426-refactorConstants

package.json

@@ -1,74 +1,74 @@
 {
-  "name": "salix-front",
-  "version": "25.06.0",
-  "description": "Salix frontend",
-  "productName": "Salix",
-  "author": "Verdnatura",
-  "private": true,
-  "packageManager": "pnpm@8.15.1",
-  "type": "module",
-  "scripts": {
-    "resetDatabase": "cd ../salix && gulp docker",
-    "lint": "eslint --ext .js,.vue ./",
-    "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
-    "test:e2e": "cypress open",
-    "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
-    "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-    "test:unit": "vitest",
-    "test:unit:ci": "vitest run",
-    "commitlint": "commitlint --edit",
-    "prepare": "npx husky install",
-    "addReferenceTag": "node .husky/addReferenceTag.js",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
-  },
-  "dependencies": {
-    "@quasar/cli": "^2.4.1",
-    "@quasar/extras": "^1.16.16",
-    "axios": "^1.4.0",
-    "chromium": "^3.0.3",
-    "croppie": "^2.6.5",
-    "moment": "^2.30.1",
-    "pinia": "^2.1.3",
-    "quasar": "^2.17.7",
-    "validator": "^13.9.0",
-    "vue": "^3.5.13",
-    "vue-i18n": "^9.3.0",
-    "vue-router": "^4.2.5"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^19.2.1",
-    "@commitlint/config-conventional": "^19.1.0",
-    "@intlify/unplugin-vue-i18n": "^0.8.2",
-    "@pinia/testing": "^0.1.2",
-    "@quasar/app-vite": "^2.0.8",
-    "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
-    "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
-    "@vue/test-utils": "^2.4.4",
-    "autoprefixer": "^10.4.14",
-    "cypress": "^13.6.6",
-    "cypress-mochawesome-reporter": "^3.8.2",
-    "eslint": "^9.18.0",
-    "eslint-config-prettier": "^10.0.1",
-    "eslint-plugin-cypress": "^4.1.0",
-    "eslint-plugin-vue": "^9.32.0",
-    "husky": "^8.0.0",
-    "postcss": "^8.4.23",
-    "prettier": "^3.4.2",
-    "sass": "^1.83.4",
-    "vitepress": "^1.6.3",
-    "vitest": "^0.34.0"
-  },
-  "engines": {
-    "node": "^20 || ^18 || ^16",
-    "npm": ">= 8.1.2",
-    "yarn": ">= 1.21.1",
-    "bun": ">= 1.0.25"
-  },
-  "overrides": {
-    "@vitejs/plugin-vue": "^5.2.1",
-    "vite": "^6.0.11",
-    "vitest": "^0.31.1"
-  }
+    "name": "salix-front",
+    "version": "25.08.0",
+    "description": "Salix frontend",
+    "productName": "Salix",
+    "author": "Verdnatura",
+    "private": true,
+    "packageManager": "pnpm@8.15.1",
+    "type": "module",
+    "scripts": {
+        "resetDatabase": "cd ../salix && gulp docker",
+        "lint": "eslint --ext .js,.vue ./",
+        "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
+        "test:e2e": "cypress open",
+        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+        "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
+        "test:unit": "vitest",
+        "test:unit:ci": "vitest run",
+        "commitlint": "commitlint --edit",
+        "prepare": "npx husky install",
+        "addReferenceTag": "node .husky/addReferenceTag.js",
+        "docs:dev": "vitepress dev docs",
+        "docs:build": "vitepress build docs",
+        "docs:preview": "vitepress preview docs"
+    },
+    "dependencies": {
+        "@quasar/cli": "^2.4.1",
+        "@quasar/extras": "^1.16.16",
+        "axios": "^1.4.0",
+        "chromium": "^3.0.3",
+        "croppie": "^2.6.5",
+        "moment": "^2.30.1",
+        "pinia": "^2.1.3",
+        "quasar": "^2.17.7",
+        "validator": "^13.9.0",
+        "vue": "^3.5.13",
+        "vue-i18n": "^9.3.0",
+        "vue-router": "^4.2.5"
+    },
+    "devDependencies": {
+        "@commitlint/cli": "^19.2.1",
+        "@commitlint/config-conventional": "^19.1.0",
+        "@intlify/unplugin-vue-i18n": "^0.8.2",
+        "@pinia/testing": "^0.1.2",
+        "@quasar/app-vite": "^2.0.8",
+        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
+        "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
+        "@vue/test-utils": "^2.4.4",
+        "autoprefixer": "^10.4.14",
+        "cypress": "^13.6.6",
+        "cypress-mochawesome-reporter": "^3.8.2",
+        "eslint": "^9.18.0",
+        "eslint-config-prettier": "^10.0.1",
+        "eslint-plugin-cypress": "^4.1.0",
+        "eslint-plugin-vue": "^9.32.0",
+        "husky": "^8.0.0",
+        "postcss": "^8.4.23",
+        "prettier": "^3.4.2",
+        "sass": "^1.83.4",
+        "vitepress": "^1.6.3",
+        "vitest": "^0.34.0"
+    },
+    "engines": {
+        "node": "^20 || ^18 || ^16",
+        "npm": ">= 8.1.2",
+        "yarn": ">= 1.21.1",
+        "bun": ">= 1.0.25"
+    },
+    "overrides": {
+        "@vitejs/plugin-vue": "^5.2.1",
+        "vite": "^6.0.11",
+        "vitest": "^0.31.1"
+    }
 }

src/components/ItemsFilterPanel.vue

@@ -31,7 +31,6 @@ const props = defineProps({
 const route = useRoute();
 
 const itemTypesOptions = ref([]);
-const suppliersOptions = ref([]);
 const tagOptions = ref([]);
 const tagValues = ref([]);
 const categoryList = ref(null);
@@ -40,13 +39,13 @@ const selectedTypeFk = ref(getParamWhere(route.query.table, 'typeFk', false));
 
 const selectedCategory = computed(() => {
     return (categoryList.value || []).find(
-        (category) => category?.id === selectedCategoryFk.value
+        (category) => category?.id === selectedCategoryFk.value,
     );
 });
 
 const selectedType = computed(() => {
     return (itemTypesOptions.value || []).find(
-        (type) => type?.id === selectedTypeFk.value
+        (type) => type?.id === selectedTypeFk.value,
     );
 });
 
@@ -134,13 +133,6 @@ const setCategoryList = (data) => {
 
 <template>
     <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
-    <FetchData
-        url="Suppliers"
-        limit="30"
-        auto-load
-        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (suppliersOptions = data)"
-    />
     <FetchData
         url="Tags"
         :filter="{ fields: ['id', 'name', 'isFree'] }"

src/components/LeftMenu.vue

@@ -10,12 +10,13 @@ import routes from 'src/router/modules';
 import LeftMenuItem from './LeftMenuItem.vue';
 import LeftMenuItemGroup from './LeftMenuItemGroup.vue';
 import VnInput from './common/VnInput.vue';
+import { useRouter } from 'vue-router';
 
 const { t } = useI18n();
 const route = useRoute();
 const quasar = useQuasar();
 const navigation = useNavigationStore();
-
+const router = useRouter();
 const props = defineProps({
     source: {
         type: String,
@@ -174,6 +175,10 @@ function normalize(text) {
         .replace(/[\u0300-\u036f]/g, '')
         .toLowerCase();
 }
+const searchModule = () => {
+    const [item] = filteredItems.value;
+    if (item) router.push({ name: item.name });
+};
 </script>
 
 <template>
@@ -188,10 +193,11 @@ function normalize(text) {
                         filled
                         dense
                         autofocus
+                        @keyup.enter.stop="searchModule()"
                     />
                 </QItem>
                 <QSeparator />
-                <template v-if="filteredPinnedModules.size">
+                <template v-if="filteredPinnedModules.size && !search">
                     <LeftMenuItem
                         v-for="[key, pinnedModule] of filteredPinnedModules"
                         :key="key"
@@ -215,11 +221,11 @@ function normalize(text) {
                     </LeftMenuItem>
                     <QSeparator />
                 </template>
-                <template v-for="item in filteredItems" :key="item.name">
+                <template v-for="(item, index) in filteredItems" :key="item.name">
                     <template
-                        v-if="item.children && !filteredPinnedModules.has(item.name)"
+                        v-if="search ||item.children && !filteredPinnedModules.has(item.name)"
                     >
-                        <LeftMenuItem :item="item" group="modules">
+                        <LeftMenuItem :item="item" group="modules" :class="search && index === 0 ? 'searched' : ''">
                             <template #side>
                                 <QBtn
                                     v-if="item.isPinned === true"
@@ -336,6 +342,9 @@ function normalize(text) {
 .header {
     color: var(--vn-label-color);
 }
+.searched{
+    background-color: var(--vn-section-hover-color);
+}
 </style>
 <i18n>
     es:

src/components/TicketProblems.vue

@@ -2,26 +2,9 @@
 defineProps({ row: { type: Object, required: true } });
 </script>
 <template>
-    <span>
+    <span class="q-gutter-x-xs">
         <QIcon
-            v-if="row.isTaxDataChecked === 0"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row.risk"
+            v-if="row?.risk"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
@@ -30,10 +13,57 @@ defineProps({ row: { type: Object, required: true } });
                 {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
             </QTooltip>
         </QIcon>
-        <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
+        <QIcon
+            v-if="row?.hasComponentLack"
+            name="vn:components"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
+            <QTooltip>
+                {{ $t('ticket.summary.hasItemDelay') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
+            <QTooltip>
+                {{ $t('salesTicketsTable.hasItemLost') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasItemShortage"
+            name="vn:unavailable"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
+            <QTooltip>
+                {{ $t('ticketList.rounding') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasTicketRequest"
+            name="vn:buyrequest"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="!row?.isTaxDataChecked === 0"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
         </QIcon>
     </span>

src/components/VnTable/VnTable.vue

@@ -500,7 +500,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                         <QCard
                             bordered
                             flat
-                            class="row no-wrap justify-between cursor-pointer"
+                            class="row no-wrap justify-between cursor-pointer q-pa-sm"
                             @click="
                                 (_, row) => {
                                     $props.rowClick && $props.rowClick(row);
@@ -581,7 +581,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                             <!-- Actions -->
                             <QCardSection
                                 v-if="colsMap.tableActions"
-                                class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
                                 @click="stopEventPropagation($event)"
                             >
                                 <QBtn
@@ -807,12 +806,15 @@ es:
 
 .grid-two {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
-    max-width: 100%;
-    margin: 0 auto;
-    overflow: scroll;
-    white-space: wrap;
-    width: 100%;
+    grid-template-columns: 2fr 2fr;
+    .vn-label-value {
+        flex-direction: column;
+        white-space: nowrap;
+        .fields {
+            display: flex;
+        }
+    }
+    white-space: nowrap;
 }
 
 .w-80 {

src/components/__tests__/UserPanel.spec.js

@@ -0,0 +1,61 @@
+import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import UserPanel from 'src/components/UserPanel.vue';
+import axios from 'axios';
+import { useState } from 'src/composables/useState';
+
+describe('UserPanel', () => {
+    let wrapper;
+    let vm;
+    let state;
+
+    beforeEach(() => {
+        wrapper = createWrapper(UserPanel, {});
+        state = useState();
+        state.setUser({
+            id: 115,
+            name: 'itmanagement',
+            nickname: 'itManagementNick',
+            lang: 'en',
+            darkMode: false,
+            companyFk: 442,
+            warehouseFk: 1,
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should fetch warehouses data on mounted', async () => {
+        const fetchData = wrapper.findComponent({ name: 'FetchData' });
+        expect(fetchData.props('url')).toBe('Warehouses');
+        expect(fetchData.props('autoLoad')).toBe(true);
+    });
+
+    it('should toggle dark mode correctly and update preferences', async () => {
+        await vm.saveDarkMode(true);
+        expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+        expect(vm.user.darkMode).toBe(true);
+        vm.updatePreferences();
+        expect(vm.darkMode).toBe(true);
+    });
+
+    it('should change user language and update preferences', async () => {
+        const userLanguage = 'es';
+        await vm.saveLanguage(userLanguage);
+        expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
+        expect(vm.user.lang).toBe(userLanguage);
+        vm.updatePreferences();
+        expect(vm.locale).toBe(userLanguage);
+    });
+
+    it('should update user data', async () => {
+        const key = 'name';
+        const value = 'itboss';
+        await vm.saveUserData(key, value);
+        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
+    });
+});

src/components/common/VnSelectSupplier.vue

@@ -0,0 +1,35 @@
+<script setup>
+import { computed } from 'vue';
+import VnSelect from 'components/common/VnSelect.vue';
+
+const model = defineModel({ type: [String, Number, Object] });
+const url = 'Suppliers';
+</script>
+
+<template>
+    <VnSelect
+        :label="$t('globals.supplier')"
+        v-bind="$attrs"
+        v-model="model"
+        :url="url"
+        option-value="id"
+        option-label="nickname"
+        :fields="['id', 'name', 'nickname', 'nif']"
+        sort-by="name ASC"
+    >
+        <template #option="scope">
+            <QItem v-bind="scope.itemProps">
+                <QItemSection>
+                    <QItemLabel>
+                        {{ scope.opt?.name }}
+                    </QItemLabel>
+                    <QItemLabel caption>
+                        {{
+                            `#${scope.opt?.id} , ${scope.opt?.nickname} (${scope.opt?.nif})`
+                        }}
+                    </QItemLabel>
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnSelect>
+</template>

src/components/common/VnSelectWorker.vue

@@ -53,6 +53,7 @@ const url = computed(() => {
         :fields="['id', 'name', 'nickname', 'code']"
         :filter-options="['id', 'name', 'nickname', 'code']"
         sort-by="nickname ASC"
+        data-cy="vnWorkerSelect"
     >
         <template #prepend v-if="$props.hasAvatar">
             <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />

src/components/ui/CardSummary.vue

@@ -15,6 +15,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     entityId: {
         type: [Number, String],
         default: null,
@@ -34,6 +38,7 @@ const isSummary = ref();
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
+    userFilter: props.userFilter,
     skip: 0,
 });
 const { store } = arrayData;

src/components/ui/VnPaginate.vue

@@ -123,7 +123,7 @@ watch(
     () => props.data,
     () => {
         store.data = props.data;
-    }
+    },
 );
 
 watch(
@@ -132,12 +132,12 @@ watch(
         if (!mounted.value) return;
         emit('onChange', data);
     },
-    { immediate: true }
+    { immediate: true },
 );
 
 watch(
     () => [props.url, props.filter],
-    ([url, filter]) => mounted.value && fetch({ url, filter })
+    ([url, filter]) => mounted.value && fetch({ url, filter }),
 );
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
@@ -198,7 +198,7 @@ function endPagination() {
 async function onLoad(index, done) {
     if (!store.data || !mounted.value) return done();
 
-    if (store.data.length === 0 || !props.url) return done(false);
+    if (store.data.length === 0 || !arrayData.store.url) return done(false);
 
     pagination.value.page = pagination.value.page + 1;
 

src/composables/useArrayData.js

@@ -93,6 +93,9 @@ export function useArrayData(key, userOptions) {
 
         if (params.filter.where || exprFilter)
             params.filter.where = { ...params.filter.where, ...exprFilter };
+
+        if (!params?.filter?.order?.length) delete params?.filter?.order;
+
         params.filter = JSON.stringify(params.filter);
 
         store.isLoading = true;

src/css/fonts/icon.svg

@@ -127,6 +127,7 @@
 <glyph unicode="&#xe975;" glyph-name="stowaway" d="M1006.933 452.267l-260.267 106.667 29.867 29.867c4.267 4.267 4.267 12.8 4.267 17.067-4.267 4.267-8.533 8.533-12.8 8.533h-157.867c0 93.867 76.8 157.867 174.933 157.867 4.267 0 8.533 4.267 12.8 8.533s4.267 8.533 0 17.067l-81.067 153.6c-4.267 0-12.8 4.267-17.067 4.267-46.933 0-93.867-17.067-132.267-42.667-21.333-17.067-42.667-38.4-55.467-59.733-12.8 21.333-29.867 42.667-55.467 59.733-34.133 12.8-81.067 34.133-128 34.133-4.267 0-12.8-4.267-12.8-8.533l-85.333-153.6c-4.267-4.267-4.267-4.267 0-12.8 4.267-4.267 8.533-8.533 12.8-8.533 98.133 0 174.933-59.733 174.933-153.6v0h-140.8c-4.267 0-12.8-4.267-12.8-8.533-8.533-4.267-4.267-17.067 0-21.333l21.333-21.333-277.333-110.933c-8.533-8.533-12.8-12.8-8.533-21.333 0-8.533 8.533-12.8 17.067-12.8v0l98.133 4.267-81.067-85.333c0-4.267-4.267-8.533 0-12.8 0-4.267 4.267-8.533 8.533-8.533l85.333-34.133v-179.2c0-8.533 4.267-12.8 8.533-12.8l358.4-145.067h8.533l358.4 145.067c4.267 4.267 8.533 8.533 8.533 12.8v179.2l85.333 34.133c4.267 0 8.533 4.267 8.533 8.533s0 8.533-4.267 12.8l-68.267 98.133 102.4-4.267c8.533 0 12.8 4.267 17.067 12.8 8.533 0 4.267 4.267-4.267 12.8zM110.933 456.533l196.267 76.8 8.533-8.533-166.4-64-38.4-4.267zM153.6 285.867v0l-68.267 34.133 68.267 98.133 328.533-132.267-68.267-98.133-260.267 98.133zM490.667-29.867l-328.533 132.267v153.6l243.2-98.133h12.8c0 0 0 0 4.267 0v0c0 0 4.267 0 4.267 4.267l64 85.333c0-4.267 0-277.333 0-277.333zM490.667 324.267l-298.667 115.2 149.333 64 153.6-157.867v-17.067h-4.267zM529.067 337.067l157.867 157.867 140.8-55.467-298.667-115.2c0 0 0 12.8 0 12.8zM849.067 102.4l-328.533-132.267v281.6l64-85.333c0 0 0-4.267 4.267-4.267v0h17.067l243.2 98.133v-157.867zM938.667 324.267l-324.267-132.267-68.267 98.133 328.533 132.267 64-98.133zM870.4 460.8l-157.867 64 12.8 8.533 187.733-76.8-42.667 4.267z" />
 <glyph unicode="&#xe976;" glyph-name="supplier" d="M797.867 405.333l98.133 34.133 21.333-59.733-98.133-34.133-21.333 59.733zM1019.733 341.333c-4.267-8.533-8.533-12.8-17.067-17.067l-332.8-119.467c4.267-4.267 8.533-12.8 12.8-17.067l277.333 102.4 21.333-59.733-277.333-102.4c0-8.533 4.267-12.8 4.267-21.333 0-85.333-68.267-157.867-157.867-157.867-85.333 0-157.867 68.267-157.867 157.867 0 55.467 29.867 106.667 72.533 132.267l-217.6 610.133c-8.533 25.6-38.4 42.667-68.267 29.867l-157.867-55.467-21.333 59.733 157.867 59.733c59.733 17.067 123.733-12.8 149.333-72.533l221.867-614.4c8.533 0 12.8 0 21.333 4.267l-119.467 332.8c-4.267 17.067 4.267 34.133 17.067 38.4l136.533 51.2c0 0 0 0 0 0l115.2 42.667c0 0 0 0 0 0l136.533 51.2c8.533 4.267 17.067 4.267 25.6 0s12.8-8.533 17.067-17.067l145.067-396.8c0-4.267 0-12.8-4.267-21.333zM695.467 657.067l-59.733-21.333 8.533-21.333 59.733 21.333-8.533 21.333zM644.267 106.667c0 51.2-42.667 93.867-93.867 93.867s-93.867-42.667-93.867-93.867c0-51.2 42.667-93.867 93.867-93.867s93.867 38.4 93.867 93.867zM951.467 371.2l-119.467 332.8-76.8-29.867 17.067-51.2c4.267-8.533 4.267-17.067 0-25.6s-8.533-12.8-17.067-17.067l-115.2-42.667c-4.267 0-8.533 0-12.8 0-12.8 0-25.6 8.533-29.867 21.333l-17.067 51.2-76.8-29.867 119.467-332.8 328.533 123.733z" />
 <glyph unicode="&#xe977;" glyph-name="supplierfalse" d="M198.827 882.773c22.187 0.427 41.813-14.080 48.64-34.133l8.107-22.187 105.813-105.813-54.187 149.333c-25.6 59.733-89.6 89.6-149.333 72.533l-13.653-5.12 54.613-54.613zM708.693 129.28l-173.653 173.653 15.36-43.093c-8.533-4.267-12.8-4.267-21.333-4.267l-29.867 83.2-108.373 108.373 74.24-208.64c-42.667-25.6-72.533-76.8-72.533-132.267 0-89.6 72.533-157.867 157.867-157.867 89.6 0 157.867 72.533 157.867 157.867 0 8.533-4.267 12.8-4.267 21.333l4.693 1.707zM550.4 12.373c-51.2 0-93.867 42.667-93.867 93.867s42.667 93.867 93.867 93.867 93.867-42.667 93.867-93.867c0-55.467-42.667-93.867-93.867-93.867zM960 289.707l-122.453-45.227 49.493-49.067 94.293 34.56zM504.32 577.707l-0.853 2.133 76.8 29.867 17.067-51.2c4.267-12.8 17.067-21.333 29.867-21.333 4.267 0 8.533 0 12.8 0l115.2 42.667c8.533 4.267 12.8 8.533 17.067 17.067s4.267 17.067 0 25.6l-17.067 51.2 76.8 29.867 119.467-332.8-174.507-65.707 45.653-45.653 180.053 64.427c8.533 4.267 12.8 8.533 17.067 17.067s4.267 17.067 4.267 21.333l-145.067 396.8c-4.267 8.533-8.533 12.8-17.067 17.067s-17.067 4.267-25.6 0l-136.533-51.2-115.2-42.667-134.4-50.347 54.187-54.187zM695.467 656.64l8.533-21.333-59.733-21.333-8.533 21.333 59.733 21.333zM896 439.040l-98.133-34.133 21.333-59.733 98.133 34.133zM39.253 960c-9.813 0-20.053-3.84-27.733-11.52-15.36-15.787-15.36-40.533 0-55.893l945.493-945.067c7.68-7.68 17.493-11.52 27.733-11.52 9.813 0 20.053 3.84 27.733 11.52 15.36 15.787 15.36 40.533 0 55.893l-945.493 945.067c-7.68 7.68-17.493 11.52-27.733 11.52z" />
+<glyph unicode="&#xe978;" glyph-name="inactive-car" d="M1024 900.267l-59.733 59.733-964.267-964.267 59.733-59.733 964.267 964.267zM0 55.893v448.853l119.467 341.333c5.547 17.067 15.787 30.72 30.72 41.387 14.507 10.24 31.147 15.787 49.067 15.787h625.92c6.827 0 13.653-0.853 20.053-2.133l-111.36-111.36h-514.987l-59.733-170.667h403.2l-113.92-113.92h-334.507v-284.587h50.773l-164.693-164.693zM316.587 423.253c8.96-8.96 15.787-19.627 19.627-30.72l-110.080-110.080c-11.52 4.267-21.76 10.667-30.72 19.627-16.64 16.64-24.747 36.693-24.747 60.587s8.107 43.947 24.747 60.587c16.64 16.64 36.693 24.747 60.587 24.747s43.947-8.107 60.587-24.747zM768 277.333c-23.893 0-43.947 8.107-60.587 24.747s-24.747 36.693-24.747 60.587 8.107 43.947 24.747 60.587c16.64 16.64 36.693 24.747 60.587 24.747s43.947-8.107 60.587-24.747c16.64-16.64 24.747-36.693 24.747-60.587s-8.107-43.947-24.747-60.587c-16.64-16.64-36.693-24.747-60.587-24.747zM936.96 753.067l87.040-248.32v-455.253c0-16.213-5.547-29.44-16.213-40.533s-24.32-16.213-40.533-16.213h-56.747c-16.213 0-29.44 5.547-40.533 16.213s-16.213 24.32-16.213 40.533v56.747h-563.2l113.92 113.92h505.6v284.587h-221.44l113.92 113.92h61.867l-16.213 46.080 88.32 88.32z" />
 <glyph unicode="&#xe979;" glyph-name="tags" d="M729.6 960c-42.667 0-89.6 0-132.267 0-21.333 0-38.4-8.533-51.2-21.333-140.8-140.8-281.6-281.6-422.4-422.4-25.6-25.6-25.6-51.2 0-76.8 93.867-93.867 187.733-187.733 281.6-281.6 25.6-25.6 51.2-25.6 76.8 0 140.8 140.8 281.6 281.6 422.4 422.4 17.067 12.8 21.333 29.867 21.333 51.2 0 93.867 0 183.467 0 277.333 0 34.133-17.067 51.2-51.2 51.2-51.2 0-98.133 0-145.067 0zM682.667 763.733c0 25.6 17.067 46.933 42.667 46.933s46.933-21.333 46.933-46.933c0-25.6-21.333-46.933-46.933-46.933-21.333 0-42.667 21.333-42.667 46.933zM878.933 482.133c4.267-12.8 0-21.333-8.533-29.867-34.133-51.2-64-98.133-98.133-149.333-76.8-115.2-153.6-234.667-230.4-349.867-12.8-17.067-21.333-21.333-38.4-8.533-115.2 76.8-226.133 149.333-337.067 226.133-17.067 8.533-17.067 21.333-8.533 38.4 12.8 21.333 29.867 46.933 42.667 68.267 8.533 12.8 8.533 12.8 17.067 0 55.467-55.467 115.2-115.2 170.667-170.667 8.533-8.533 17.067-17.067 29.867-21.333 29.867-12.8 55.467-4.267 76.8 21.333 123.733 123.733 247.467 247.467 371.2 371.2 4.267 4.267 4.267 8.533 8.533 12.8 0-8.533 0-8.533 4.267-8.533z" />
 <glyph unicode="&#xe97a;" glyph-name="tax" d="M448 192c0 174.933 145.067 320 320 320 76.8 0 145.067-25.6 196.267-68.267v324.267c4.267 51.2-38.4 98.133-93.867 98.133h-204.8c-21.333 55.467-72.533 93.867-136.533 93.867s-115.2-38.4-136.533-98.133h-209.067c-55.467 0-98.133-42.667-98.133-93.867v-674.133c0-51.2 42.667-98.133 98.133-98.133h332.8c-42.667 55.467-68.267 123.733-68.267 196.267zM529.067 861.867c29.867 0 46.933-21.333 46.933-46.933 0-29.867-25.6-46.933-46.933-46.933-29.867 0-46.933 21.333-46.933 46.933-4.267 29.867 17.067 46.933 46.933 46.933zM708.267 247.467c-8.533 0-12.8 4.267-17.067 8.533s-8.533 8.533-8.533 17.067v17.067c0 8.533 0 12.8 4.267 17.067s8.533 8.533 17.067 8.533c8.533 0 12.8-4.267 17.067-8.533s4.267-12.8 4.267-17.067v-12.8c4.267-21.333-4.267-29.867-17.067-29.867zM870.4 132.267c4.267-4.267 4.267-12.8 4.267-17.067v-21.333c0-12.8-8.533-21.333-21.333-21.333-8.533 0-12.8 4.267-17.067 8.533s-8.533 12.8-8.533 17.067v17.067c0 8.533 4.267 12.8 8.533 17.067s8.533 8.533 17.067 8.533c8.533 0 12.8-4.267 17.067-8.533zM768 448c-140.8 0-256-115.2-256-256s115.2-256 256-256 256 115.2 256 256-115.2 256-256 256zM635.733 273.067v17.067c0 21.333 4.267 34.133 17.067 46.933s29.867 17.067 51.2 17.067c21.333 0 38.4-4.267 51.2-17.067s17.067-29.867 17.067-46.933v-17.067c0-21.333-4.267-34.133-17.067-46.933s-29.867-17.067-51.2-17.067-38.4 4.267-51.2 17.067c-8.533 12.8-17.067 29.867-17.067 46.933zM721.067 59.733l-34.133 17.067 153.6 243.2 34.133-17.067-153.6-243.2zM925.867 98.133c0-21.333-4.267-34.133-17.067-46.933s-29.867-17.067-51.2-17.067-38.4 4.267-51.2 17.067c-12.8 12.8-21.333 25.6-21.333 46.933v17.067c0 21.333 4.267 34.133 17.067 46.933s29.867 17.067 51.2 17.067 38.4-4.267 51.2-17.067c12.8-12.8 17.067-29.867 17.067-46.933v-17.067h4.267z" />
 <glyph unicode="&#xe97b;" glyph-name="thermometer" d="M641.567 326.792v35.527h64.784v25.078h-64.784v119.118h64.784v25.078h-64.784v119.118h64.784v25.078h-64.784v121.208h64.784v25.078h-64.784v8.359c0 71.053-58.514 129.567-129.567 129.567s-129.567-58.514-129.567-129.567v-503.641c-54.335-39.706-87.771-104.49-87.771-173.453 0-119.118 96.131-217.339 217.339-217.339 119.118 0 217.339 96.131 217.339 217.339 0 66.873-33.437 131.657-87.771 173.453zM512-28.473c-100.31 0-179.722 81.502-179.722 179.722 0 64.784 33.437 123.298 87.771 154.645v524.539c0 50.155 41.796 91.951 91.951 91.951s91.951-41.796 91.951-91.951v-522.449c54.335-31.347 87.771-89.861 87.771-154.645 0-100.31-79.412-181.812-179.722-181.812zM652.016 435.461v25.078h35.527v-25.078h-35.527zM652.016 579.657v25.078h35.527v-25.078h-35.527zM652.016 723.853v25.078h35.527v-25.078h-35.527zM568.424 284.996v543.347c0 0 0 0 0 0s0 0 0 0v0 0c0 31.347-25.078 56.424-56.424 56.424s-56.424-25.078-56.424-56.424v0-543.347c-52.245-20.898-87.771-73.143-87.771-131.657 0-79.412 64.784-144.196 144.196-144.196s144.196 64.784 144.196 144.196c0 58.514-35.527 108.669-87.771 131.657zM470.204 824.163v4.18c0 22.988 18.808 41.796 41.796 41.796s41.796-18.808 41.796-41.796v-219.429h-85.682v215.249z" />

src/css/icons.scss

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'icon';
-  src:  url('fonts/icon.eot?7j3xju');
-  src:  url('fonts/icon.eot?7j3xju#iefix') format('embedded-opentype'),
-    url('fonts/icon.ttf?7j3xju') format('truetype'),
-    url('fonts/icon.woff?7j3xju') format('woff'),
-    url('fonts/icon.svg?7j3xju#icon') format('svg');
+  src:  url('fonts/icon.eot?uocffs');
+  src:  url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
+    url('fonts/icon.ttf?uocffs') format('truetype'),
+    url('fonts/icon.woff?uocffs') format('woff'),
+    url('fonts/icon.svg?uocffs#icon') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -25,6 +25,9 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-inactive-car:before {
+  content: "\e978";
+}
 .icon-hasItemLost:before {
   content: "\e957";
 }

src/i18n/locale/en.yml

@@ -326,6 +326,7 @@ globals:
         ticketsMonitor: Tickets monitor
         clientsActionsMonitor: Clients and actions
         serial: Serial
+        business: Business
         medical: Mutual
         pit: IRPF
         wasteRecalc: Waste recaclulate
@@ -377,7 +378,7 @@ login:
     loginError: Invalid username or password
     fieldRequired: This field is required
     twoFactorRequired: Two-factor verification required
-twoFactorRequired:
+twoFactor:
     validate: Validate
     insert: Enter the verification code
     explanation: >-
@@ -456,48 +457,6 @@ ticket:
         consigneeStreet: Street
     create:
         address: Address
-invoiceOut:
-    card:
-        issued: Issued
-        customerCard: Customer card
-        ticketList: Ticket List
-    summary:
-        issued: Issued
-        dued: Due
-        booked: Booked
-        taxBreakdown: Tax breakdown
-        taxableBase: Taxable base
-        rate: Rate
-        fee: Fee
-        tickets: Tickets
-        totalWithVat: Amount
-    globalInvoices:
-        errors:
-            chooseValidClient: Choose a valid client
-            chooseValidCompany: Choose a valid company
-            chooseValidPrinter: Choose a valid printer
-            chooseValidSerialType: Choose a serial type
-            fillDates: Invoice date and the max date should be filled
-            invoiceDateLessThanMaxDate: Invoice date can not be less than max date
-            invoiceWithFutureDate: Exists an invoice with a future date
-            noTicketsToInvoice: There are not tickets to invoice
-            criticalInvoiceError: 'Critical invoicing error, process stopped'
-            invalidSerialTypeForAll: The serial type must be global when invoicing all clients
-        table:
-            addressId: Address id
-            streetAddress: Street
-        statusCard:
-            percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}'
-            pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs'
-    negativeBases:
-        clientId: Client Id
-        base: Base
-        active: Active
-        hasToInvoice: Has to Invoice
-        verifiedData: Verified Data
-        comercial: Comercial
-        errors:
-            downloadCsvFailed: CSV download failed
 department:
     chat: Chat
     bossDepartment: Boss Department
@@ -509,6 +468,24 @@ department:
     hasToSendMail: Send check-ins by email
     departmentRemoved: Department removed
 worker:
+    pageTitles:
+        workers: Workers
+        list: List
+        basicData: Basic data
+        summary: Summary
+        notifications: Notifications
+        workerCreate: New worker
+        department: Department
+        pda: PDA
+        notes: Notas
+        dms: My documentation
+        pbx: Private Branch Exchange
+        log: Log
+        calendar: Calendar
+        timeControl: Time control
+        locker: Locker
+        balance: Balance
+        medical: Medical
     list:
         department: Department
         schedule: Schedule
@@ -524,15 +501,24 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
-        fiDueDate: FI due date
+        fiDueDate: DNI expiration date
         sex: Sex
-        seniority: Seniority
+        seniority: Antiquity
         fi: DNI/NIE/NIF
         birth: Birth
         isFreelance: Freelance
         isSsDiscounted: SS Bonification
         hasMachineryAuthorized: Machinery authorized
         isDisable: Disable
+        business: Business
+        started: Started
+        ended: Ended
+        reasonEnd: Reason End
+        department: Departament
+        workerBusinessCategory: Worker Business Category
+        notes: Notes
+        workCenter: Center
+        professionalCategory: Professional Category
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -591,6 +577,23 @@ worker:
         sizeLimit: Size limit
         isOnReservationMode: Reservation mode
         machine: Machine
+    business:
+        tableVisibleColumns:
+            started: Start Date
+            ended: End Date
+            company: Company
+            reasonEnd: Reason for Termination
+            department: Department
+            professionalCategory: Professional Category
+            calendarType: Work Calendar
+            workCenter: Work Center
+            payrollCategories: Contract Category
+            occupationCode: Contribution Code
+            rate: Rate
+            businessType: Contract Type
+            amount: Salary
+            basicSalary: Transport Workers Salary
+            notes: Notes
 wagon:
     type:
         submit: Submit

src/i18n/locale/es.yml

@@ -326,6 +326,7 @@ globals:
         ticketsMonitor: Monitor de tickets
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
+        business: Contratos
         medical: Mutua
         pit: IRPF
         wasteRecalc: Recalcular mermas
@@ -481,6 +482,26 @@ department:
     hasToSendMail: Enviar fichadas por mail
     departmentRemoved: Departamento eliminado
 worker:
+    pageTitles:
+        workers: Trabajadores
+        list: Listado
+        basicData: Datos básicos
+        summary: Resumen
+        notifications: Notificaciones
+        workerCreate: Nuevo trabajador
+        department: Departamentos
+        pda: PDA
+        notes: Notas
+        dms: Mi documentación
+        pbx: Centralita
+        log: Historial
+        calendar: Calendario
+        timeControl: Control de horario
+        locker: Taquilla
+        balance: Balance
+        business: Contrato
+        formation: Formación
+        medical: Mutua
     list:
         department: Departamento
         schedule: Horario
@@ -505,6 +526,15 @@ worker:
         isSsDiscounted: Bonificación SS
         hasMachineryAuthorized: Autorizado para maquinaria
         isDisable: Deshabilitado
+        business: Contrato
+        started: Antigüedad
+        ended: Fin
+        reasonEnd: Motivo finalización
+        department: Departamento
+        workerBusinessCategory: Categoria profesional
+        notes: Notas
+        workCenter: Centro
+        professionalCategory: Categoria profesional
     notificationsManager:
         activeNotifications: Notificaciones activas
         availableNotifications: Notificaciones disponibles
@@ -551,6 +581,23 @@ worker:
             debit: Debe
             credit: Haber
             concept: Concepto
+    business:
+        tableVisibleColumns:
+            started: Fecha inicio
+            ended: Fecha fin
+            company: Empresa
+            reasonEnd: Motivo finalización
+            department: Departamento
+            professionalCategory: Categoria profesional
+            calendarType: Calendario laboral
+            workCenter: Centro
+            payrollCategories: Categoria contrato
+            occupationCode: Cotización
+            rate: Tarifa
+            businessType: Contrato
+            amount: Salario
+            basicSalary: Salario transportistas
+            notes: Notas
     operator:
         numberOfWagons: Número de vagones
         train: tren
@@ -563,7 +610,6 @@ worker:
         sizeLimit: Tamaño límite
         isOnReservationMode: Modo de reserva
         machine: Máquina
-
 wagon:
     type:
         submit: Guardar

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -192,6 +192,7 @@ const debtWarning = computed(() => {
                         query: {
                             createForm: JSON.stringify({
                                 clientFk: entity.id,
+                                addressId: entity.defaultAddressFk,
                             }),
                         },
                     }"

src/pages/Customer/composables/getAddresses.js

@@ -1,8 +1,9 @@
 import axios from 'axios';
 
-export async function getAddresses(clientId) {   
+export async function getAddresses(clientId, _filter = {}) {   
     if (!clientId) return;
     const filter = {
+        ..._filter,
         fields: ['nickname', 'street', 'city', 'id'],
         where: { isActive: true },
         order: 'nickname ASC',

src/pages/Customer/composables/getClient.js

@@ -1,7 +1,8 @@
 import axios from 'axios';
 
-export async function getClient(clientId) {
+export async function getClient(clientId, _filter = {}) {
     const filter = {
+        ..._filter,
         include: {
             relation: 'defaultAddress',
             scope: {

src/pages/Entry/Card/EntryBasicData.vue

@@ -12,6 +12,7 @@ import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toDate } from 'src/filters';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -51,28 +52,12 @@ const onFilterTravelSelected = (formData, id) => {
     >
         <template #form="{ data }">
             <VnRow>
-                <VnSelect
-                    :label="t('globals.supplier')"
+                <VnSelectSupplier
                     v-model="data.supplierFk"
-                    url="Suppliers"
-                    option-value="id"
-                    option-label="nickname"
-                    :fields="['id', 'nickname']"
                     hide-selected
                     :required="true"
                     map-options
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                <QItemLabel caption>
-                                    {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                />
                 <VnSelectDialog
                     :label="t('entry.basicData.travel')"
                     v-model="data.travelFk"

src/pages/Entry/EntryBuysTableDialog.vue

@@ -134,6 +134,7 @@ function downloadCSV(rows) {
                                     @click="
                                         openReport(`Entries/${entityId}/labelSupplier`)
                                     "
+                                    data-cy="printLabelsBtn"
                                 />
                             </template>
                             <template #body="props">

src/pages/Entry/EntryCreate.vue

@@ -13,6 +13,7 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
 import { toDate } from 'src/filters';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const state = useState();
 const { t } = useI18n();
@@ -26,7 +27,6 @@ const newEntryForm = reactive({
     travelFk: Number(route.query?.travelFk) || null,
     companyFk: user.value.companyFk || null,
 });
-const suppliersOptions = ref([]);
 const travelsOptions = ref([]);
 const companiesOptions = ref([]);
 
@@ -36,13 +36,6 @@ const redirectToEntryBasicData = (_, { id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Suppliers"
-        :filter="{ fields: ['id', 'nickname'] }"
-        order="nickname"
-        @on-fetch="(data) => (suppliersOptions = data)"
-        auto-load
-    />
     <FetchData
         url="Travels/filter"
         :filter="{ fields: ['id', 'warehouseInName'] }"
@@ -79,28 +72,13 @@ const redirectToEntryBasicData = (_, { id }) => {
         >
             <template #form="{ data, validate }">
                 <VnRow>
-                    <VnSelect
-                        :label="t('Supplier')"
+                    <VnSelectSupplier
                         class="full-width"
                         v-model="data.supplierFk"
-                        :options="suppliersOptions"
-                        option-value="id"
-                        option-label="nickname"
                         hide-selected
                         :required="true"
                         :rules="validate('entry.supplierFk')"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        #{{ scope.opt?.id }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </VnRow>
                 <VnRow>
                     <VnSelect
@@ -152,7 +130,6 @@ const redirectToEntryBasicData = (_, { id }) => {
 
 <i18n>
     es:
-        Supplier: Proveedor
         Travel: Envío
         Company: Empresa
 </i18n>

src/pages/Entry/EntryFilter.vue

@@ -7,6 +7,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -115,34 +116,14 @@ const companiesOptions = ref([]);
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelect
-                        :label="t('entryFilter.params.supplierFk')"
+                    <VnSelectSupplier
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
-                        url="Suppliers"
-                        option-value="id"
-                        option-label="name"
-                        :fields="['id', 'name', 'nickname']"
-                        :filter-options="['id', 'name', 'nickname']"
-                        sort-by="nickname"
                         hide-selected
                         dense
                         outlined
                         rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ scope.opt?.name}}
-                                    </QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -202,4 +183,4 @@ const companiesOptions = ref([]);
             </QItem>
         </template>
     </VnFilterPanel>
-</template>
+</template>

src/pages/Entry/EntryLatestBuysFilter.vue

@@ -7,6 +7,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 
@@ -18,7 +19,6 @@ defineProps({
 });
 
 const itemTypeWorkersOptions = ref([]);
-const suppliersOptions = ref([]);
 const tagValues = ref([]);
 </script>
 
@@ -30,13 +30,6 @@ const tagValues = ref([]);
         :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
         @on-fetch="(data) => (itemTypeWorkersOptions = data)"
     />
-    <FetchData
-        url="Suppliers"
-        limit="30"
-        auto-load
-        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (suppliersOptions = data)"
-    />
     <ItemsFilterPanel :data-key="dataKey" :custom-tags="['tags']">
         <template #body="{ params, searchFn }">
             <QItem class="q-my-md">
@@ -57,31 +50,14 @@ const tagValues = ref([]);
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelect
-                        :label="t('globals.params.supplierFk')"
+                    <VnSelectSupplier
                         v-model="params.supplierFk"
-                        :options="suppliersOptions"
-                        option-value="id"
-                        option-label="name"
+                        @update:model-value="searchFn()"
+                        hide-selected
                         dense
                         outlined
                         rounded
-                        use-input
-                        @update:model-value="searchFn()"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ scope.opt?.name}}
-                                    </QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem class="q-my-md">

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -13,6 +13,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import axios from 'axios';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 
@@ -115,27 +116,12 @@ function deleteFile(dmsFk) {
     >
         <template #form="{ data }">
             <VnRow>
-                <VnSelect
-                    :required="true"
-                    :label="t('supplierFk')"
+                <VnSelectSupplier
                     v-model="data.supplierFk"
-                    option-value="id"
-                    option-label="nickname"
-                    url="Suppliers"
-                    :fields="['id', 'nickname']"
-                    sort-by="nickname"
+                    hide-selected
                     :is-clearable="false"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{
-                                    `${scope.opt.id} - ${scope.opt.nickname}`
-                                }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                    :required="true"
+                />
                 <VnInput
                     clearable
                     clear-icon="close"

src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue

@@ -226,6 +226,7 @@ const createInvoiceInCorrection = async () => {
         v-ripple
         clickable
         @click="triggerMenu('correct')"
+        data-cy="createCorrectiveItem"
     >
         <QItemSection
             >{{ t('invoiceIn.descriptorMenu.createCorrective') }}...</QItemSection

src/pages/InvoiceIn/InvoiceInCreate.vue

@@ -12,6 +12,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const state = useState();
 const { t } = useI18n();
@@ -60,28 +61,12 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
         >
             <template #form="{ data, validate }">
                 <VnRow>
-                    <VnSelect
-                        url="Suppliers"
-                        :fields="['id', 'nickname']"
-                        :label="t('Supplier')"
+                    <VnSelectSupplier
                         v-model="data.supplierFk"
-                        option-value="id"
-                        option-label="nickname"
                         hide-selected
                         :required="true"
                         :rules="validate('entry.supplierFk')"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        #{{ scope.opt?.id }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                     <VnInput
                         :label="t('invoiceIn.list.supplierRef')"
                         v-model="data.supplierRef"
@@ -111,7 +96,6 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
 
 <i18n>
     es:
-        Supplier: Proveedor
         Travel: Envío
         Company: Empresa
 </i18n>

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -6,6 +6,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { dateRange } from 'src/filters';
 import { date } from 'quasar';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 defineProps({ dataKey: { type: String, required: true } });
 const dateFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZ';
@@ -65,29 +66,12 @@ function handleDaysAgo(params, daysAgo) {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelect
+                    <VnSelectSupplier
                         v-model="params.supplierFk"
-                        url="Suppliers"
-                        :fields="['id', 'nickname', 'name']"
-                        :label="getLocale('supplierFk')"
-                        option-label="nickname"
                         dense
                         outlined
                         rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ scope.opt?.name}}
-                                    </QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>

src/pages/InvoiceIn/InvoiceInList.vue

@@ -14,6 +14,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const user = useState().getUser();
 const { viewSummary } = useSummaryDialog();
@@ -148,7 +149,9 @@ const cols = computed(() => [
         <template #body>
             <VnTable
                 ref="tableRef"
-                :data-key
+                data-key="InvoiceInList"
+                url="InvoiceIns/filter"
+                :order="['issued DESC', 'id DESC']"
                 :create="{
                     urlCreate: 'InvoiceIns',
                     title: t('globals.createInvoiceIn'),
@@ -168,27 +171,11 @@ const cols = computed(() => [
                     </span>
                 </template>
                 <template #more-create-dialog="{ data }">
-                    <VnSelect
+                    <VnSelectSupplier
                         v-model="data.supplierFk"
-                        url="Suppliers"
-                        :fields="['id', 'name', 'nickname']"
-                        :label="t('globals.supplier')"
-                        option-value="id"
-                        option-label="nickname"
-                        :filter-options="['id', 'name', 'nickname']"
+                        hide-selected
                         :required="true"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        #{{ scope.opt?.id }}, {{ scope.opt?.name }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                     <VnInput
                         :label="t('invoiceIn.list.supplierRef')"
                         v-model="data.supplierRef"

src/pages/Item/Card/ItemDiary.vue

@@ -125,7 +125,7 @@ onMounted(async () => {
     inventoriedDate.value =
         (await axios.get('Configs/findOne')).data?.inventoried || today;
 
-    if (query.warehouseFk) ref.warehouseFk = query.warehouseFk;
+    if (query.warehouseFk) ref.warehouseFk = +query.warehouseFk;
     else if (!ref.warehouseFk && user.value) ref.warehouseFk = user.value.warehouseFk;
     if (ref.date) showWhatsBeforeInventory.value = true;
     ref.itemFk = route.params.id;
@@ -143,7 +143,7 @@ onMounted(async () => {
 const fetchItemBalances = async () => await arrayDataItemBalances.fetch({});
 
 const getBadgeAttrs = (_date) => {
-    const isSameDate = date.isSameDate(today.value, _date);
+    const isSameDate = date.isSameDate(today, _date);
     const attrs = {
         'text-color': isSameDate ? 'black' : 'white',
         color: isSameDate ? 'warning' : 'transparent',
@@ -153,8 +153,6 @@ const getBadgeAttrs = (_date) => {
 
 const scrollToToday = async () => {
     await nextTick();
-    const today = Date.vnNew();
-    today.setHours(0, 0, 0, 0);
     const todayCell = document.querySelector(`td[data-date="${today.toISOString()}"]`);
     if (todayCell) {
         todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' });

src/pages/Item/ItemListFilter.vue

@@ -12,6 +12,7 @@ import { QCheckbox } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import { useValidator } from 'src/composables/useValidator';
 import axios from 'axios';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 
@@ -246,34 +247,14 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelect
-                        :label="t('params.supplierFk')"
+                    <VnSelectSupplier
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
-                        url="Suppliers"
-                        option-value="id"
-                        option-label="name"
-                        :fields="['id', 'name', 'nickname']"
-                        :filter-options="['id', 'name', 'nickname']"
-                        sort-by="name ASC"
                         hide-selected
                         dense
                         outlined
                         rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ scope.opt?.name }}
-                                    </QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ `#${scope.opt?.id} , ${scope.opt?.nickname}` }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <!-- Tags filter -->

src/pages/Item/ItemTypeList.vue

@@ -5,6 +5,9 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -60,20 +63,17 @@ const columns = computed(() => [
         label: t('code'),
         isTitle: true,
         cardVisible: true,
-        create: true,
     },
     {
         align: 'left',
         name: 'name',
         label: t('globals.name'),
         cardVisible: true,
-        create: true,
     },
     {
         align: 'left',
         label: t('worker'),
         name: 'workerFk',
-        create: true,
         component: 'select',
         attrs: {
             url: 'Workers/search',
@@ -100,7 +100,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'categoryFk',
         label: t('ItemCategory'),
-        create: true,
         component: 'select',
         attrs: {
             options: itemCategoriesOptions.value,
@@ -112,7 +111,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'Temperature',
         label: t('Temperature'),
-        create: true,
         component: 'select',
         attrs: {
             options: temperatureOptions.value,
@@ -180,6 +178,29 @@ const columns = computed(() => [
                         <WorkerDescriptorProxy :id="row.workerFk" />
                     </span>
                 </template>
+                <template #more-create-dialog="{ data }">
+                    <VnInput v-model="data.code" :label="t('code')" data-cy="codeInput" />
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('globals.name')"
+                        data-cy="nameInput"
+                    />
+                    <VnSelectWorker v-model="data.workerFk" />
+                    <VnSelect
+                        :label="t('ItemCategory')"
+                        v-model="data.categoryFk"
+                        :options="itemCategoriesOptions"
+                        hide-selected
+                        data-cy="itemCategorySelect"
+                    />
+                    <VnSelect
+                        :label="t('Temperature')"
+                        v-model="data.temperatureFk"
+                        :options="temperatureOptions"
+                        hide-selected
+                        data-cy="temperatureSelect"
+                    />
+                </template>
             </VnTable>
         </template>
     </VnSection>

src/pages/Monitor/locale/en.yml

@@ -38,6 +38,7 @@ salesTicketsTable:
     payMethod: Pay method
     department: Department
     packing: ITP
+    hasItemLost: Item lost
 searchBar:
     label: Search tickets
     info: Search tickets by id or alias

src/pages/Monitor/locale/es.yml

@@ -39,6 +39,7 @@ salesTicketsTable:
     payMethod: Método de pago
     department: Departamento
     packing: ITP
+    hasItemLost: Artículo perdido
 searchBar:
     label: Buscar tickets
     info: Buscar tickets por identificador o alias

src/pages/Order/Card/OrderCatalog.vue

@@ -22,7 +22,6 @@ const catalogParams = {
 };
 const arrayData = useArrayData(dataKey, {
     url: 'Orders/CatalogFilter',
-    limit: 50,
     userParams: catalogParams,
 });
 const store = arrayData.store;
@@ -66,7 +65,7 @@ function extractValueTags(items) {
             .filter((k) => /^value\d+$/.test(k))
             .map((v) => x[v])
             .filter((v) => v)
-            .sort()
+            .sort(),
     );
     tagValue.value = resultValueTags;
 }
@@ -76,7 +75,7 @@ watch(
     (val) => {
         extractTags(val);
     },
-    { immediate: true }
+    { immediate: true },
 );
 </script>
 

src/pages/Order/OrderList.vue

@@ -81,7 +81,7 @@ const columns = computed(() => [
         label: t('module.created'),
         component: 'date',
         cardVisible: true,
-        format: (row) => toDateTimeFormat(row?.landed),
+        format: (row) => toDateTimeFormat(row?.created),
         columnField: {
             component: null,
         },

src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js

@@ -3,14 +3,17 @@ import axios from 'axios';
 import { getAgencies } from 'src/pages/Route/Agency/composables/getAgencies';
 
 vi.mock('axios');
+const response = { data: [{ agencyModeFk: 'Agency1' }, { agencyModeFk: 'Agency2' }] };
+axios.get.mockResolvedValue(response);
 
 describe('getAgencies', () => {
     afterEach(() => {
         vi.clearAllMocks();
     });
 
-    const generateParams = (formData) => ({
+    const generateParams = (formData, filter = {}) => ({
         params: {
+            filter: JSON.stringify(filter),
             warehouseFk: formData.warehouseId,
             addressFk: formData.addressId,
             landed: formData.landed,
@@ -23,10 +26,15 @@ describe('getAgencies', () => {
             addressId: '456',
             landed: 'true',
         };
+        const filter = {
+            fields: ['nickname', 'street', 'city', 'id'],
+            where: { isActive: true },
+            order: 'nickname ASC',
+        };
 
-        await getAgencies(formData);
+        await getAgencies(formData, null, filter);
 
-        expect(axios.get).toHaveBeenCalledWith('Agencies/getAgenciesWithWarehouse', generateParams(formData));
+        expect(axios.get).toHaveBeenCalledWith('Agencies/getAgenciesWithWarehouse', generateParams(formData, filter));
     });
 
     it('should not call API when formData is missing required landed field', async () => {
@@ -52,4 +60,23 @@ describe('getAgencies', () => {
 
         expect(axios.get).not.toHaveBeenCalled();
     });
+
+    it('should return options and agency when default agency is found', async () => {
+        const formData = { warehouseId: '123', addressId: '456', landed: 'true' };
+        const client = { defaultAddress: { agencyModeFk: 'Agency1' } };
+        
+        const { options, agency } = await getAgencies(formData, client);
+        
+        expect(options).toEqual(response.data);
+        expect(agency).toEqual(response.data[0]);
+      });
+
+      it('should return options and agency when client is not provided', async () => {
+        const formData = { warehouseId: '123', addressId: '456', landed: 'true' };
+        
+        const { options, agency } = await getAgencies(formData);
+        
+        expect(options).toEqual(response.data);
+        expect(agency).toBeNull();
+      });
 });

src/pages/Route/Agency/composables/getAgencies.js

@@ -1,12 +1,26 @@
 import axios from 'axios';
+import agency from 'src/router/modules/agency';
 
-export async function getAgencies(formData) {
+export async function getAgencies(formData, client, _filter = {}) {
     if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
+    
+    const filter = {
+        ..._filter
+    };
+
+    let defaultAgency = null;
     let params = {
+        filter: JSON.stringify(filter),
         warehouseFk: formData.warehouseId,
         addressFk: formData.addressId,
         landed: formData.landed,
     };
 
-    return await axios.get('Agencies/getAgenciesWithWarehouse', { params });
+    const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
+
+    if(data && client) {
+        defaultAgency = data.find((agency) => agency.agencyModeFk === client.defaultAddress.agencyModeFk );
+    };
+    
+    return {options: data, agency: defaultAgency}
 }

src/pages/Route/Card/RouteAutonomousFilter.vue

@@ -6,6 +6,7 @@ import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -19,7 +20,6 @@ const emit = defineEmits(['search']);
 
 const agencyList = ref([]);
 const agencyAgreementList = ref([]);
-const supplierList = ref([]);
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -58,14 +58,6 @@ const exprBuilder = (param, value) => {
         @on-fetch="(data) => (agencyAgreementList = data)"
         auto-load
     />
-    <FetchData
-        url="Suppliers"
-        :filter="{ fields: ['name'] }"
-        sort-by="name ASC"
-        limit="30"
-        @on-fetch="(data) => (supplierList = data)"
-        auto-load
-    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :expr-builder="exprBuilder"
@@ -123,14 +115,12 @@ const exprBuilder = (param, value) => {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-my-sm" v-if="supplierList">
+                <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnSelect
+                        <VnSelectSupplier
                             :label="t('Autonomous')"
                             v-model="params.supplierFk"
-                            :options="supplierList"
-                            option-value="name"
-                            option-label="name"
+                            hide-selected
                             dense
                             outlined
                             rounded

src/pages/Route/Roadmap/RoadmapBasicData.vue

@@ -6,29 +6,18 @@ import FormModel from 'components/FormModel.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
-import { ref } from 'vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 const router = useRouter();
 const route = useRoute();
 
-const supplierList = ref([]);
 const filter = { include: [{ relation: 'supplier' }] };
 const onSave = (data, response) => {
     router.push({ name: 'RoadmapSummary', params: { id: response?.id } });
 };
 </script>
 <template>
-    <FetchData
-        url="Suppliers"
-        auto-load
-        :filter="{ fields: ['id', 'nickname'] }"
-        sort-by="nickname"
-        limit="30"
-        @on-fetch="(data) => (supplierList = data)"
-    />
     <FormModel
         :url="`Roadmaps/${route.params?.id}`"
         observe-form-changes
@@ -56,27 +45,14 @@ const onSave = (data, response) => {
                 />
             </VnRow>
             <VnRow>
-                <VnSelect
+                <VnSelectSupplier
                     :label="t('Carrier')"
                     v-model="data.supplierFk"
-                    :options="supplierList"
-                    option-value="id"
-                    option-label="nickname"
                     emit-value
                     map-options
                     use-input
                     :input-debounce="0"
-                >
-                    <template #option="{ itemProps, opt }">
-                        <QItem v-bind="itemProps">
-                            <QItemSection>
-                                <QItemLabel
-                                    >{{ opt.id }} - {{ opt.nickname }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                />
                 <VnInput
                     v-model="data.price"
                     :label="t('Price')"

src/pages/Route/Roadmap/RoadmapFilter.vue

@@ -3,9 +3,9 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -16,19 +16,9 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['search']);
-
-const supplierList = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="Suppliers"
-        :filter="{ fields: ['id', 'nickname'] }"
-        sort-by="nickname"
-        limit="30"
-        @on-fetch="(data) => (supplierList = data)"
-        auto-load
-    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
@@ -71,14 +61,11 @@ const supplierList = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QItem v-if="supplierList" class="q-my-sm">
+            <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnSelect
+                    <VnSelectSupplier
                         :label="t('Carrier')"
                         v-model="params.supplierFk"
-                        :options="supplierList"
-                        option-value="id"
-                        option-label="nickname"
                         dense
                         outlined
                         rounded
@@ -86,17 +73,7 @@ const supplierList = ref([]);
                         map-options
                         use-input
                         :input-debounce="0"
-                    >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
-                                <QItemSection>
-                                    <QItemLabel
-                                        >{{ opt.id }} - {{ opt.nickname }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">

src/pages/Ticket/Card/TicketDescriptor.vue

@@ -9,6 +9,8 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import FetchData from 'src/components/FetchData.vue';
+import TicketProblems from 'src/components/TicketProblems.vue';
 
 const $props = defineProps({
     id: {
@@ -28,6 +30,7 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+const problems = ref({});
 
 const filter = {
     include: [
@@ -113,6 +116,11 @@ const setData = (entity) => {
 </script>
 
 <template>
+    <FetchData
+        :url="`Tickets/${entityId}/getTicketProblems`"
+        auto-load
+        @on-fetch="(data) => ([problems] = data)"
+    />
     <CardDescriptor
         module="Ticket"
         :url="`Tickets/${entityId}`"
@@ -167,48 +175,9 @@ const setData = (entity) => {
             <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
             <VnLv :label="t('globals.alias')" :value="entity.nickname" />
         </template>
-        <template #icons="{ entity }">
-            <QCardActions class="q-gutter-x-md">
-                <QIcon
-                    v-if="entity.client.isActive == false"
-                    name="vn:disabled"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client inactive') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity.client.isFreezed == true"
-                    name="vn:frozen"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client Frozen') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity?.problem?.includes('hasRisk')"
-                    name="vn:risk"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client has debt') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity.client.isTaxDataChecked == false"
-                    name="vn:no036"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client not checked') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity.isDeleted == true"
-                    name="vn:deletedTicket"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('This ticket is deleted') }}</QTooltip>
-                </QIcon>
+        <template #icons>
+            <QCardActions class="q-gutter-x-xs">
+                <TicketProblems :row="problems" />
             </QCardActions>
         </template>
         <template #actions="{ entity }">

src/pages/Ticket/Card/TicketDescriptorMenu.vue

@@ -69,14 +69,16 @@ const onAddressSelected = (addressId) => {
 }
 
 const fetchClient = async () => {
-    const { data } = await getClient(client.value)
-    const [retrievedClient] = data;
+    const response = await getClient(client.value)
+    if (!response) return;
+    const [retrievedClient] = response.data;
     selectedClient.value = retrievedClient;
 };
 
 const fetchAddresses = async () => {
-    const { data } = await getAddresses(client.value); 
-    addressesOptions.value = data;
+    const response = await getAddresses(client.value);
+    if (!response) return;
+    addressesOptions.value = response.data;
 
     const { defaultAddress } = selectedClient.value;
     address.value = defaultAddress.id;

src/pages/Ticket/Card/TicketSale.vue

@@ -24,6 +24,7 @@ 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';
+import TicketProblems from 'src/components/TicketProblems.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
 const route = useRoute();
@@ -56,7 +57,7 @@ const canProceed = ref();
 
 watch(
     () => route.params.id,
-    () => tableRef.value.reload()
+    () => tableRef.value.reload(),
 );
 
 const columns = computed(() => [
@@ -199,7 +200,7 @@ const changeQuantity = async (sale) => {
         await updateQuantity(sale);
     } catch (e) {
         const { quantity } = tableRef.value.CrudModelRef.originalData.find(
-            (s) => s.id === sale.id
+            (s) => s.id === sale.id,
         );
         sale.quantity = quantity;
         throw e;
@@ -503,7 +504,7 @@ async function isSalePrepared(item) {
                         componentProps: {
                             title: t('Item prepared'),
                             message: t(
-                                'This item is already prepared. Do you want to continue?'
+                                'This item is already prepared. Do you want to continue?',
                             ),
                             data: item,
                         },
@@ -525,7 +526,7 @@ watch(
         if (newItemFk) {
             updateItem(newRow.value);
         }
-    }
+    },
 );
 </script>
 
@@ -595,7 +596,7 @@ watch(
                         openConfirmationModal(
                             t('Continue anyway?'),
                             t('You are going to delete lines of the ticket'),
-                            removeSales
+                            removeSales,
                         )
                     "
                 >
@@ -679,53 +680,7 @@ watch(
         :disabled-attr="isTicketEditable"
     >
         <template #column-statusIcons="{ row }">
-            <router-link
-                v-if="row.claim?.claimFk"
-                :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
-            >
-                <QIcon color="primary" name="vn:claims" size="xs">
-                    <QTooltip>
-                        {{ t('ticketSale.claim') }}:
-                        {{ row.claim?.claimFk }}
-                    </QTooltip>
-                </QIcon>
-            </router-link>
-            <QIcon v-if="row.visible < 0" color="primary" name="warning" size="xs">
-                <QTooltip>
-                    {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
-                </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.reserved"
-                color="primary"
-                name="vn:reserva"
-                size="xs"
-                data-cy="ticketSaleReservedIcon"
-            >
-                <QTooltip>
-                    {{ t('ticketSale.reserved') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.itemShortage"
-                color="primary"
-                name="vn:unavailable"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('ticketSale.noVisible') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.hasComponentLack"
-                color="primary"
-                name="vn:components"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('ticketSale.hasComponentLack') }}
-                </QTooltip>
-            </QIcon>
+            <TicketProblems :row="row" />
         </template>
         <template #body-cell-picture="{ row }">
             <QTd>

src/pages/Ticket/Card/TicketSummary.vue

@@ -20,6 +20,7 @@ import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
+import TicketProblems from 'src/components/TicketProblems.vue';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -311,83 +312,7 @@ onMounted(async () => {
                     <template #body="props">
                         <QTr :props="props">
                             <QTd class="q-gutter-x-xs">
-                                <QBtn
-                                    flat
-                                    round
-                                    icon="vn:claims"
-                                    v-if="props.row.claim"
-                                    color="primary"
-                                    :to="{
-                                        name: 'ClaimCard',
-                                        params: {
-                                            id: props.row.claim.claimFk,
-                                        },
-                                    }"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticket.summary.claim') }}:
-                                        {{ props.row.claim.claimFk }}
-                                    </QTooltip>
-                                </QBtn>
-                                <QBtn
-                                    flat
-                                    round
-                                    icon="vn:claims"
-                                    v-if="props.row.claimBeginning"
-                                    color="primary"
-                                    :to="{
-                                        name: 'ClaimCard',
-                                        params: {
-                                            id: props.row.claimBeginning.claimFk,
-                                        },
-                                    }"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticket.summary.claim') }}:
-                                        {{ props.row.claimBeginning.claimFk }}
-                                    </QTooltip>
-                                </QBtn>
-                                <QIcon
-                                    name="warning"
-                                    v-show="props.row.visible < 0"
-                                    color="primary"
-                                    size="xs"
-                                >
-                                    <QTooltip>
-                                        {{ t('globals.visible') }}:
-                                        {{ props.row.visible }}
-                                    </QTooltip>
-                                </QIcon>
-                                <QIcon
-                                    name="vn:reserved"
-                                    v-show="props.row.reserved"
-                                    color="primary"
-                                    size="xs"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticket.summary.reserved') }}
-                                    </QTooltip>
-                                </QIcon>
-                                <QIcon
-                                    name="vn:unavailable"
-                                    v-show="props.row.itemShortage"
-                                    color="primary"
-                                    size="xs"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticket.summary.itemShortage') }}
-                                    </QTooltip>
-                                </QIcon>
-                                <QIcon
-                                    name="vn:components"
-                                    v-show="props.row.hasComponentLack"
-                                    color="primary"
-                                    size="xs"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticket.summary.hasComponentLack') }}
-                                    </QTooltip>
-                                </QIcon>
+                                <TicketProblems :row="props.row" />
                             </QTd>
                             <QTd>
                                 <QBtn class="link" flat>

src/pages/Ticket/TicketCreate.vue

@@ -38,35 +38,43 @@ onBeforeMount(async () => {
     await onClientSelected(initialFormState);
 });
 
+function resetAgenciesSelector(formData) {
+    agenciesOptions.value = [];
+    formData.agencyModeId = null;
+}
+
 const fetchClient = async (formData) => {
-    const { data } = await getClient(formData.clientId);
-    const [client] = data;
+    const response = await getClient(formData.clientId);
+    if (!response) return;
+    const [client] = response.data;
     selectedClient.value = client;
 };
 
 const fetchAddresses = async (formData) => {
-    const { data } = await getAddresses(formData.clientId);
-    addressesOptions.value = data;
+    const response = await getAddresses(formData.clientId);
+    if (!response) return;
+    addressesOptions.value = response.data;
 
     const { defaultAddress } = selectedClient.value;
     formData.addressId = defaultAddress.id;
 };
 
 const onClientSelected = async (formData) => {
+    resetAgenciesSelector(formData);
     await fetchClient(formData);
     await fetchAddresses(formData);
 };
 
 const fetchAvailableAgencies = async (formData) => {
-    const { data } = await getAgencies(formData);
-    agenciesOptions.value = data;
-
-    const defaultAgency = agenciesOptions.value.find(
-        (agency) =>
-            agency.agencyModeFk === selectedClient.value.defaultAddress.agencyModeFk
-    );
-
-    if (defaultAgency) formData.agencyModeId = defaultAgency.agencyModeFk;
+    resetAgenciesSelector(formData);
+    const response= await getAgencies(formData, selectedClient.value);
+    if (!response) return;
+    
+    const { options, agency } =  response
+    if(options)
+        agenciesOptions.value = options;
+    if(agency)
+        formData.agencyModeId = agency;
 };
 
 const redirectToTicketList = (_, { id }) => {

src/pages/Ticket/TicketCreateDialog.vue

@@ -38,35 +38,43 @@ onBeforeMount(async () => {
     await onClientSelected(initialFormState);
 });
 
+function resetAgenciesSelector(formData) {
+    agenciesOptions.value = [];
+    if(formData) formData.agencyModeId = null;
+}
+
 const fetchClient = async (formData) => {
-    const { data } = await getClient(formData.clientId);
-    const [client] = data;
+    const response = await getClient(formData.clientId);
+    if (!response) return;
+    const [client] = response.data;
     selectedClient.value = client;
 };
 
 const fetchAddresses = async (formData) => {
-    const { data } = await getAddresses(formData.clientId);
-    addressesOptions.value = data;
+    const response = await getAddresses(formData.clientId);
+    if (!response) return;
+    addressesOptions.value = response.data;
 
     const { defaultAddress } = selectedClient.value;
     formData.addressId = defaultAddress.id;
 };
 
 const onClientSelected = async (formData) => {
+    resetAgenciesSelector(formData);
     await fetchClient(formData);
     await fetchAddresses(formData);
 };
 
 const fetchAvailableAgencies = async (formData) => {
-    const { data } = await getAgencies(formData);
-    agenciesOptions.value = data;
-
-    const defaultAgency = agenciesOptions.value.find(
-        (agency) =>
-            agency.agencyModeFk === selectedClient.value.defaultAddress.agencyModeFk
-    );
-
-    if (defaultAgency) formData.agencyModeId = defaultAgency.agencyModeFk;
+    resetAgenciesSelector(formData);
+    const response= await getAgencies(formData, selectedClient.value);
+    if (!response) return;
+        
+    const { options, agency } =  response
+    if(options)
+        agenciesOptions.value = options;
+    if(agency)
+        formData.agencyModeId = agency;
 };
 
 const redirectToTicketList = (_, { id }) => {

src/pages/Ticket/TicketList.vue

@@ -229,37 +229,46 @@ const columns = computed(() => [
         ],
     },
 ]);
+
+function resetAgenciesSelector(formData) {
+    agenciesOptions.value = [];
+    if(formData) formData.agencyModeId = null;
+}
+
 function redirectToLines(id) {
     const url = `#/ticket/${id}/sale`;
     window.open(url, '_blank');
 }
 
-const onClientSelected = async (formData) => {
+const onClientSelected = async (formData) => {    
+    resetAgenciesSelector(formData);
     await fetchClient(formData);
     await fetchAddresses(formData);
 };
 
 const fetchAvailableAgencies = async (formData) => {
-    const { data } = await getAgencies(formData);
-    agenciesOptions.value = data;
-
-    const defaultAgency = agenciesOptions.value.find(
-        (agency) =>
-            agency.agencyModeFk === selectedClient.value.defaultAddress.agencyModeFk
-    );
-
-    if (defaultAgency) formData.agencyModeId = defaultAgency.agencyModeFk;
+    resetAgenciesSelector(formData);
+    const response= await getAgencies(formData, selectedClient.value);
+    if (!response) return;
+    
+    const { options, agency } =  response
+    if(options)
+        agenciesOptions.value = options;
+    if(agency)
+        formData.agencyModeId = agency;
 };
 
 const fetchClient = async (formData) => {
-    const { data } = await getClient(formData.clientId);
-    const [client] = data;
+    const response = await getClient(formData.clientId);
+    if (!response) return;
+    const [client] = response.data;
     selectedClient.value = client;
 };
 
 const fetchAddresses = async (formData) => {
-    const { data } = await getAddresses(formData.clientId);
-    addressesOptions.value = data;
+    const response = await getAddresses(formData.clientId);
+    if (!response) return;
+    addressesOptions.value = response.data;
 
     const { defaultAddress } = selectedClient.value;
     formData.addressId = defaultAddress.id;

src/pages/Ticket/locale/en.yml

@@ -208,3 +208,9 @@ ticketList:
     toLines: Go to lines
     addressNickname: Address nickname
     ref: Reference
+    rounding: Rounding
+    noVerifiedData: No verified data
+    purchaseRequest: Purchase request
+    notVisible: Not visible
+    clientFrozen: Client frozen
+    componentLack: Component lack

src/pages/Ticket/locale/es.yml

@@ -213,3 +213,9 @@ ticketList:
     toLines: Ir a lineas
     addressNickname: Alias consignatario
     ref: Referencia
+    rounding: Redondeo
+    noVerifiedData: Sin datos comprobados
+    purchaseRequest: Petición de compra
+    notVisible: No visible
+    clientFrozen: Cliente congelado
+    componentLack: Faltan componentes

src/pages/Travel/ExtraCommunityFilter.vue

@@ -8,6 +8,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import axios from 'axios';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -48,11 +49,11 @@ const warehouses = async () => {
 
     continentsResponse.data.forEach((continent) => {
         const countriesInContinent = Object.keys(countryContinentMap).filter(
-            (countryId) => countryContinentMap[countryId] === continent.id.toString()
+            (countryId) => countryContinentMap[countryId] === continent.id.toString(),
         );
 
         warehousesByContinent.value[continent.code] = warehousesResponse.data.filter(
-            (warehouse) => countriesInContinent.includes(warehouse.countryFk.toString())
+            (warehouse) => countriesInContinent.includes(warehouse.countryFk.toString()),
         );
     });
 };
@@ -211,30 +212,13 @@ warehouses();
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelect
-                        :label="t('globals.pageTitles.supplier')"
+                    <VnSelectSupplier
                         v-model="params.cargoSupplierFk"
-                        url="Suppliers"
-                        option-value="id"
-                        option-label="name"
                         hide-selected
                         dense
                         outlined
                         rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ scope.opt?.name}}
-                                    </QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>

src/pages/Worker/Card/WorkerBusiness.vue

@@ -0,0 +1,234 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import VnTable from 'components/VnTable/VnTable.vue';
+import { toDate } from 'src/filters';
+import { useQuasar } from 'quasar';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const tableRef = ref();
+const entityId = computed(() => route.params.id);
+const quasar = useQuasar();
+
+async function reactivateWorker() {
+    const hasToReactive = tableRef.value.CrudModelRef.formData.find(
+        (data) => !data.ended
+    );
+    if (hasToReactive) {
+        quasar
+            .dialog({
+                message: t('Do you want to reactivate the user?'),
+                ok: {
+                    push: true,
+                    color: 'primary',
+                },
+                cancel: true,
+            })
+            .onOk(async () => {
+                await axios.patch(`Workers/${entityId.value}`, {
+                    isDisable: false,
+                });
+            });
+    }
+}
+const columns = computed(() => [
+    {
+        name: 'started',
+        label: t('worker.business.tableVisibleColumns.started'),
+        align: 'left',
+        format: ({ started }) => toDate(started),
+        component: 'date',
+        cardVisible: true,
+        create: true,
+    },
+
+    {
+        name: 'ended',
+        label: t('worker.business.tableVisibleColumns.ended'),
+        align: 'left',
+        format: ({ ended }) => toDate(ended),
+        component: 'date',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        label: t('worker.business.tableVisibleColumns.company'),
+        align: 'left',
+        name: 'companyCodeFk',
+        component: 'select',
+        attrs: {
+            url: 'Companies',
+            fields: ['code'],
+            optionLabel: 'code',
+            optionValue: 'code',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'reasonEndFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.reasonEnd'),
+        attrs: {
+            url: 'BusinessReasonEnds',
+            fields: ['id', 'reason'],
+            optionLabel: 'reason',
+        },
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'departmentFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.department'),
+        attrs: {
+            url: 'Departments',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'workerBusinessProfessionalCategoryFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.professionalCategory'),
+        attrs: {
+            url: 'WorkerBusinessProfessionalCategories',
+            fields: ['id', 'description', 'code'],
+            optionLabel: 'description',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'calendarTypeFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.calendarType'),
+        attrs: {
+            url: 'CalendarTypes',
+            fields: ['id', 'description'],
+            optionLabel: 'description',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'workcenterFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.workCenter'),
+        attrs: {
+            url: 'WorkCenters',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'workerBusinessCategoryFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.payrollCategories'),
+        attrs: {
+            url: 'payrollCategories',
+            fields: ['id', 'description'],
+            optionLabel: 'description',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'occupationCodeFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.occupationCode'),
+        attrs: {
+            url: 'OccupationCodes',
+            fields: ['code', 'name'],
+            optionValue: 'code',
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'rate',
+        label: t('worker.business.tableVisibleColumns.rate'),
+        component: 'input',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'workerBusinessTypeFk',
+        component: 'select',
+        label: t('worker.business.tableVisibleColumns.businessType'),
+        attrs: {
+            url: 'WorkerBusinessTypes',
+            fields: ['id', 'name'],
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('worker.business.tableVisibleColumns.amount'),
+        name: 'amount',
+        component: 'input',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('worker.business.tableVisibleColumns.basicSalary'),
+        name: 'basicSalary',
+        component: 'input',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        name: 'notes',
+        label: t('worker.business.tableVisibleColumns.notes'),
+        align: 'left',
+        component: 'input',
+        cardVisible: true,
+    },
+]);
+</script>
+
+<template>
+    <VnTable
+        ref="tableRef"
+        data-key="WorkerBusiness"
+        :url="`Workers/${entityId}/Business`"
+        save-url="/Businesses/crud"
+        :create="{
+            urlCreate: `Workers/${entityId}/Business`,
+            title: 'Create business',
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {},
+        }"
+        order="id DESC"
+        :columns="columns"
+        default-mode="card"
+        auto-load
+        :disable-option="{ table: true }"
+        :right-search="false"
+        card-class="grid-two q-gutter-x-xl q-gutter-y-md q-pr-lg q-py-lg"
+        :is-editable="true"
+        :use-model="true"
+        @save-changes="(data) => reactivateWorker(data)"
+    />
+</template>
+<i18n>
+es:
+    Do you want to reactivate the user?: desea reactivar el usuario?
+</i18n>

src/pages/Worker/Card/WorkerSummary.vue

@@ -36,8 +36,8 @@ onBeforeMount(async () => {
 <template>
     <CardSummary
         ref="summary"
-        :url="`Workers/summary`"
-        :filter="{ where: { id: entityId } }"
+        url="Workers/summary"
+        :user-filter="{ where: { id: entityId } }"
         data-key="Worker"
     >
         <template #header="{ entity }">
@@ -143,6 +143,29 @@ onBeforeMount(async () => {
                 </VnLv>
                 <VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
             </QCard>
+            <QCard class="vn-one" v-if="advancedSummary">
+                <VnTitle
+                    :url="`#/worker/${entityId}/business`"
+                    :text="t('worker.summary.business')"
+                />
+                <VnLv
+                    :label="t('worker.summary.started')"
+                    :value="toDate(advancedSummary.currentBusiness?.started)"
+                />
+                <VnLv
+                    :label="t('worker.summary.ended')"
+                    :value="toDate(advancedSummary.currentBusiness?.ended)"
+                />
+
+                <VnLv
+                    :label="t('worker.summary.reasonEnd')"
+                    :value="advancedSummary.currentBusiness?.reasonEnd?.reason"
+                />
+                <VnLv
+                    :label="t('worker.summary.notes')"
+                    :value="advancedSummary.currentBusiness?.notes"
+                />
+            </QCard>
         </template>
     </CardSummary>
 </template>

src/router/modules/shelving.js

@@ -44,6 +44,7 @@ const shelvingCard = {
     path: ':id',
     component: () => import('pages/Shelving/Card/ShelvingCard.vue'),
     redirect: { name: 'ShelvingSummary' },
+    meta: { menu: ['ShelvingBasicData', 'ShelvingLog'] },
     children: [
         {
             name: 'ShelvingSummary',
@@ -81,13 +82,10 @@ export default {
         title: 'shelving',
         icon: 'vn:inventory',
         moduleName: 'Shelving',
+        menu: ['ShelvingList', 'ParkingMain'],
     },
     component: RouterView,
     redirect: { name: 'ShelvingMain' },
-    menus: {
-        main: ['ShelvingList', 'ParkingMain'],
-        card: ['ShelvingBasicData', 'ShelvingLog'],
-    },
     children: [
         {
             path: '',

src/router/modules/worker.js

@@ -8,6 +8,7 @@ const workerCard = {
     meta: {
         menu: [
             'WorkerBasicData',
+            'WorkerBusiness',
             'WorkerNotes',
             'WorkerPda',
             'WorkerNotificationsManager',
@@ -50,6 +51,15 @@ const workerCard = {
             },
             component: () => import('src/pages/Worker/Card/WorkerBasicData.vue'),
         },
+        {
+            path: 'business',
+            name: 'WorkerBusiness',
+            meta: {
+                title: 'business',
+                icon: 'handshake',
+            },
+            component: () => import('src/pages/Worker/Card/WorkerBusiness.vue'),
+        },
         {
             path: 'notes',
             name: 'NotesCard',

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

@@ -62,10 +62,9 @@ describe('Client list', () => {
     it('Client founded create order', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
-        cy.openActionDescriptor('New order');
+        cy.clickButtonWith('icon', 'icon-basketadd');
         cy.waitForElement('#formModel');
         cy.waitForElement('.q-form');
         cy.checkValueForm(1, search);
-        cy.checkValueForm(2, search);
     });
 });

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

@@ -7,6 +7,5 @@ describe('Client notes', () => {
     });
     it('Should load layout', () => {
         cy.get('.q-page').should('be.visible');
-        cy.get('.q-page > :nth-child(2) > :nth-child(1)').should('be.visible');
     });
 });

test/cypress/integration/entry/myEntry.spec.js

@@ -8,12 +8,12 @@ describe('EntryMy when is supplier', () => {
             },
         });
     });
-    // https://redmine.verdnatura.es/issues/8418
-    it.skip('should open buyLabel when is supplier', () => {
+    
+    it('should open buyLabel when is supplier', () => {
         cy.get(
-            '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
+            '[to="/null/3"] > .q-card > :nth-child(2) > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.get('.q-card__actions > .q-btn').click();
+        cy.dataCy('printLabelsBtn').click();
         cy.window().its('open').should('be.called');
     });
 });

test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js

@@ -1,8 +1,5 @@
 /// <reference types="cypress" />
-// https://redmine.verdnatura.es/issues/8419
-describe.skip('InvoiceInCorrective', () => {
-    const createCorrective = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
-    const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
+describe('InvoiceInCorrective', () => {
     const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';
 
     it('should create a correcting invoice', () => {
@@ -13,13 +10,13 @@ describe.skip('InvoiceInCorrective', () => {
 
         cy.openActionsDescriptor();
 
-        cy.get(createCorrective).click();
+        cy.dataCy('createCorrectiveItem').click();
         cy.get(saveDialog).click();
         cy.wait('@corrective').then((interception) => {
             const correctingId = interception.response.body;
             cy.url().should('include', `/invoice-in/${correctingId}/summary`);
+            cy.visit(`/#/invoice-in/${correctingId}/corrective`);
         });
-        cy.get(rectificativeSection).click();
         cy.get('tbody > tr:visible').should('have.length', 1);
     });
 });

test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js

@@ -1,7 +1,7 @@
 describe('InvoiceInDescriptor', () => {
-    const dialogBtns = '.q-card__actions button';
-    const firstDescritorOpt = '.q-menu > .q-list > :nth-child(1) > .q-item__section';
-    const isBookedField = '.q-card:nth-child(3) .vn-label-value:nth-child(5) .q-checkbox';
+    const book = '.summaryHeader > .no-wrap > .q-btn';
+    const firstDescritorOpt = '.q-menu > .q-list > :nth-child(5) > .q-item__section';
+    const checkbox = ':nth-child(5) > .q-checkbox';
 
     it('should booking and unbooking the invoice properly', () => {
         cy.viewport(1280, 720);
@@ -9,13 +9,13 @@ describe('InvoiceInDescriptor', () => {
         cy.visit('/#/invoice-in/1/summary');
         cy.waitForElement('.q-page');
 
-        cy.openActionsDescriptor();
-        cy.get(firstDescritorOpt).click();
-        cy.get(dialogBtns).eq(1).click();
-        cy.get(isBookedField).should('have.attr', 'aria-checked', 'true');
+        cy.get(book).click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.get(checkbox).invoke('attr', 'aria-checked').should('eq', 'true');
 
+        cy.dataCy('descriptor-more-opts').first().click();
         cy.get(firstDescritorOpt).click();
-        cy.get(dialogBtns).eq(1).click();
-        cy.get(isBookedField).should('have.attr', 'aria-checked', 'false');
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.get(checkbox).invoke('attr', 'aria-checked').should('eq', 'false');
     });
 });

test/cypress/integration/item/itemBarcodes.spec.js

@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Item shelving', () => {
+describe('ItemBarcodes', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');

test/cypress/integration/item/itemTag.spec.js

@@ -12,28 +12,22 @@ describe('Item tag', () => {
         cy.get('.q-page-sticky > div').click();
         cy.dataCy('Tag_select').eq(7).type('Tallos');
         cy.get('.q-menu .q-item').contains('Tallos').click();
-        cy.get(
-            ':nth-child(8) > [label="Value"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Value_input"]'
-        ).type('1');
+        cy.get(':nth-child(8) > [label="Value"]').type('1');
         +cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification("The tag or priority can't be repeated for an item");
     });
-    // https://redmine.verdnatura.es/issues/8422
-    it.skip('should add a new tag', () => {
+
+    it('should add a new tag', () => {
         cy.get('.q-page').should('be.visible');
         cy.get('.q-page-sticky > div').click();
         cy.get('.q-page-sticky > div').click();
         cy.dataCy('Tag_select').eq(7).click();
-        cy.get('.q-menu .q-item').contains('Ancho de la base').click();
-        cy.get(
-            ':nth-child(8) > [label="Value"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Value_input"]'
-        ).type('50');
+        cy.get('.q-menu .q-item').contains('Ancho de la base').type('{enter}');
+        cy.get(':nth-child(8) > [label="Value"]').type('50');
         cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification('Data saved');
-        cy.get(
-            '[data-cy="itemTags"] > :nth-child(7) > .justify-center > .q-icon'
-        ).click();
+        cy.dataCy('itemTags').children(':nth-child(8)').find('.justify-center > .q-icon').click();
         cy.dataCy('VnConfirm_confirm').click();
         cy.checkNotification('Data saved');
     });
-});
+});

test/cypress/integration/item/itemType.spec.js

@@ -1,5 +1,10 @@
 /// <reference types="cypress" />
 describe('Item type', () => {
+    const workerError = 'employeeNick';
+    const worker = 'buyerNick';
+    const category = 'Artificial';
+    const type = 'Flower';
+
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
@@ -8,32 +13,24 @@ describe('Item type', () => {
 
     it('should throw an error if the code already exists', () => {
         cy.dataCy('vnTableCreateBtn').click();
-        cy.get(
-            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Code_input"]'
-        ).type('ALS');
-        cy.get(
-            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Name_input"]'
-        ).type('Alstroemeria');
-        cy.dataCy('Worker_select').type('employeeNick');
-        cy.get('.q-menu .q-item').contains('employeeNick').click();
-        cy.dataCy('ItemCategory_select').type('Artificial');
-        cy.get('.q-menu .q-item').contains('Artificial').click();
+        cy.dataCy('codeInput').type('ALS');
+        cy.dataCy('nameInput').type('Alstroemeria');
+        cy.dataCy('vnWorkerSelect').type(workerError);
+        cy.get('.q-menu .q-item').contains(workerError).click();
+        cy.dataCy('itemCategorySelect').type(category);
+        cy.get('.q-menu .q-item').contains(category).click();
         cy.dataCy('FormModelPopup_save').click();
         cy.checkNotification('An item type with the same code already exists');
     });
 
     it('should create a new type', () => {
         cy.dataCy('vnTableCreateBtn').click();
-        cy.get(
-            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Code_input"]'
-        ).type('LIL');
-        cy.get(
-            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Name_input"]'
-        ).type('Lilium');
-        cy.dataCy('Worker_select').type('buyerNick');
-        cy.get('.q-menu .q-item').contains('buyerNick').click();
-        cy.dataCy('ItemCategory_select').type('Flower');
-        cy.get('.q-menu .q-item').contains('Flower').click();
+        cy.dataCy('codeInput').type('LIL');
+        cy.dataCy('nameInput').type('Lilium');
+        cy.dataCy('vnWorkerSelect').type(worker);
+        cy.get('.q-menu .q-item').contains(worker).click();
+        cy.dataCy('itemCategorySelect').type(type);
+        cy.get('.q-menu .q-item').contains(type).click();
         cy.dataCy('FormModelPopup_save').click();
         cy.checkNotification('Data created');
     });

test/cypress/integration/parking/parkingBasicData.spec.js

@@ -5,7 +5,7 @@ describe('ParkingBasicData', () => {
     const sectorOpt = '.q-menu .q-item';
     beforeEach(() => {
         cy.login('developer');
-        cy.visit(`/#/parking/1/basic-data`);
+        cy.visit(`/#/shelving/parking/1/basic-data`);
     });
 
     it('should edit the code and sector', () => {

test/cypress/integration/parking/parkingList.spec.js

@@ -11,7 +11,7 @@ describe('ParkingList', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit(`/#/parking/list`);
+        cy.visit(`/#/shelving/parking/list`);
     });
 
     it('should redirect on clicking a parking', () => {

test/cypress/integration/ticket/ticketList.spec.js

@@ -53,4 +53,29 @@ describe('TicketList', () => {
         cy.checkNotification('Data created');
         cy.url().should('match', /\/ticket\/\d+\/summary/);
     });
+
+    it('should show the corerct problems', () => {
+        cy.intercept('GET', '**/api/Tickets/filter*', (req) => {
+            req.headers['cache-control'] = 'no-cache';
+            req.headers['pragma'] = 'no-cache';
+            req.headers['expires'] = '0';
+
+            req.on('response', (res) => {
+                delete res.headers['if-none-match'];
+                delete res.headers['if-modified-since'];
+            });
+        }).as('ticket');
+
+        cy.get('[data-cy="Warehouse_select"]').type('Warehouse Five');
+        cy.get('.q-menu .q-item').contains('Warehouse Five').click();
+        cy.wait('@ticket').then((interception) => {
+            const data = interception.response.body[1];
+            expect(data.hasComponentLack).to.equal(1);
+            expect(data.isTooLittle).to.equal(1);
+            expect(data.hasItemShortage).to.equal(1);
+        });
+        cy.get('.icon-components').should('exist');
+        cy.get('.icon-unavailable').should('exist');
+        cy.get('.icon-isTooLittle').should('exist');
+    });
 });

test/cypress/integration/vnComponent/VnSearchBar.spec.js

@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe('VnSearchBar', () => {
     const employeeId = ' #1';
-    const salesPersonId = ' #18';
     const idGap = '.q-item > .q-item__label';
     const vnTableRow = '.q-virtual-scroll__content';
     beforeEach(() => {
@@ -12,11 +11,10 @@ describe('VnSearchBar', () => {
 
     it('should redirect to account summary page', () => {
         searchAndCheck('1', employeeId);
-        searchAndCheck('salesPerson', salesPersonId);
+        searchAndCheck('employee', employeeId);
     });
 
     it('should stay on the list page if there are several results or none', () => {
-        cy.typeSearchbar('salesA{enter}');
         cy.typeSearchbar('salesA{enter}');
         checkTableLength(2);
 
@@ -29,7 +27,6 @@ describe('VnSearchBar', () => {
     const searchAndCheck = (searchTerm, expectedText) => {
         cy.clearSearchbar();
         cy.typeSearchbar(`${searchTerm}{enter}`);
-        cy.typeSearchbar(`${searchTerm}{enter}`);
         cy.get(idGap).should('have.text', expectedText);
     };
 

test/cypress/integration/wagon/wagonCreate.spec.js

@@ -8,16 +8,16 @@ describe('WagonCreate', () => {
     it('should create and delete a new wagon', () => {
         cy.dataCy('vnTableCreateBtn').click();
         cy.get(
-            '.grid-create > [label="Label"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Label_input"]'
+            '.grid-create > [label="Label"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Label_input"]',
         ).type('1234');
         cy.get(
-            '.grid-create > [label="Plate"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Plate_input"]'
+            '.grid-create > [label="Plate"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Plate_input"]',
         ).type('1234ABCD');
         cy.get(
-            '.grid-create > [label="Volume"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Volume_input"]'
+            '.grid-create > [label="Volume"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Volume_input"]',
         ).type('100');
         cy.dataCy('Type_select').type('{downarrow}{enter}');
-        // // Delete wagon type created
-        cy.get('[to="/null/1"] > .q-card > .column > [title="Remove"]').click();
+
+        cy.get('[title="Remove"] > .q-btn__content > .q-icon').click();
     });
 });

test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js

@@ -6,14 +6,10 @@ describe('WagonTypeCreate', () => {
         cy.waitForElement('.q-page', 6000);
     });
 
-    it('should create a new wagon type', () => {
+    it('should create a new wagon type and then delete it', () => {
         cy.get('.q-page-sticky > div > .q-btn').click();
         cy.get('input').first().type('Example for testing');
         cy.get('button[type="submit"]').click();
-    });
-    it('delete a wagon type', () => {
-        cy.get(
-            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
-        ).click();
+        cy.get('[title="Remove"] > .q-btn__content > .q-icon').first().click();
     });
 });

test/cypress/integration/zone/zoneWarehouse.spec.js

@@ -14,17 +14,16 @@ describe('ZoneWarehouse', () => {
 
     it('should throw an error if the warehouse chosen is already put in the zone', () => {
         cy.addBtnClick();
-        cy.selectOption('[data-cy="Warehouse_select"]', 'Warehouse Two');
+        cy.dataCy('Warehouse_select').type('Warehouse Two{enter}');
         cy.get(saveBtn).click();
         cy.checkNotification(dataError);
     });
-    // https://redmine.verdnatura.es/issues/8425
-    it.skip('should create & remove a warehouse', () => {
+    
+    it('should create & remove a warehouse', () => {
         cy.addBtnClick();
         cy.fillInForm(data);
         cy.get(saveBtn).click();
         cy.get('.q-mt-lg > .q-btn--standard').click();
-
         cy.get('tbody > :nth-child(2) > :nth-child(2) > .q-icon').click();
         cy.get('[title="Confirm"]').click();
 

test/cypress/support/commands.js

@@ -289,40 +289,13 @@ Cypress.Commands.add('openActionDescriptor', (opt) => {
     cy.openActionsDescriptor();
     const listItem = '[role="menu"] .q-list .q-item';
     cy.contains(listItem, opt).click();
-    1;
 });
 
 Cypress.Commands.add('openActionsDescriptor', () => {
     cy.get('[data-cy="descriptor-more-opts"]').click();
 });
 
-Cypress.Commands.add('clickButtonsDescriptor', (id) => {
-    cy.get(`.actions > .q-card__actions> .q-btn:nth-child(${id})`)
-        .invoke('removeAttr', 'target')
-        .click();
-});
-
-Cypress.Commands.add('openActionDescriptor', (opt) => {
-    cy.openActionsDescriptor();
-    const listItem = '[role="menu"] .q-list .q-item';
-    cy.contains(listItem, opt).click();
-    1;
-});
-
-Cypress.Commands.add('clickButtonsDescriptor', (id) => {
-    cy.get(`.actions > .q-card__actions> .q-btn:nth-child(${id})`)
-        .invoke('removeAttr', 'target')
-        .click();
-});
-
-Cypress.Commands.add('openActionDescriptor', (opt) => {
-    cy.openActionsDescriptor();
-    const listItem = '[role="menu"] .q-list .q-item';
-    cy.contains(listItem, opt).click();
-    1;
-});
-
-Cypress.Commands.add('clickButtonsDescriptor', (id) => {
+Cypress.Commands.add('clickButtonDescriptor', (id) => {
     cy.get(`.actions > .q-card__actions> .q-btn:nth-child(${id})`)
         .invoke('removeAttr', 'target')
         .click();
@@ -374,3 +347,21 @@ Cypress.Commands.add('addBtnClick', () => {
         .and('be.visible')
         .click();
 });
+
+Cypress.Commands.add('clickButtonWith', (type, value) => {
+    switch (type) {
+        case 'icon':
+            cy.clickButtonWithIcon(value);
+            break;
+
+        default:
+            cy.clickButtonWithText(value);
+            break;
+    }
+});
+Cypress.Commands.add('clickButtonWithIcon', (iconClass) => {
+    cy.get(`.q-icon.${iconClass}`).parent().click();
+});
+Cypress.Commands.add('clickButtonWithText', (buttonText) => {
+    cy.get('.q-btn').contains(buttonText).click();
+});