Merge branch 'dev' into 7058_leftMenu_vitest

CHANGELOG.md

@@ -1,3 +1,82 @@
+# Version 25.00 - 2025-01-14
+
+### Added 🆕
+
+-   chore: refs #7056 move test by:jorgep
+-   feat: refs #7050 7050 add object check by:Jtubau
+-   feat: refs #7050 7050 add test to isEmpty() by:Jtubau
+-   feat: refs #7056 add tests in FormModel by:jorgep
+-   feat: refs #7056 update route meta information and add FormModel tests by:jorgep
+-   feat: refs #7074 tests for fns setData(), parseDms() and showFormDialog() (7074-makeFrontTestToVnDmsList) by:Jtubau
+-   feat: refs #7079 created VnLocation front test by:provira
+-   feat: refs #7189 add Accept-Language header to axios requests by:jorgep
+-   feat: refs #7924 add custom inspection checkbox and localization support by:jgallego
+-   feat: refs #7924 update custom inspection label for clarity in English and Spanish locales by:jgallego
+-   feat: refs #8004 enhance FetchedTags component with column support and styling updates by:pablone
+-   feat: refs #8004 hide rightFilter by:pablone
+-   feat: refs #8246 added new field in list by:Jon
+-   feat: refs #8266 added descriptor to item name by:jtubau
+-   feat: refs #8293 add zone filter by:Jtubau
+-   feat: refs #8293 include zone data in each record by:Jtubau
+-   fix: refs #8004 more list style issues by:pablone
+-   fix: refs #8004 some style issues on all list by:pablone
+-   style: refs #8004 update layout and styling in FetchedTags and ItemList components by:pablone
+-   style: update CustomerBalance.vue to set label color by:jgallego
+
+### Changed 📦
+
+-   perf: order by:alexm
+-   perf: redirect transition list to card by:alexm
+-   perf: refs #8201 onDataSaved fetch by:Jon
+-   perf: revert processData by:alexm
+-   perf: simplify if by:alexm
+-   perf: simplify if (perf_redirectTransition) by:alexm
+-   refactor: item fixedPrice by:Jon
+-   refactor: refs #7050 refactorize by:jtubau
+-   refactor: refs #7050 removed blank spaces by:jtubau
+-   refactor: refs #7052 move EditTableCellValueForm tests to a new location and enhance test coverage by:jgallego
+-   refactor: refs #7052 remove unnecessary console logs from EditTableCellValueForm tests by:jgallego
+-   refactor: refs #7074 move dms constant to global scope by:Jtubau
+-   refactor: refs #7079 removed useless code by:provira
+-   refactor: refs #7924 simplify custom inspection icon rendering in ExtraCommunity.vue by:jgallego
+-   refactor: refs #8004 remove console log from CardSummary component on mount by:pablone
+-   refactor: refs #8004 remove consoleLogs by:pablone
+-   refactor: refs #8004 remove unused stateStore import in InvoiceInList.vue by:pablone
+-   refactor: refs #8004 remove unused travelFilterRef and chip definition in TravelList.vue by:pablone
+-   refactor: refs #8004 replace VnSelect with VnSelectWorker in CustomerList component by:pablone
+-   refactor: refs #8201 added onMounted to stablish the value to show icons by:Jon
+-   refactor: refs #8201 deleted condition by:Jon
+-   refactor: refs #8201 deleted log by:Jon
+-   refactor: refs #8201 deleted logs by:Jon
+-   refactor: refs #8266 8266 change expedition item name by:Jtubau
+-   refactor: refs #8266 change expedition label by:Jtubau
+-   refactor: refs #8293 remove redundant attributes by:Jtubau
+-   refactor: refs #8320 changed folder names from "specs" to "**tests**" by:provira
+-   refactor: refs #8320 moved front tests to their respective sections by:provira
+-   refactor: refs #8813 removed unused class property by:provira
+
+### Fixed 🛠️
+
+-   fix: discount class by:PAU ROVIRA ROSALENY
+-   fix: duplicate transalation after test to dev by:alexm
+-   fix: fix translations by:carlossa
+-   fix: redirect to sales when confirming lines by:Jon
+-   fix: refs #7050 delete import added by mistake by:Jtubau
+-   fix: refs #7133 handleSalesModelValue function to handle empty input by:jorgep
+-   fix: refs #7189 update user language on sessionStorage by:jorgep
+-   fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component by:jorgep
+-   fix: refs #8004 more list style issues by:pablone
+-   fix: refs #8004 some style issues on all list by:pablone
+-   fix: refs #8004 update label for daysOnward in TravelFilter component and add translations by:pablone
+-   fix: refs #8004 vnTable card with and add permanent labels by:pablone
+-   fix: refs #8201 added onDataSaved emi to refetch when cahnges are made by:Jon
+-   fix: refs #8201 use arrayData to fix the error by:Jon
+-   fix: refs #8314 space between label and value by:jtubau
+-   fix: refs #8813 fixed ClaimLines format by:provira
+-   fix: update button sizes in ExtraCommunity.vue for better visibility by:jgallego
+-   perf: revert processData by:alexm
+-   refactor: item fixedPrice by:Jon
+
 # Version 24.52 - 2024-01-07
 
 ### Added 🆕

src/boot/qformMixin.js

@@ -31,7 +31,7 @@ export default {
             console.error(error);
         }
         form.addEventListener('keyup', function (evt) {
-            if (evt.key === 'Enter') {
+            if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
                 const input = evt.target;
                 if (input.type == 'textarea' && evt.shiftKey) {
                     evt.preventDefault();

src/components/__tests__/FilterItemForm.spec.js

@@ -0,0 +1,82 @@
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import FilterItemForm from 'src/components/FilterItemForm.vue';
+import { vi, beforeAll, describe, expect, it } from 'vitest';
+
+describe('FilterItemForm', () => {
+    let vm;
+    let wrapper;
+
+    beforeAll(() => {
+        wrapper = createWrapper(FilterItemForm, {
+            props: {
+                url: 'Items/withName',
+            },
+        });
+        vm = wrapper.vm;
+        wrapper = wrapper.wrapper;
+
+        vi.spyOn(axios, 'get').mockResolvedValue({
+            data: [
+                {
+                    id: 999996,
+                    name: 'bolas de madera',
+                    size: 2,
+                    inkFk: null,
+                    producerFk: null,
+                },
+            ],
+        });
+    });
+
+    it('should filter data and populate tableRows for table display', async () => {
+        vm.itemFilterParams.name = 'bolas de madera';
+
+        await vm.onSubmit();
+
+        const expectedFilter = {
+            include: [
+                { relation: 'producer', scope: { fields: ['name'] } },
+                { relation: 'ink', scope: { fields: ['name'] } },
+            ],
+            where: {"name":{"like":"%bolas de madera%"}},
+        };
+        
+        expect(axios.get).toHaveBeenCalledWith('Items/withName', {
+            params: { filter: JSON.stringify(expectedFilter) },
+        });
+
+        expect(vm.tableRows).toEqual([
+            {
+                id: 999996,
+                name: 'bolas de madera',
+                size: 2,
+                inkFk: null,
+                producerFk: null,
+            },
+        ]);
+    });
+
+    it('should handle an empty itemFilterParams correctly', async () => {
+        vm.itemFilterParams.name = null;
+        vm.itemFilterParams = {};
+
+        await vm.onSubmit();
+
+        const expectedFilter = {
+            include: [
+                { relation: 'producer', scope: { fields: ['name'] } },
+                { relation: 'ink', scope: { fields: ['name'] } },
+            ],
+            where: {},
+        };
+
+        expect(axios.get).toHaveBeenCalledWith('Items/withName', {
+            params: { filter: JSON.stringify(expectedFilter) },
+        });
+    });
+
+    it('should emit "itemSelected" with the correct id and close the form', () => {
+        vm.selectItem({ id: 12345 });
+        expect(wrapper.emitted('itemSelected')[0]).toEqual([12345]);
+    });
+});

src/components/common/RightMenu.vue

@@ -1,29 +1,17 @@
 <script setup>
-import { ref, onMounted, useSlots } from 'vue';
+import { onMounted, useSlots } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { useQuasar } from 'quasar';
+import { useHasContent } from 'src/composables/useHasContent';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const stateStore = useStateStore();
 const slots = useSlots();
-const hasContent = ref(false);
-const rightPanel = ref(null);
+const hasContent = useHasContent('#right-panel');
 
 onMounted(() => {
-    rightPanel.value = document.querySelector('#right-panel');
-    if (!rightPanel.value) return;
-
-    const observer = new MutationObserver(() => {
-        hasContent.value = rightPanel.value.childNodes.length;
-    });
-
-    observer.observe(rightPanel.value, {
-        subtree: true,
-        childList: true,
-        attributes: true,
-    });
     if ((!slots['right-panel'] && !hasContent.value) || quasar.platform.is.mobile)
         stateStore.rightDrawer = false;
 });

src/components/common/VnInput.vue

@@ -42,10 +42,13 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    uppercase: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const vnInputRef = ref(null);
-const showPassword = ref(false);
 const value = computed({
     get() {
         return $props.modelValue;
@@ -117,6 +120,10 @@ const handleInsertMode = (e) => {
         input.setSelectionRange(cursorPos + 1, cursorPos + 1);
     });
 };
+
+const handleUppercase = () => {
+    value.value = value.value?.toUpperCase() || '';
+};
 </script>
 
 <template>
@@ -159,7 +166,16 @@ const handleInsertMode = (e) => {
                             emit('remove');
                         }
                     "
+                ></QIcon>
+                
+                <QIcon
+                    name="match_case"
+                    size="xs"
+                    v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
+                    @click="handleUppercase"
+                    class="uppercase-icon"
                 />
+                
                 <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">
@@ -170,3 +186,14 @@ const handleInsertMode = (e) => {
         </QInput>
     </div>
 </template>
+
+<i18n>
+    en:
+        inputMin: Must be more than {value}
+        maxLength: The value exceeds {value} characters
+        inputMax: Must be less than {value}
+    es:
+        inputMin: Debe ser mayor a {value}
+        maxLength: El valor excede los {value} carácteres
+        inputMax: Debe ser menor a {value}
+</i18n>

src/components/common/VnLocation.vue

@@ -2,7 +2,7 @@
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
-import { computed } from 'vue';
+import { ref, watch } from 'vue';
 import { useAttrs } from 'vue';
 import { useRequired } from 'src/composables/useRequired';
 const { t } = useI18n();
@@ -16,6 +16,14 @@ const props = defineProps({
     },
 });
 
+watch(
+    () => props.location,
+    (newValue) => {
+        if (!modelValue.value) return;
+        modelValue.value = formatLocation(newValue) ?? null;
+    }
+);
+
 const mixinRules = [requiredFieldRule];
 const locationProperties = [
     'postcode',
@@ -43,9 +51,7 @@ const formatLocation = (obj, properties = locationProperties) => {
     return filteredParts.join(', ');
 };
 
-const modelValue = computed(() =>
-    props.location ? formatLocation(props.location, locationProperties) : null
-);
+const modelValue = ref(props.location ? formatLocation(props.location) : null);
 
 function showLabel(data) {
     const dataProperties = [

src/components/common/VnSection.vue

@@ -2,9 +2,10 @@
 import RightMenu from './RightMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, computed } from 'vue';
+import { onBeforeMount, computed, ref } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRoute } from 'vue-router';
+import { useHasContent } from 'src/composables/useHasContent';
 
 const $props = defineProps({
     section: {
@@ -55,6 +56,8 @@ const isMainSection = computed(() => {
     }
     return isSame;
 });
+const searchbarId = 'section-searchbar';
+const hasContent = useHasContent(`#${searchbarId}`);
 
 onBeforeMount(() => {
     if ($props.dataKey)
@@ -69,14 +72,14 @@ onBeforeMount(() => {
 <template>
     <slot name="searchbar">
         <VnSearchbar
-            v-if="searchBar"
+            v-if="searchBar && !hasContent"
             v-bind="arrayDataProps"
             :data-key="dataKey"
             :label="$t(`${prefix}.search`)"
             :info="$t(`${prefix}.searchInfo`)"
         />
+        <div :id="searchbarId"></div>
     </slot>
-
     <RightMenu>
         <template #right-panel v-if="$slots['rightMenu'] || rightFilter">
             <slot name="rightMenu">

src/components/common/__tests__/VnInputDate.spec.js

@@ -0,0 +1,72 @@
+import { createWrapper } from 'app/test/vitest/helper.js';
+import { describe, it, expect } from 'vitest';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+let vm;
+let wrapper;
+
+function generateWrapper(date, outlined, required) {
+    wrapper = createWrapper(VnInputDate, {
+        props: {
+            modelValue: date,
+        },
+        attrs: {
+            isOutlined: outlined,
+            required: required
+        },
+    });
+    wrapper = wrapper.wrapper;
+    vm = wrapper.vm;
+};
+
+describe('VnInputDate', () => {
+
+    describe('formattedDate', () => {     
+        it('formats a valid date correctly', async () => {
+            generateWrapper('2023-12-25', false, false);
+            await vm.$nextTick();
+            expect(vm.formattedDate).toBe('25/12/2023');
+        });
+
+        it('updates the model value when a new date is set', async () => {
+            const input = wrapper.find('input');
+            await input.setValue('31/12/2023');
+            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
+            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
+        });
+
+        it('should not update the model value when an invalid date is set', async () => {
+            const input = wrapper.find('input');
+            await input.setValue('invalid-date');
+            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
+        }); 
+    });
+
+    describe('styleAttrs', () => {
+        it('should return empty styleAttrs when isOutlined is false', async () => {
+            generateWrapper('2023-12-25', false, false);
+            await vm.$nextTick();
+            expect(vm.styleAttrs).toEqual({}); 
+        });
+
+        it('should set styleAttrs when isOutlined is true', async () => {        
+            generateWrapper('2023-12-25', true, false);
+            await vm.$nextTick();
+            expect(vm.styleAttrs.outlined).toBe(true);
+        });
+    });
+
+    describe('required', () => {
+        it('should not applies required class when isRequired is false', async () => {
+            generateWrapper('2023-12-25', false, false);
+            await vm.$nextTick();
+            expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
+        });
+        
+        it('should applies required class when isRequired is true', async () => {
+            generateWrapper('2023-12-25', false, true);
+            await vm.$nextTick();
+            expect(wrapper.find('.vn-input-date').classes()).toContain('required');
+        });
+    });
+});

src/components/common/__tests__/VnInputTime.spec.js

@@ -0,0 +1,63 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnInputTime from 'components/common/VnInputTime.vue';
+
+describe('VnInputTime', () => {
+    let wrapper;
+    let vm;
+
+    beforeAll(() => {
+        wrapper = createWrapper(VnInputTime, {
+            props: {
+                isOutlined: true,
+                timeOnly: false,
+            },
+        });
+        vm = wrapper.vm;
+        wrapper = wrapper.wrapper;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should return the correct data if isOutlined is true', () => {
+        expect(vm.isOutlined).toBe(true);
+        expect(vm.styleAttrs).toEqual({ dense: true, outlined: true, rounded: true });
+    });
+
+    it('should return the formatted data', () => {
+        expect(vm.dateToTime('2022-01-01T03:23:43')).toBe('03:23');
+    });
+
+    describe('formattedTime', () => {
+        it('should return the formatted time for a valid ISO date', () => {
+            vm.model = '2025-01-02T15:45:00';
+            expect(vm.formattedTime).toBe('15:45');
+        });
+
+        it('should handle null model value gracefully', () => {
+            vm.model = null;
+            expect(vm.formattedTime).toBe(null);
+        });
+
+        it('should handle time-only input correctly', async () => {
+            await wrapper.setProps({ timeOnly: true });
+            vm.formattedTime = '14:30';
+            expect(vm.model).toBe('14:30');
+        });
+
+        it('should pad short time values correctly', async () => {
+            await wrapper.setProps({ timeOnly: true });
+            vm.formattedTime = '9';
+            expect(vm.model).toBe('09:00');
+        });
+
+        it('should not update the model if the value is unchanged', () => {
+            vm.model = '14:30';
+            const previousModel = vm.model;
+            vm.formattedTime = '14:30';
+            expect(vm.model).toBe(previousModel);
+        });
+    });
+});

src/components/ui/CardSummary.vue

@@ -2,7 +2,6 @@
 import { ref, computed, watch, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { isDialogOpened } from 'src/filters';
 import VnMoreOptions from './VnMoreOptions.vue';
@@ -82,7 +81,7 @@ async function fetch() {
                         <span v-else></span>
                     </slot>
                     <slot name="header" :entity="entity" dense>
-                        <VnLv :label="`${entity.id} -`" :value="entity.name" />
+                        {{ entity.id + ' - ' + entity.name }}
                     </slot>
                     <span class="row no-wrap">
                         <slot name="header-right" :entity="entity" />

src/components/ui/FetchedTags.vue

@@ -18,8 +18,7 @@ const $props = defineProps({
     },
     columns: {
         type: Number,
-        required: false,
-        default: null,
+        default: 3,
     },
 });
 

src/components/ui/SkeletonSummary.vue

@@ -1,32 +1,42 @@
 <template>
     <div class="header bg-primary q-pa-sm q-mb-md">
         <QSkeleton type="rect" square />
+        <QSkeleton type="rect" square />
     </div>
     <div class="row q-pa-md q-col-gutter-md q-mb-md">
+        <div class="col">
             <QSkeleton type="rect" class="q-mb-md" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
+        </div>
+        <div class="col">
             <QSkeleton type="rect" class="q-mb-md" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
+        </div>
+        <div class="col">
             <QSkeleton type="rect" class="q-mb-md" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
+        </div>
+        <div class="col">
             <QSkeleton type="rect" class="q-mb-md" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
+        </div>
+        <div class="col">
             <QSkeleton type="rect" class="q-mb-md" square />
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
@@ -34,6 +44,7 @@
             <QSkeleton type="text" square />
             <QSkeleton type="text" square />
         </div>
+    </div>
 </template>
 
 <style lang="scss" scoped>

src/components/ui/VnLinkPhone.vue

@@ -30,7 +30,7 @@ onBeforeMount(async () => {
             .data;
         if (!channel) channel = defaultChannel;
 
-        phone.value = await parsePhone(props.phoneNumber, props.country.toLowerCase());
+        phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
         config[
             type
         ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;

src/components/ui/__tests__/CardSummary.spec.js

@@ -0,0 +1,78 @@
+import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import CardSummary from 'src/components/ui/CardSummary.vue';
+import * as vueRouter from 'vue-router';
+
+describe('CardSummary', () => {
+    let vm;
+    let wrapper;
+
+    beforeAll(() => {
+        vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
+    });
+
+    vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
+        query: {},
+        params: {},
+        meta: { moduleName: 'mockName' },
+        path: 'mockName/1/summary',
+        name: 'CardSummary',
+    });
+
+    beforeEach(() => {
+        wrapper = createWrapper(CardSummary, {
+            propsData: {
+                dataKey: 'cardSummaryKey',
+                url: 'cardSummaryUrl',
+                filter: 'cardFilter',
+            },
+        });
+        vm = wrapper.vm;
+        wrapper = wrapper.wrapper;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should fetch data correctly', async () => {
+        const fetchSpy = vi
+            .spyOn(vm.arrayData, 'fetch')
+            .mockResolvedValue({ data: [{ id: 1, name: 'Test Entity' }] });
+        await vm.fetch();
+
+        expect(fetchSpy).toHaveBeenCalledWith({ append: false, updateRouter: false });
+        expect(wrapper.emitted('onFetch')).toBeTruthy();
+        expect(vm.isLoading).toBe(false);
+    });
+
+    it('should set correct props to the store', () => {
+        expect(vm.store.url).toEqual('cardSummaryUrl');
+        expect(vm.store.filter).toEqual('cardFilter');
+    });
+
+    it('should compute entity correctly from store data', () => {
+        vm.store.data = [{ id: 1, name: 'Entity 1' }];
+        expect(vm.entity).toEqual({ id: 1, name: 'Entity 1' });
+    });
+
+    it('should handle empty data gracefully', () => {
+        vm.store.data = [];
+        expect(vm.entity).toBeUndefined();
+    });
+
+    it('should respond to prop changes and refetch data', async () => {
+        const newUrl = 'CardSummary/35';
+        const newKey = 'cardSummaryKey/35';
+        const fetchSpy = vi.spyOn(vm.arrayData, 'fetch');
+        await wrapper.setProps({ url: newUrl, filter: { key: newKey } });
+
+        expect(fetchSpy).toHaveBeenCalled();
+        expect(vm.store.url).toBe(newUrl);
+        expect(vm.store.filter).toEqual({ key: newKey });
+    });
+
+    it('should return true if route path ends with /summary' , () => {
+        expect(vm.isSummary).toBe(true);
+    });
+});

src/composables/useArrayData.js

@@ -7,7 +7,9 @@ import { isDialogOpened } from 'src/filters';
 
 const arrayDataStore = useArrayDataStore();
 
-export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
+export function useArrayData(key, userOptions) {
+    key ??= useRoute().meta.moduleName;
+    
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);

src/composables/useHasContent.js

@@ -0,0 +1,24 @@
+import { onMounted, ref } from 'vue';
+
+export function useHasContent(selector) {
+    const container = ref({});
+    const hasContent = ref();
+
+    onMounted(() => {
+        container.value = document.querySelector(selector);
+        if (!container.value) return;
+
+        const observer = new MutationObserver(() => {
+            if (document.querySelector(selector))
+                hasContent.value = !!container.value.childNodes.length;
+        });
+
+        observer.observe(container.value, {
+            subtree: true,
+            childList: true,
+            attributes: true,
+        });
+    });
+
+    return hasContent;
+}

src/i18n/locale/en.yml

@@ -346,6 +346,7 @@ globals:
         countryFk: Country
         companyFk: Company
     changePass: Change password
+    setPass: Set password
     deleteConfirmTitle: Delete selected elements
     changeState: Change state
     raid: 'Raid {daysInForward} days'
@@ -388,80 +389,6 @@ cau:
     subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.
     inputLabel: Explain why this error should not appear
     askPrivileges: Ask for privileges
-entry:
-    list:
-        newEntry: New entry
-        tableVisibleColumns:
-            created: Creation
-            supplierFk: Supplier
-            isBooked: Booked
-            isConfirmed: Confirmed
-            isOrdered: Ordered
-            companyFk: Company
-            travelFk: Travel
-            isExcludedFromAvailable: Inventory
-            invoiceAmount: Import
-    summary:
-        commission: Commission
-        currency: Currency
-        invoiceNumber: Invoice number
-        ordered: Ordered
-        booked: Booked
-        excludedFromAvailable: Inventory
-        travelReference: Reference
-        travelAgency: Agency
-        travelShipped: Shipped
-        travelDelivered: Delivered
-        travelLanded: Landed
-        travelReceived: Received
-        buys: Buys
-        stickers: Stickers
-        package: Package
-        packing: Pack.
-        grouping: Group.
-        buyingValue: Buying value
-        import: Import
-        pvp: PVP
-    basicData:
-        travel: Travel
-        currency: Currency
-        commission: Commission
-        observation: Observation
-        booked: Booked
-        excludedFromAvailable: Inventory
-    buys:
-        observations: Observations
-        packagingFk: Box
-        color: Color
-        printedStickers: Printed stickers
-    notes:
-        observationType: Observation type
-    latestBuys:
-        tableVisibleColumns:
-            image: Picture
-            itemFk: Item ID
-            weightByPiece: Weight/Piece
-            isActive: Active
-            family: Family
-            entryFk: Entry
-            freightValue: Freight value
-            comissionValue: Commission value
-            packageValue: Package value
-            isIgnored: Is ignored
-            price2: Grouping
-            price3: Packing
-            minPrice: Min
-            ektFk: Ekt
-            packingOut: Package out
-            landing: Landing
-            isExcludedFromAvailable: Es inventory
-    params:
-        toShipped: To
-        fromShipped: From
-        warehouseiNFk: Warehouse
-        daysOnward: Days onward
-        daysAgo: Days ago
-        warehouseInFk: Warehouse in
 ticket:
     params:
         ticketFk: Ticket ID
@@ -578,27 +505,6 @@ parking:
     searchBar:
         info: You can search by parking code
         label: Search parking...
-order:
-    field:
-        salesPersonFk: Sales Person
-    form:
-        clientFk: Client
-        addressFk: Address
-        agencyModeFk: Agency
-    list:
-        newOrder: New Order
-    summary:
-        basket: Basket
-        notConfirmed: Not confirmed
-        created: Created
-        createdFrom: Created From
-        address: Address
-        total: Total
-        items: Items
-        orderTicketList: Order Ticket List
-        amount: Amount
-        confirm: Confirm
-        confirmLines: Confirm lines
 department:
     chat: Chat
     bossDepartment: Boss Department
@@ -889,7 +795,10 @@ components:
         hasMinPrice: Minimum price
         # LatestBuysFilter
         salesPersonFk: Buyer
+        supplierFk: Supplier
         from: From
+        to: To
+        visible: Is visible
         active: Is active
         floramondo: Is floramondo
         showBadDates: Show future items

src/i18n/locale/es.yml

@@ -348,6 +348,7 @@ globals:
         countryFk: País
         companyFk: Empresa
     changePass: Cambiar contraseña
+    setPass: Establecer contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
     changeState: Cambiar estado
     raid: 'Redada {daysInForward} días'
@@ -388,80 +389,6 @@ cau:
     subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
     inputLabel: Explique el motivo por el que no deberia aparecer este fallo
     askPrivileges: Solicitar permisos
-entry:
-    list:
-        newEntry: Nueva entrada
-        tableVisibleColumns:
-            created: Creación
-            supplierFk: Proveedor
-            isBooked: Asentado
-            isConfirmed: Confirmado
-            isOrdered: Pedida
-            companyFk: Empresa
-            travelFk: Envio
-            isExcludedFromAvailable: Inventario
-            invoiceAmount: Importe
-    summary:
-        commission: Comisión
-        currency: Moneda
-        invoiceNumber: Núm. factura
-        ordered: Pedida
-        booked: Contabilizada
-        excludedFromAvailable: Inventario
-        travelReference: Referencia
-        travelAgency: Agencia
-        travelShipped: F. envio
-        travelWarehouseOut: Alm. salida
-        travelDelivered: Enviada
-        travelLanded: F. entrega
-        travelReceived: Recibida
-        buys: Compras
-        stickers: Etiquetas
-        package: Embalaje
-        packing: Pack.
-        grouping: Group.
-        buyingValue: Coste
-        import: Importe
-        pvp: PVP
-    basicData:
-        travel: Envío
-        currency: Moneda
-        observation: Observación
-        commission: Comisión
-        booked: Asentado
-        excludedFromAvailable: Inventario
-    buys:
-        observations: Observaciónes
-        packagingFk: Embalaje
-        color: Color
-        printedStickers: Etiquetas impresas
-    notes:
-        observationType: Tipo de observación
-    latestBuys:
-        tableVisibleColumns:
-            image: Foto
-            itemFk: Id Artículo
-            weightByPiece: Peso (gramos)/tallo
-            isActive: Activo
-            family: Familia
-            entryFk: Entrada
-            freightValue: Porte
-            comissionValue: Comisión
-            packageValue: Embalaje
-            isIgnored: Ignorado
-            price2: Grouping
-            price3: Packing
-            minPrice: Min
-            ektFk: Ekt
-            packingOut: Embalaje envíos
-            landing: Llegada
-            isExcludedFromAvailable: Es inventario
-    params:
-        toShipped: Hasta
-        fromShipped: Desde
-        warehouseInFk: Alm. entrada
-        daysOnward: Días adelante
-        daysAgo: Días atras
 ticket:
     params:
         ticketFk: ID de ticket
@@ -562,30 +489,6 @@ invoiceOut:
         comercial: Comercial
         errors:
             downloadCsvFailed: Error al descargar CSV
-order:
-    field:
-        salesPersonFk: Comercial
-    form:
-        clientFk: Cliente
-        addressFk: Dirección
-        agencyModeFk: Agencia
-    list:
-        newOrder: Nuevo Pedido
-    summary:
-        basket: Cesta
-        notConfirmed: No confirmada
-        created: Creado
-        createdFrom: Creado desde
-        address: Dirección
-        total: Total
-        vat: IVA
-        state: Estado
-        alias: Alias
-        items: Artículos
-        orderTicketList: Tickets del pedido
-        amount: Monto
-        confirm: Confirmar
-        confirmLines: Confirmar lineas
 shelving:
     list:
         parking: Parking
@@ -889,7 +792,11 @@ components:
         wareHouseFk: Almacén
         # LatestBuysFilter
         salesPersonFk: Comprador
+        supplierFk: Proveedor
+        visible: Visible
         active: Activo
+        from: Desde
+        to: Hasta
         floramondo: Floramondo
         showBadDates: Ver items a futuro
     userPanel:

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -1,48 +1,56 @@
 <script setup>
 import axios from 'axios';
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
+import { useRoute } from 'vue-router';
 import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
+import { useState } from 'src/composables/useState';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
-import VnChangePassword from 'src/components/common/VnChangePassword.vue';
-import useNotify from 'src/composables/useNotify.js';
-import useHasAccount from 'src/composables/useHasAccount.js';
 import VnInputPassword from 'src/components/common/VnInputPassword.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
+import { useQuasar } from 'quasar';
+import { useRouter } from 'vue-router';
 
 const $props = defineProps({
-    entityId: {
-        type: Number,
+    hasAccount: {
+        type: Boolean,
+        default: false,
         required: true,
     },
 });
 
 const { t } = useI18n();
+const { hasAccount } = toRefs($props);
 const { openConfirmationModal } = useVnConfirm();
-const { notify } = useNotify();
+const route = useRoute();
+const router = useRouter();
+const state = useState();
+const user = state.getUser();
+const { notify } = useQuasar();
 const account = computed(() => useArrayData('AccountId').store.data[0]);
-
-onMounted(async () => {
-    account.value.hasAccount = await useHasAccount($props.entityId);
-});
+account.value.hasAccount = hasAccount.value;
+const entityId = computed(() => +route.params.id);
+const hasitManagementAccess = ref();
+const hasSysadminAccess = ref();
 
 async function updateStatusAccount(active) {
     if (active) {
-        await axios.post(`Accounts`, { id: $props.entityId });
+        await axios.post(`Accounts`, { id: entityId.value });
     } else {
-        await axios.delete(`Accounts/${$props.entityId}`);
+        await axios.delete(`Accounts/${entityId.value}`);
     }
 
     account.value.hasAccount = active;
     const status = active ? 'enable' : 'disable';
     notify({
-        message: t(`account.card.${status}Account.success`),
+        message: t(`account.card.actions.${status}Account.success`),
         type: 'positive',
     });
 }
 async function updateStatusUser(active) {
-    await axios.patch(`VnUsers/${$props.entityId}`, { active });
+    await axios.patch(`VnUsers/${entityId.value}`, { active });
     account.value.active = active;
     const status = active ? 'activate' : 'deactivate';
     notify({
@@ -50,6 +58,17 @@ async function updateStatusUser(active) {
         type: 'positive',
     });
 }
+
+async function deleteAccount() {
+    const { data } = await axios.delete(`VnUsers/${entityId.value}`);
+    if (data) {
+        notify({
+            message: t('account.card.actions.delete.success'),
+            type: 'positive',
+        });
+        router.push({ name: 'AccountList' });
+    }
+}
 const showSyncDialog = ref(false);
 const syncPassword = ref(null);
 const shouldSyncPassword = ref(false);
@@ -64,11 +83,27 @@ async function sync() {
         type: 'positive',
     });
 }
+const askOldPass = ref(false);
+const changePassRef = ref();
+
+const onChangePass = (oldPass) => {
+    askOldPass.value = oldPass;
+    changePassRef.value.show();
+};
+
+onMounted(() => {
+    hasitManagementAccess.value = useAcl().hasAny([
+        { model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
+    ]);
+    hasSysadminAccess.value = useAcl().hasAny([
+        { model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
+    ]);
+});
 </script>
 <template>
     <VnChangePassword
         ref="changePassRef"
-        :ask-old-pass="true"
+        :ask-old-pass="askOldPass"
         :submit-fn="
             async (newPassword, oldPassword) => {
                 await axios.patch(`Accounts/change-password`, {
@@ -110,18 +145,46 @@ async function sync() {
         </template>
     </VnConfirm>
     <QItem
-        v-if="
-            entityId == account.id &&
-            useAcl().hasAny([{ model: 'Account', props: '*', accessType: 'WRITE' }])
-        "
+        v-if="hasitManagementAccess"
         v-ripple
         clickable
-        @click="$refs.changePassRef.show()"
+        @click="
+            openConfirmationModal(
+                t('account.card.actions.disableAccount.title'),
+                t('account.card.actions.disableAccount.subtitle'),
+                () => deleteAccount()
+            )
+        "
     >
-        <QItemSection>{{ t('globals.changePass') }}</QItemSection>
+        <QItemSection>{{ t('globals.delete') }}</QItemSection>
     </QItem>
     <QItem
-        v-if="account.hasAccount"
+        v-if="hasSysadminAccess"
+        v-ripple
+        clickable
+        @click="user.id === account.id ? onChangePass(true) : onChangePass(false)"
+    >
+        <QItemSection v-if="user.id === account.id">
+            {{ t('globals.changePass') }}
+        </QItemSection>
+        <QItemSection v-else>{{ t('globals.setPass') }}</QItemSection>
+    </QItem>
+    <QItem
+        v-if="!account.hasAccount && hasSysadminAccess"
+        v-ripple
+        clickable
+        @click="
+            openConfirmationModal(
+                t('account.card.actions.enableAccount.title'),
+                t('account.card.actions.enableAccount.subtitle'),
+                () => updateStatusAccount(true)
+            )
+        "
+    >
+        <QItemSection>{{ t('account.card.actions.enableAccount.name') }}</QItemSection>
+    </QItem>
+    <QItem
+        v-if="account.hasAccount && hasSysadminAccess"
         v-ripple
         clickable
         @click="
@@ -136,7 +199,7 @@ async function sync() {
     </QItem>
 
     <QItem
-        v-if="!account.active"
+        v-if="!account.active && hasitManagementAccess"
         v-ripple
         clickable
         @click="
@@ -150,7 +213,7 @@ async function sync() {
         <QItemSection>{{ t('account.card.actions.activateUser.name') }}</QItemSection>
     </QItem>
     <QItem
-        v-if="account.active"
+        v-if="account.active && hasitManagementAccess"
         v-ripple
         clickable
         @click="
@@ -163,7 +226,12 @@ async function sync() {
     >
         <QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
     </QItem>
-    <QItem v-ripple clickable @click="showSyncDialog = true">
+    <QItem
+        v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
+        v-ripple
+        clickable
+        @click="showSyncDialog = true"
+    >
         <QItemSection>{{ t('account.card.actions.sync.name') }}</QItemSection>
     </QItem>
     <QSeparator />

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -11,16 +11,9 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
-import { useState } from 'src/composables/useState';
-const state = useState();
-
-const customer = ref();
-
-onMounted(async () => {
-    customer.value = state.get('customer');
-    if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
-});
 
+const customerDebt = ref();
+const customerCredit = ref();
 const $props = defineProps({
     id: {
         type: Number,
@@ -42,10 +35,12 @@ const entityId = computed(() => {
 
 const data = ref(useCardDescription());
 const setData = (entity) => {
+    customerDebt.value = entity?.debt;
+    customerCredit.value = entity?.credit;
     data.value = useCardDescription(entity?.name, entity?.id);
 };
 const debtWarning = computed(() => {
-    return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
+    return customerDebt.value > customerCredit.value ? 'negative' : 'primary';
 });
 </script>
 
@@ -97,26 +92,21 @@ const debtWarning = computed(() => {
                 :value="entity.businessType.description"
             />
         </template>
-        <template #icons>
-            <QCardActions v-if="customer" class="q-gutter-x-md">
+        <template #icons="{ entity }">
+            <QCardActions class="q-gutter-x-md">
                 <QIcon
-                    v-if="!customer.isActive"
+                    v-if="!entity.isActive"
                     name="vn:disabled"
                     size="xs"
                     color="primary"
                 >
                     <QTooltip>{{ t('customer.card.isDisabled') }}</QTooltip>
                 </QIcon>
-                <QIcon
-                    v-if="customer.isFreezed"
-                    name="vn:frozen"
-                    size="xs"
-                    color="primary"
-                >
+                <QIcon v-if="entity.isFreezed" name="vn:frozen" size="xs" color="primary">
                     <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!customer.account?.active"
+                    v-if="!entity.account?.active"
                     color="primary"
                     name="vn:noweb"
                     size="xs"
@@ -124,7 +114,7 @@ const debtWarning = computed(() => {
                     <QTooltip>{{ t('customer.card.webAccountInactive') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="customer.debt > customer.credit"
+                    v-if="entity.debt > entity.credit"
                     name="vn:risk"
                     size="xs"
                     :color="debtWarning"
@@ -132,7 +122,7 @@ const debtWarning = computed(() => {
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!customer.isTaxDataChecked"
+                    v-if="!entity.isTaxDataChecked"
                     name="vn:no036"
                     size="xs"
                     color="primary"
@@ -140,7 +130,7 @@ const debtWarning = computed(() => {
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
                 <QBtn
-                    v-if="customer.unpaid"
+                    v-if="entity.unpaid"
                     flat
                     size="sm"
                     icon="vn:Client_unpaid"

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -44,6 +44,7 @@ function handleLocation(data, location) {
                     :required="true"
                     :rules="validate('client.socialName')"
                     clearable
+                    uppercase="true"
                     v-model="data.socialName"
                 >
                     <template #append>

src/pages/Customer/CustomerList.vue

@@ -50,6 +50,14 @@ const columns = computed(() => [
         isTitle: true,
         create: true,
         columnClass: 'expand',
+        attrs: {
+            uppercase: true,
+        },
+        columnFilter: {
+            attrs: {
+                uppercase: false,
+            },
+        },
     },
     {
         align: 'left',

src/pages/Customer/components/CustomerAddressCreate.vue

@@ -11,6 +11,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -150,6 +151,22 @@ function onAgentCreated({ id, fiscalName }, data) {
                     </template>
                 </VnSelectDialog>
             </VnRow>
+            <VnRow>
+                <VnInputNumber
+                    :label="t('Longitude')"
+                    clearable
+                    v-model="data.longitude"
+                    :decimal-places="7"
+                    :positive="false"
+                />
+                <VnInputNumber
+                    :label="t('Latitude')"
+                    clearable
+                    v-model="data.latitude"
+                    :decimal-places="7"
+                    :positive="false"
+                />
+            </VnRow>
         </template>
     </FormModel>
 </template>
@@ -175,4 +192,6 @@ es:
     Mobile: Movíl
     Incoterms: Incoterms
     Customs agent: Agente de aduanas
+    Longitude: Longitud
+    Latitude: Latitud
 </i18n>

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -248,12 +248,14 @@ function handleLocation(data, location) {
                     clearable
                     v-model="data.longitude"
                     :decimal-places="7"
+                    :positive="false"
                 />
                 <VnInputNumber
                     :label="t('Latitude')"
                     clearable
                     v-model="data.latitude"
                     :decimal-places="7"
+                    :positive="false"
                 />
             </VnRow>
             <h4 class="q-mb-xs">{{ t('Notes') }}</h4>

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -106,7 +106,7 @@ const { openConfirmationModal } = useVnConfirm();
                     :to="{
                         name: 'WorkerList',
                         query: {
-                            params: JSON.stringify({ departmentFk: entityId }),
+                            table: JSON.stringify({ departmentFk: entityId }),
                         },
                     }"
                 >

src/pages/Entry/Card/EntryCard.vue

@@ -1,21 +1,13 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
-import EntryFilter from '../EntryFilter.vue';
-import filter from './EntryFilter.js';
+import filter from './EntryFilter.js'
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Entry"
         base-url="Entries"
-        :filter="filter"
         :descriptor="EntryDescriptor"
-        :filter-panel="EntryFilter"
-        search-data-key="EntryList"
-        :searchbar-props="{
-            url: 'Entries/filter',
-            label: 'Search entries',
-            info: 'You can search by entry reference',
-        }"
+        :user-filter="filter"
     />
 </template>

src/pages/Entry/EntryFilter.vue

@@ -40,7 +40,7 @@ const companiesOptions = ref([]);
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ t(`entryFilter.params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -49,7 +49,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.search"
-                        :label="t('entryFilter.filter.search')"
+                        :label="t('entryFilter.params.search')"
                         is-outlined
                     />
                 </QItemSection>
@@ -58,7 +58,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.reference"
-                        :label="t('entryFilter.filter.reference')"
+                        :label="t('entryFilter.params.reference')"
                         is-outlined
                     />
                 </QItemSection>
@@ -67,7 +67,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.invoiceNumber"
-                        :label="t('params.invoiceNumber')"
+                        :label="t('entryFilter.params.invoiceNumber')"
                         is-outlined
                     />
                 </QItemSection>
@@ -76,7 +76,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.travelFk"
-                        :label="t('params.travelFk')"
+                        :label="t('entryFilter.params.travelFk')"
                         is-outlined
                     />
                 </QItemSection>
@@ -84,7 +84,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('params.companyFk')"
+                        :label="t('entryFilter.params.companyFk')"
                         v-model="params.companyFk"
                         @update:model-value="searchFn()"
                         :options="companiesOptions"
@@ -100,7 +100,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('params.currencyFk')"
+                        :label="t('entryFilter.params.currencyFk')"
                         v-model="params.currencyFk"
                         @update:model-value="searchFn()"
                         :options="currenciesOptions"
@@ -116,7 +116,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('params.supplierFk')"
+                        :label="t('entryFilter.params.supplierFk')"
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
                         url="Suppliers"
@@ -148,7 +148,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.created')"
+                        :label="t('entryFilter.params.created')"
                         v-model="params.created"
                         @update:model-value="searchFn()"
                         is-outlined
@@ -158,7 +158,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.from')"
+                        :label="t('entryFilter.params.from')"
                         v-model="params.from"
                         @update:model-value="searchFn()"
                         is-outlined
@@ -168,7 +168,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.to')"
+                        :label="t('entryFilter.params.to')"
                         v-model="params.to"
                         @update:model-value="searchFn()"
                         is-outlined
@@ -178,14 +178,14 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isBooked')"
+                        :label="t('entryFilter.params.isBooked')"
                         v-model="params.isBooked"
                         toggle-indeterminate
                     />
                 </QItemSection>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isConfirmed')"
+                        :label="t('entryFilter.params.isConfirmed')"
                         v-model="params.isConfirmed"
                         toggle-indeterminate
                     />
@@ -194,7 +194,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isOrdered')"
+                        :label="t('entryFilter.params.isOrdered')"
                         v-model="params.isOrdered"
                         toggle-indeterminate
                     />
@@ -203,34 +203,3 @@ const companiesOptions = ref([]);
         </template>
     </VnFilterPanel>
 </template>
-
-<i18n>
-en:
-    params:
-        
-        invoiceNumber: Invoice number
-        travelFk: Travel
-        companyFk: Company
-        currencyFk: Currency
-        supplierFk: Supplier
-        from: From
-        to: To
-        created: Created
-        isBooked: Booked
-        isConfirmed: Confirmed
-        isOrdered: Ordered
-es:
-    params:
-       
-        invoiceNumber: Núm. factura
-        travelFk: Envío
-        companyFk: Empresa
-        currencyFk: Moneda
-        supplierFk: Proveedor
-        from: Desde
-        to: Hasta
-        created: Fecha creación
-        isBooked: Asentado
-        isConfirmed: Confirmado
-        isOrdered: Pedida
-</i18n>

src/pages/Entry/EntryLatestBuys.vue

@@ -102,7 +102,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('globals.weightByPiece'),
+        label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
         name: 'weightByPiece',
         columnFilter: {
             component: 'number',
@@ -157,7 +157,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.buys.packageValue'),
+        label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
         name: 'packageValue',
         columnFilter: {
             component: 'number',
@@ -262,8 +262,3 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :right-search="false"
     />
 </template>
-
-<i18n>
-es:
-    Edit buy(s): Editar compra(s)
-</i18n>

src/pages/Entry/EntryList.vue

@@ -2,17 +2,17 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import EntryFilter from './EntryFilter.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import { toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import EntrySummary from './Card/EntrySummary.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
+const dataKey = 'EntryList';
 
 const { viewSummary } = useSummaryDialog();
 const entryFilter = {
@@ -178,30 +178,32 @@ const columns = computed(() => [
     },
 ]);
 </script>
+
 <template>
-    <VnSearchbar
-        data-key="EntryList"
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="entry"
         url="Entries/filter"
-        :label="t('Search entries')"
-        :info="t('You can search by entry reference')"
-    />
-    <RightMenu>
-        <template #right-panel>
+        :array-data-props="{
+            url: 'Entries/filter',
+            order: 'id DESC',
+            userFilter: 'entryFilter',
+        }"
+    >
+        <template #rightMenu>
             <EntryFilter data-key="EntryList" />
         </template>
-    </RightMenu>
+        <template #body>
             <VnTable
                 ref="tableRef"
-        data-key="EntryList"
-        url="Entries/filter"
-        :filter="entryFilter"
+                :data-key="dataKey"
                 :create="{
                     urlCreate: 'Entries',
-            title: t('Create entry'),
+                    title: t('entry.list.newEntry'),
                     onDataSaved: ({ id }) => tableRef.redirect(id),
                     formInitialData: {},
                 }"
-        order="id DESC"
                 :columns="columns"
                 redirect="entry"
                 :right-search="false"
@@ -214,13 +216,17 @@ const columns = computed(() => [
                             color="primary"
                         >
                             <QTooltip>{{
-                        t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
+                                t(
+                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable'
+                                )
                             }}</QTooltip>
                         </QIcon>
                         <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                             <QTooltip>
                                 {{
-                            t('globals.raid', { daysInForward: row.daysInForward })
+                                    t('globals.raid', {
+                                        daysInForward: row.daysInForward,
+                                    })
                                 }}</QTooltip
                             >
                         </QIcon>
@@ -240,11 +246,5 @@ const columns = computed(() => [
                 </template>
             </VnTable>
         </template>
-
-<i18n>
-es:
-    Virtual entry: Es una redada
-    Search entries: Buscar entradas
-    You can search by entry reference: Puedes buscar por referencia de la entrada
-    Create entry: Crear entrada
-</i18n>
+    </VnSection>
+</template>

src/pages/Entry/EntryStockBought.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
@@ -19,7 +19,7 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
-const columns = [
+const columns = computed(() => [
     {
         align: 'left',
         label: 'Id',
@@ -31,7 +31,7 @@ const columns = [
     {
         align: 'left',
         name: 'workerFk',
-        label: t('Buyer'),
+        label: t('entryStockBought.buyer'),
         isTitle: true,
         component: 'select',
         cardVisible: true,
@@ -49,7 +49,7 @@ const columns = [
     },
     {
         align: 'center',
-        label: t('Reserve'),
+        label: t('entryStockBought.reserve'),
         name: 'reserve',
         columnFilter: false,
         create: true,
@@ -58,7 +58,7 @@ const columns = [
     },
     {
         align: 'center',
-        label: t('Bought'),
+        label: t('entryStockBought.bought'),
         name: 'bought',
         summation: true,
         cardVisible: true,
@@ -66,7 +66,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('Date'),
+        label: t('entryStockBought.date'),
         name: 'dated',
         component: 'date',
         visible: false,
@@ -77,7 +77,7 @@ const columns = [
         name: 'tableActions',
         actions: [
             {
-                title: t('View more details'),
+                title: t('entryStockBought.viewMoreDetails'),
                 icon: 'search',
                 isPrimary: true,
                 action: (row) => {
@@ -92,7 +92,7 @@ const columns = [
             },
         ],
     },
-];
+]);
 
 const fetchDataRef = ref();
 const travelDialogRef = ref(false);
@@ -166,7 +166,7 @@ function round(value) {
             <VnRow class="travel">
                 <div v-if="travel">
                     <span style="color: var(--vn-label-color)">
-                        {{ t('Purchase Spaces') }}:
+                        {{ t('entryStockBought.purchaseSpaces') }}:
                     </span>
                     <span>
                         {{ travel?.m3 }}
@@ -177,7 +177,7 @@ function round(value) {
                         flat
                         icon="edit"
                         @click="openDialog()"
-                        :title="t('Edit travel')"
+                        :title="t('entryStockBought.editTravel')"
                         color="primary"
                     />
                 </div>
@@ -226,7 +226,7 @@ function round(value) {
                 @on-fetch="(data) => setFooter(data)"
                 :create="{
                     urlCreate: 'StockBoughts',
-                    title: t('Reserve some space'),
+                    title: t('entryStockBought.reserveSomeSpace'),
                     onDataSaved: () => tableRef.reload(),
                     formInitialData: {
                         workerFk: user.id,
@@ -288,16 +288,3 @@ function round(value) {
     color: $negative !important;
 }
 </style>
-<i18n>
-    es:
-        Edit travel: Editar envío
-        Travel: Envíos
-        Purchase Spaces: Espacios de compra
-        Buyer: Comprador
-        Reserve: Reservado
-        Bought: Comprado
-        Date: Fecha
-        View more details: Ver más detalles
-        Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
-</i18n>

src/pages/Entry/MyEntries.vue

@@ -123,8 +123,8 @@ const printBuys = (rowId) => {
     <VnSearchbar
         data-key="myEntriesList"
         url="Entries/filter"
-        :label="t('Search entries')"
-        :info="t('You can search by entry reference')"
+        :label="t('myEntries.search')"
+        :info="t('myEntries.searchInfo')"
     />
     <VnTable
         data-key="myEntriesList"
@@ -137,7 +137,3 @@ const printBuys = (rowId) => {
         chip-locale="myEntries"
     />
 </template>
-
-<i18n>
-    You can search by entry reference: Puedes buscar por referencia de la entrada
-</i18n>

src/pages/Entry/locale/en.yml

@@ -1,9 +1,92 @@
-entryList:
+entry:
     list:
+        newEntry: New entry
+        tableVisibleColumns:
+            created: Creation
+            supplierFk: Supplier
+            isBooked: Booked
+            isConfirmed: Confirmed
+            isOrdered: Ordered
+            companyFk: Company
+            travelFk: Travel
+            isExcludedFromAvailable: Inventory
+            invoiceAmount: Import
         inventoryEntry: Inventory entry
-        showEntryReport: Show entry report
+    summary:
+        commission: Commission
+        currency: Currency
+        invoiceNumber: Invoice number
+        ordered: Ordered
+        booked: Booked
+        excludedFromAvailable: Inventory
+        travelReference: Reference
+        travelAgency: Agency
+        travelShipped: Shipped
+        travelDelivered: Delivered
+        travelLanded: Landed
+        travelReceived: Received
+        buys: Buys
+        stickers: Stickers
+        package: Package
+        packing: Pack.
+        grouping: Group.
+        buyingValue: Buying value
+        import: Import
+        pvp: PVP
+    basicData:
+        travel: Travel
+        currency: Currency
+        commission: Commission
+        observation: Observation
+        booked: Booked
+        excludedFromAvailable: Inventory
+    buys:
+        observations: Observations
+        packagingFk: Box
+        color: Color
+        printedStickers: Printed stickers
+    notes:
+        observationType: Observation type
+    latestBuys:
+        tableVisibleColumns:
+            image: Picture
+            itemFk: Item ID
+            weightByPiece: Weight/Piece
+            isActive: Active
+            family: Family
+            entryFk: Entry
+            freightValue: Freight value
+            comissionValue: Commission value
+            packageValue: Package value
+            isIgnored: Is ignored
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            packingOut: Package out
+            landing: Landing
+            isExcludedFromAvailable: Es inventory
+    params:
+        toShipped: To
+        fromShipped: From
+        daysOnward: Days onward
+        daysAgo: Days ago
+        warehouseInFk: Warehouse in
+    search: Search entries
+    searchInfo: You can search by entry reference
 entryFilter:
-    filter:
+    params:
+        invoiceNumber: Invoice number
+        travelFk: Travel
+        companyFk: Company
+        currencyFk: Currency
+        supplierFk: Supplier
+        from: From
+        to: To
+        created: Created
+        isBooked: Booked
+        isConfirmed: Confirmed
+        isOrdered: Ordered
         search: General search
         reference: Reference
 myEntries:
@@ -19,5 +102,18 @@ myEntries:
     daysOnward: Days onward
     daysAgo: Days ago
     downloadCsv: Download CSV
+    search: Search entries
+    searchInfo: You can search by entry reference
+entryStockBought:
+    travel: Travel
+    editTravel: Edit travel
+    purchaseSpaces: Purchase spaces
+    buyer: Buyer
+    reserve: Reserve
+    bought: Bought
+    date: Date
+    viewMoreDetails: View more details
+    reserveSomeSpace: Reserve some space
+    thisBuyerHasReservationThisDate: This buyer has already made a reservation for this date
 wasteRecalc:
     recalcOk: The wastes were successfully recalculated

src/pages/Entry/locale/es.yml

@@ -1,12 +1,93 @@
-Search entries: Buscar entradas
-You can search by entry reference: Puedes buscar por referencia de la entrada
-
-entryList:
+entry:
     list:
+        newEntry: Nueva entrada
+        tableVisibleColumns:
+            created: Creación
+            supplierFk: Proveedor
+            isBooked: Asentado
+            isConfirmed: Confirmado
+            isOrdered: Pedida
+            companyFk: Empresa
+            travelFk: Envio
+            isExcludedFromAvailable: Inventario
+            invoiceAmount: Importe
         inventoryEntry: Es inventario
-        showEntryReport: Ver informe del pedido
+    summary:
+        commission: Comisión
+        currency: Moneda
+        invoiceNumber: Núm. factura
+        ordered: Pedida
+        booked: Contabilizada
+        excludedFromAvailable: Inventario
+        travelReference: Referencia
+        travelAgency: Agencia
+        travelShipped: F. envio
+        travelWarehouseOut: Alm. salida
+        travelDelivered: Enviada
+        travelLanded: F. entrega
+        travelReceived: Recibida
+        buys: Compras
+        stickers: Etiquetas
+        package: Embalaje
+        packing: Pack.
+        grouping: Group.
+        buyingValue: Coste
+        import: Importe
+        pvp: PVP
+    basicData:
+        travel: Envío
+        currency: Moneda
+        observation: Observación
+        commission: Comisión
+        booked: Asentado
+        excludedFromAvailable: Inventario
+    buys:
+        observations: Observaciónes
+        packagingFk: Embalaje
+        color: Color
+        printedStickers: Etiquetas impresas
+    notes:
+        observationType: Tipo de observación
+    latestBuys:
+        tableVisibleColumns:
+            image: Foto
+            itemFk: Id Artículo
+            weightByPiece: Peso (gramos)/tallo
+            isActive: Activo
+            family: Familia
+            entryFk: Entrada
+            freightValue: Porte
+            comissionValue: Comisión
+            packageValue: Embalaje
+            isIgnored: Ignorado
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            packingOut: Embalaje envíos
+            landing: Llegada
+            isExcludedFromAvailable: Es inventario
+    params:
+        toShipped: Hasta
+        fromShipped: Desde
+        warehouseInFk: Alm. entrada
+        daysOnward: Días adelante
+        daysAgo: Días atras
+    search: Buscar entradas
+    searchInfo: Puedes buscar por referencia de entrada
 entryFilter:
-    filter:
+    params:
+        invoiceNumber: Núm. factura
+        travelFk: Envío
+        companyFk: Empresa
+        currencyFk: Moneda
+        supplierFk: Proveedor
+        from: Desde
+        to: Hasta
+        created: Fecha creación
+        isBooked: Asentado
+        isConfirmed: Confirmado
+        isOrdered: Pedida
         search: Búsqueda general
         reference: Referencia
 myEntries:
@@ -22,5 +103,18 @@ myEntries:
     daysOnward: Días adelante
     daysAgo: Días atras
     downloadCsv: Descargar CSV
+    search: Buscar entradas
+    searchInfo: Puedes buscar por referencia de la entrada
+entryStockBought:
+    travel: Envío
+    editTravel: Editar envío
+    purchaseSpaces: Espacios de compra
+    buyer: Comprador
+    reserve: Reservado
+    bought: Comprado
+    date: Fecha
+    viewMoreDetails: Ver más detalles
+    reserveSomeSpace: Reservar espacio
+    thisBuyerHasReservationThisDate: Este comprador ya ha hecho una reserva para esta fecha
 wasteRecalc:
     recalcOk: Se han recalculado las mermas correctamente

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -268,7 +268,7 @@ function deleteFile(dmsFk) {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('InvoiceIn.summary.sage')"
+                    :label="t('invoicein.summary.sage')"
                     v-model="data.withholdingSageFk"
                     :options="sageWithholdings"
                     option-value="id"

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -166,10 +166,10 @@ const createInvoiceInCorrection = async () => {
             <InvoiceInDescriptorMenu :invoice="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('invoiceIn.list.issued')" :value="toDate(entity.issued)" />
-            <VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />
-            <VnLv :label="t('invoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
-            <VnLv :label="t('invoiceIn.list.supplier')">
+            <VnLv :label="t('invoicein.list.issued')" :value="toDate(entity.issued)" />
+            <VnLv :label="t('invoicein.summary.bookedDate')" :value="toDate(entity.booked)" />
+            <VnLv :label="t('invoicein.list.amount')" :value="toCurrency(totalAmount)" />
+            <VnLv :label="t('invoicein.list.supplier')">
                 <template #value>
                     <span class="link">
                         {{ entity?.supplier?.nickname }}
@@ -186,7 +186,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getSupplier(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('invoiceIn.list.supplier') }}</QTooltip>
+                    <QTooltip>{{ t('invoicein.list.supplier') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -202,7 +202,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getTickets(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('invoiceOut.card.ticketList') }}</QTooltip>
+                    <QTooltip>{{ t('InvoiceOut.card.ticketList') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="

src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue

@@ -33,15 +33,15 @@ const entityId = computed(() => $props.invoice.id || +currentRoute.value.params.
 const invoiceIn = computed(() => arrayData.store.data);
 const actions = {
     unbook: {
-        title: t('assertAction', { action: t('InvoiceIn.descriptorMenu.unbook') }),
+        title: t('assertAction', { action: t('invoicein.descriptorMenu.unbook') }),
         action: toUnbook,
     },
     delete: {
-        title: t('assertAction', { action: t('InvoiceIn.descriptorMenu.delete') }),
+        title: t('assertAction', { action: t('invoicein.descriptorMenu.delete') }),
         action: deleteInvoice,
     },
     clone: {
-        title: t('assertAction', { action: t('InvoiceIn.descriptorMenu.clone') }),
+        title: t('assertAction', { action: t('invoicein.descriptorMenu.clone') }),
         action: cloneInvoice,
     },
     showPdf: { cb: showPdfInvoice },
@@ -84,7 +84,7 @@ async function deleteInvoice() {
     await axios.delete(`InvoiceIns/${entityId.value}`);
     quasar.notify({
         type: 'positive',
-        message: t('InvoiceIn.descriptorMenu.invoiceDeleted'),
+        message: t('invoicein.descriptorMenu.invoiceDeleted'),
     });
     push({ path: '/invoice-in' });
 }
@@ -93,7 +93,7 @@ async function cloneInvoice() {
     const { data } = await axios.post(`InvoiceIns/${entityId.value}/clone`);
     quasar.notify({
         type: 'positive',
-        message: t('InvoiceIn.descriptorMenu.invoiceCloned'),
+        message: t('invoicein.descriptorMenu.invoiceCloned'),
     });
     push({ path: `/invoice-in/${data.id}/summary` });
 }
@@ -144,7 +144,7 @@ function sendPdfInvoice({ address }) {
                 clickable
                 @click="book(entityId)"
             >
-                <QItemSection>{{ t('InvoiceIn.descriptorMenu.toBook') }}</QItemSection>
+                <QItemSection>{{ t('invoicein.descriptorMenu.toBook') }}</QItemSection>
             </QItem>
         </template>
     </InvoiceInToBook>
@@ -155,28 +155,28 @@ function sendPdfInvoice({ address }) {
         @click="triggerMenu('unbook')"
     >
         <QItemSection>
-            {{ t('InvoiceIn.descriptorMenu.toUnbook') }}
+            {{ t('invoicein.descriptorMenu.toUnbook') }}
         </QItemSection>
     </QItem>
     <QItem
         v-if="canEditProp('deleteById')"
         v-ripple
         clickable
-        @click="triggerMenu('InvoiceIn.descriptorMenu.delete')"
+        @click="triggerMenu('invoicein.descriptorMenu.delete')"
     >
-        <QItemSection>{{ t('InvoiceIn.descriptorMenu.deleteInvoice') }}</QItemSection>
+        <QItemSection>{{ t('invoicein.descriptorMenu.deleteInvoice') }}</QItemSection>
     </QItem>
     <QItem v-if="canEditProp('clone')" v-ripple clickable @click="triggerMenu('clone')">
-        <QItemSection>{{ t('InvoiceIn.descriptorMenu.cloneInvoice') }}</QItemSection>
+        <QItemSection>{{ t('invoicein.descriptorMenu.cloneInvoice') }}</QItemSection>
     </QItem>
     <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('showPdf')">
         <QItemSection>{{
-            t('InvoiceIn.descriptorMenu.showAgriculturalPdf')
+            t('invoicein.descriptorMenu.showAgriculturalPdf')
         }}</QItemSection>
     </QItem>
     <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('sendPdf')">
         <QItemSection
-            >{{ t('InvoiceIn.descriptorMenu.sendAgriculturalPdf') }}...</QItemSection
+            >{{ t('invoicein.descriptorMenu.sendAgriculturalPdf') }}...</QItemSection
         >
     </QItem>
     <QItem
@@ -186,7 +186,7 @@ function sendPdfInvoice({ address }) {
         @click="triggerMenu('correct')"
     >
         <QItemSection
-            >{{ t('InvoiceIn.descriptorMenu.createCorrective') }}...</QItemSection
+            >{{ t('invoicein.descriptorMenu.createCorrective') }}...</QItemSection
         >
     </QItem>
     <QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -27,14 +27,14 @@ const intrastatTotals = ref({ amount: 0, net: 0, stems: 0 });
 const vatColumns = ref([
     {
         name: 'expense',
-        label: 'InvoiceIn.summary.expense',
+        label: 'invoicein.summary.expense',
         field: (row) => row.expenseFk,
         sortable: true,
         align: 'left',
     },
     {
         name: 'landed',
-        label: 'InvoiceIn.summary.taxableBase',
+        label: 'invoicein.summary.taxableBase',
         field: (row) => row.taxableBase,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -42,7 +42,7 @@ const vatColumns = ref([
     },
     {
         name: 'vat',
-        label: 'InvoiceIn.summary.sageVat',
+        label: 'invoicein.summary.sageVat',
         field: (row) => {
             if (row.taxTypeSage) return `#${row.taxTypeSage.id} : ${row.taxTypeSage.vat}`;
         },
@@ -52,7 +52,7 @@ const vatColumns = ref([
     },
     {
         name: 'transaction',
-        label: 'InvoiceIn.summary.sageTransaction',
+        label: 'invoicein.summary.sageTransaction',
         field: (row) => {
             if (row.transactionTypeSage)
                 return `#${row.transactionTypeSage.id} : ${row.transactionTypeSage?.transaction}`;
@@ -63,7 +63,7 @@ const vatColumns = ref([
     },
     {
         name: 'rate',
-        label: 'InvoiceIn.summary.rate',
+        label: 'invoicein.summary.rate',
         field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
         format: (value) => toCurrency(value),
         sortable: true,
@@ -71,7 +71,7 @@ const vatColumns = ref([
     },
     {
         name: 'currency',
-        label: 'InvoiceIn.summary.currency',
+        label: 'invoicein.summary.currency',
         field: (row) => row.foreignValue,
         format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
@@ -82,21 +82,21 @@ const vatColumns = ref([
 const dueDayColumns = ref([
     {
         name: 'date',
-        label: 'InvoiceIn.summary.dueDay',
+        label: 'invoicein.summary.dueDay',
         field: (row) => toDate(row.dueDated),
         sortable: true,
         align: 'left',
     },
     {
         name: 'bank',
-        label: 'InvoiceIn.summary.bank',
+        label: 'invoicein.summary.bank',
         field: (row) => row.bank.bank,
         sortable: true,
         align: 'left',
     },
     {
         name: 'amount',
-        label: 'InvoiceIn.list.amount',
+        label: 'invoicein.list.amount',
         field: (row) => row.amount,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -104,7 +104,7 @@ const dueDayColumns = ref([
     },
     {
         name: 'landed',
-        label: 'InvoiceIn.summary.foreignValue',
+        label: 'invoicein.summary.foreignValue',
         field: (row) => row.foreignValue,
         format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
@@ -115,7 +115,7 @@ const dueDayColumns = ref([
 const intrastatColumns = ref([
     {
         name: 'code',
-        label: 'InvoiceIn.summary.code',
+        label: 'invoicein.summary.code',
         field: (row) => {
             return `${row.intrastat.id}: ${row.intrastat?.description}`;
         },
@@ -124,21 +124,21 @@ const intrastatColumns = ref([
     },
     {
         name: 'amount',
-        label: 'InvoiceIn.list.amount',
+        label: 'invoicein.list.amount',
         field: (row) => toCurrency(row.amount),
         sortable: true,
         align: 'left',
     },
     {
         name: 'net',
-        label: 'InvoiceIn.summary.net',
+        label: 'invoicein.summary.net',
         field: (row) => row.net,
         sortable: true,
         align: 'left',
     },
     {
         name: 'stems',
-        label: 'InvoiceIn.summary.stems',
+        label: 'invoicein.summary.stems',
         field: (row) => row.stems,
         format: (value) => value,
         sortable: true,
@@ -146,7 +146,7 @@ const intrastatColumns = ref([
     },
     {
         name: 'landed',
-        label: 'InvoiceIn.summary.country',
+        label: 'invoicein.summary.country',
         field: (row) => row.country?.code,
         format: (value) => value,
         sortable: true,
@@ -214,7 +214,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('InvoiceIn.list.supplier')"
+                    :label="t('invoicein.list.supplier')"
                     :value="entity.supplier?.name"
                 >
                     <template #value>
@@ -225,14 +225,14 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('InvoiceIn.list.supplierRef')"
+                    :label="t('invoicein.list.supplierRef')"
                     :value="entity.supplierRef"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.summary.currency')"
+                    :label="t('invoicein.summary.currency')"
                     :value="entity.currency?.code"
                 />
-                <VnLv :label="t('InvoiceIn.serial')" :value="`${entity.serial}`" />
+                <VnLv :label="t('invoicein.serial')" :value="`${entity.serial}`" />
                 <VnLv
                     :label="t('globals.country')"
                     :value="entity.supplier?.country?.code"
@@ -247,19 +247,19 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </QCardSection>
                 <VnLv
                     :ellipsis-value="false"
-                    :label="t('InvoiceIn.summary.issued')"
+                    :label="t('invoicein.summary.issued')"
                     :value="toDate(entity.issued)"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.summary.operated')"
+                    :label="t('invoicein.summary.operated')"
                     :value="toDate(entity.operated)"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.summary.bookEntried')"
+                    :label="t('invoicein.summary.bookEntried')"
                     :value="toDate(entity.bookEntried)"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.summary.bookedDate')"
+                    :label="t('invoicein.summary.bookedDate')"
                     :value="toDate(entity.booked)"
                 />
                 <VnLv :label="t('globals.isVies')" :value="entity.supplier?.isVies" />
@@ -272,18 +272,18 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('InvoiceIn.summary.sage')"
+                    :label="t('invoicein.summary.sage')"
                     :value="entity.sageWithholding?.withholding"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.summary.vat')"
+                    :label="t('invoicein.summary.vat')"
                     :value="entity.expenseDeductible?.name"
                 />
                 <VnLv
-                    :label="t('InvoiceIn.card.company')"
+                    :label="t('invoicein.card.company')"
                     :value="entity.company?.code"
                 />
-                <VnLv :label="t('InvoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
+                <VnLv :label="t('invoicein.isBooked')" :value="invoiceIn?.isBooked" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -294,11 +294,11 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </QCardSection>
                 <QCardSection class="q-pa-none">
                     <VnLv
-                        :label="t('InvoiceIn.summary.taxableBase')"
+                        :label="t('invoicein.summary.taxableBase')"
                         :value="toCurrency(entity.totals.totalTaxableBase)"
                     />
                     <VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
-                    <VnLv :label="t('InvoiceIn.summary.dueTotal')">
+                    <VnLv :label="t('invoicein.summary.dueTotal')">
                         <template #value>
                             <QChip
                                 dense
@@ -306,8 +306,8 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                 :color="amountsNotMatch ? 'negative' : 'transparent'"
                                 :title="
                                     amountsNotMatch
-                                        ? t('InvoiceIn.summary.noMatch')
-                                        : t('InvoiceIn.summary.dueTotal')
+                                        ? t('invoicein.summary.noMatch')
+                                        : t('invoicein.summary.dueTotal')
                                 "
                             >
                                 {{ toCurrency(entity.totals.totalDueDay) }}
@@ -318,7 +318,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <!--Vat-->
             <QCard v-if="entity.invoiceInTax.length" class="vat">
-                <VnTitle :url="getLink('vat')" :text="t('InvoiceIn.card.vat')" />
+                <VnTitle :url="getLink('vat')" :text="t('invoicein.card.vat')" />
                 <QTable
                     :columns="vatColumns"
                     :rows="entity.invoiceInTax"
@@ -366,7 +366,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <!--Due Day-->
             <QCard v-if="entity.invoiceInDueDay.length" class="due-day">
-                <VnTitle :url="getLink('due-day')" :text="t('InvoiceIn.card.dueDay')" />
+                <VnTitle :url="getLink('due-day')" :text="t('invoicein.card.dueDay')" />
                 <QTable :columns="dueDayColumns" :rows="entity.invoiceInDueDay" flat>
                     <template #header="dueDayProps">
                         <QTr :props="dueDayProps" class="bg">
@@ -404,7 +404,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             <QCard v-if="entity.invoiceInIntrastat.length">
                 <VnTitle
                     :url="getLink('intrastat')"
-                    :text="t('InvoiceIn.card.intrastat')"
+                    :text="t('invoicein.card.intrastat')"
                 />
                 <QTable
                     :columns="intrastatColumns"

src/pages/InvoiceIn/InvoiceInCreate.vue

@@ -83,7 +83,7 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         </template>
                     </VnSelect>
                     <VnInput
-                        :label="t('InvoiceIn.list.supplierRef')"
+                        :label="t('invoicein.list.supplierRef')"
                         v-model="data.supplierRef"
                     />
                 </VnRow>
@@ -97,10 +97,10 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         map-options
                         hide-selected
                         :required="true"
-                        :rules="validate('InvoiceIn.companyFk')"
+                        :rules="validate('invoicein.companyFk')"
                     />
                     <VnInputDate
-                        :label="t('InvoiceIn.summary.issued')"
+                        :label="t('invoicein.summary.issued')"
                         v-model="data.issued"
                     />
                 </VnRow>

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -164,7 +164,7 @@ function handleDaysAgo(params, daysAgo) {
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="$t('InvoiceIn.isBooked')"
+                        :label="$t('invoicein.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate

src/pages/InvoiceIn/InvoiceInList.vue

@@ -26,7 +26,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'isBooked',
-        label: t('InvoiceIn.isBooked'),
+        label: t('invoicein.isBooked'),
         columnFilter: false,
     },
     {
@@ -41,7 +41,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'supplierFk',
-        label: t('InvoiceIn.list.supplier'),
+        label: t('invoicein.list.supplier'),
         columnFilter: {
             component: 'select',
             attrs: {
@@ -55,16 +55,16 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'supplierRef',
-        label: t('InvoiceIn.list.supplierRef'),
+        label: t('invoicein.list.supplierRef'),
     },
     {
         align: 'left',
         name: 'serial',
-        label: t('InvoiceIn.serial'),
+        label: t('invoicein.serial'),
     },
     {
         align: 'left',
-        label: t('InvoiceIn.list.issued'),
+        label: t('invoicein.list.issued'),
         name: 'issued',
         component: null,
         columnFilter: {
@@ -74,7 +74,7 @@ const cols = computed(() => [
     },
     {
         align: 'left',
-        label: t('InvoiceIn.list.dueDated'),
+        label: t('invoicein.list.dueDated'),
         name: 'dueDated',
         component: null,
         columnFilter: {
@@ -86,12 +86,12 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'awbCode',
-        label: t('InvoiceIn.list.awb'),
+        label: t('invoicein.list.awb'),
     },
     {
         align: 'left',
         name: 'amount',
-        label: t('InvoiceIn.list.amount'),
+        label: t('invoicein.list.amount'),
         format: ({ amount }) => toCurrency(amount),
         cardVisible: true,
     },
@@ -182,7 +182,7 @@ const cols = computed(() => [
                 </template>
             </VnSelect>
             <VnInput
-                :label="t('InvoiceIn.list.supplierRef')"
+                :label="t('invoicein.list.supplierRef')"
                 v-model="data.supplierRef"
             />
             <VnSelect
@@ -194,7 +194,7 @@ const cols = computed(() => [
                 option-label="code"
                 :required="true"
             />
-            <VnInputDate :label="t('InvoiceIn.summary.issued')" v-model="data.issued" />
+            <VnInputDate :label="t('invoicein.summary.issued')" v-model="data.issued" />
         </template>
     </VnTable>
 </template>

src/pages/InvoiceIn/locale/en.yml

@@ -1,4 +1,4 @@
-InvoiceIn:
+invoicein:
     serial: Serial
     isBooked: Is booked
     list:
@@ -66,7 +66,6 @@ InvoiceIn:
         search: Id or supplier name
         correctedFk: Corrected
         isBooked: Is booked
-invoicein:
-    params:
         account: Ledger account
         correctingFk: Rectificative
+        

src/pages/InvoiceIn/locale/es.yml

@@ -1,4 +1,4 @@
-InvoiceIn:
+invoicein:
     serial: Serie
     isBooked: Contabilizada
     list:
@@ -63,7 +63,6 @@ InvoiceIn:
     params:
         search: Id o nombre proveedor
         correctedFk: Rectificada
-invoicein:
-    params:
         account: Cuenta contable
         correctingFk: Rectificativa
+

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -355,7 +355,7 @@ watchEffect(selectedRows);
                         <VnSelect
                             url="InvoiceOutSerials"
                             v-model="data.serial"
-                            :label="t('InvoiceIn.serial')"
+                            :label="t('invoicein.serial')"
                             :options="invoiceOutSerialsOptions"
                             option-label="description"
                             option-value="code"

src/pages/Item/Card/ItemDiary.vue

@@ -1,7 +1,7 @@
 <script setup>
-import { onMounted, computed, reactive, ref, nextTick, watch } from 'vue';
+import { onMounted, computed, ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
@@ -22,19 +22,16 @@ import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
 const state = useState();
 const user = state.getUser();
-const today = ref(Date.vnNew());
+const today = Date.vnNew();
+today.setHours(0, 0, 0, 0);
 const warehousesOptions = ref([]);
-const itemBalancesRef = ref(null);
-const itemsBalanceFilter = reactive({
-    where: { itemFk: route.params.id, warehouseFk: null, date: null },
-});
-const itemBalances = ref([]);
-const warehouseFk = ref(null);
-const _showWhatsBeforeInventory = ref(false);
+const itemBalances = computed(() => arrayDataItemBalances.store.data);
+const where = computed(() => arrayDataItemBalances.store.filter.where || {});
+const showWhatsBeforeInventory = ref(false);
 const inventoriedDate = ref(null);
+let arrayDataItemBalances = useArrayData('ItemBalances');
 
 const originTypeMap = {
     entry: {
@@ -122,36 +119,28 @@ const columns = computed(() => [
     },
 ]);
 
-const showWhatsBeforeInventory = computed({
-    get: () => _showWhatsBeforeInventory.value,
-    set: (val) => {
-        _showWhatsBeforeInventory.value = val;
-        if (!val) itemsBalanceFilter.where.date = null;
-        else itemsBalanceFilter.where.date = inventoriedDate.value ?? new Date();
-    },
+onMounted(async () => {
+    const ref = where.value;
+    const query = route.query;
+    inventoriedDate.value =
+        (await axios.get('Configs/findOne')).data?.inventoried || today;
+
+    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;
+
+    arrayDataItemBalances = useArrayData('ItemBalances', {
+        url: 'Items/getBalance',
+        filter: { where: ref },
     });
 
-onMounted(async () => {
-    today.value.setHours(0, 0, 0, 0);
-    if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
-    else if (user.value) warehouseFk.value = user.value.warehouseFk;
-    itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
-    const { data } = await axios.get('Configs/findOne');
-    inventoriedDate.value = data.inventoried;
     await fetchItemBalances();
     await scrollToToday();
-    await updateWarehouse(warehouseFk.value);
+    await updateWarehouse(ref.warehouseFk);
 });
 
-watch(
-    () => router.currentRoute.value.params.id,
-    (newId) => {
-        itemsBalanceFilter.where.itemFk = newId;
-        itemBalancesRef.value.fetch();
-    }
-);
-
-const fetchItemBalances = async () => await itemBalancesRef.value.fetch();
+const fetchItemBalances = async () => await arrayDataItemBalances.fetch({});
 
 const getBadgeAttrs = (_date) => {
     const isSameDate = date.isSameDate(today.value, _date);
@@ -178,23 +167,13 @@ const formatDateForAttribute = (dateValue) => {
 };
 
 async function updateWarehouse(warehouseFk) {
-    const stock = useArrayData('descriptorStock', {
-        userParams: {
-            warehouseFk,
-        },
-    });
+    const stock = useArrayData('descriptorStock', { userParams: { warehouseFk } });
     await stock.fetch({});
     stock.store.data.itemFk = route.params.id;
 }
 </script>
 
 <template>
-    <FetchData
-        ref="itemBalancesRef"
-        url="Items/getBalance"
-        :filter="itemsBalanceFilter"
-        @on-fetch="(data) => (itemBalances = data)"
-    />
     <FetchData
         url="Warehouses"
         :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
@@ -207,27 +186,30 @@ async function updateWarehouse(warehouseFk) {
                 <VnSelect
                     :label="t('itemDiary.warehouse')"
                     :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    dense
-                    v-model="itemsBalanceFilter.where.warehouseFk"
+                    v-model="where.warehouseFk"
                     @update:model-value="
-                        (value) => fetchItemBalances() && updateWarehouse(value)
+                        (val) => fetchItemBalances() && updateWarehouse(val)
                     "
                     class="q-mr-lg"
+                    :is-clearable="false"
                 />
                 <QCheckbox
                     :label="t('itemDiary.showBefore')"
                     v-model="showWhatsBeforeInventory"
-                    @update:model-value="fetchItemBalances"
+                    @update:model-value="
+                        async (val) => {
+                            if (!val) where.date = null;
+                            else where.date = inventoriedDate;
+                            await fetchItemBalances();
+                        }
+                    "
                     class="q-mr-lg"
                 />
                 <VnInputDate
                     v-if="showWhatsBeforeInventory"
                     :label="t('itemDiary.since')"
                     dense
-                    v-model="itemsBalanceFilter.where.date"
+                    v-model="where.date"
                     @update:model-value="fetchItemBalances"
                 />
             </div>

src/pages/Item/Card/ItemLastEntries.vue

@@ -36,18 +36,7 @@ const exprBuilder = (param, value) => {
     }
 };
 
-const where = {
-    itemFk: route.params.id,
-};
-
-const arrayData = useArrayData('ItemLastEntries', {
-    url: 'Items/lastEntriesFilter',
-    order: ['landed DESC', 'buyFk DESC'],
-    exprBuilder: exprBuilder,
-    userFilter: {
-        where: where,
-    },
-});
+let arrayData = useArrayData('ItemLastEntries');
 const itemLastEntries = ref([]);
 
 const columns = computed(() => [
@@ -161,25 +150,51 @@ const getDate = (date, type) => {
 };
 
 const updateFilter = async () => {
-    let filter;
-    if (!from.value && to.value) filter = { lte: to.value };
-    else if (from.value && !to.value) filter = { gte: from.value };
-    else if (from.value && to.value) filter = { between: [from.value, to.value] };
-
-    const userFilter = arrayData.store.userFilter.where;
-
-    userFilter.landed = filter;
+    let landed;
+    if (!from.value && to.value) landed = { lte: to.value };
+    else if (from.value && !to.value) landed = { gte: from.value };
+    else if (from.value && to.value) landed = { between: [from.value, to.value] };
 
+    arrayData.store.filter.where.landed = landed;
     await fetchItemLastEntries();
 };
 
 onMounted(async () => {
+    const landed = arrayData.store.filter.where?.landed;
+    arrayData = useArrayData('ItemLastEntries', {
+        url: 'Items/lastEntriesFilter',
+        order: ['landed DESC', 'buyFk DESC'],
+        exprBuilder: exprBuilder,
+        filter: {
+            where: {
+                itemFk: route.params.id,
+                landed,
+            },
+        },
+    });
+
+    if (landed) {
+        const key = Object.keys(landed)[0];
+        switch (key) {
+            case 'gte':
+                from.value = landed.gte;
+                break;
+            case 'lte':
+                to.value = landed.lte;
+                break;
+            case 'between':
+                from.value = landed.between[0];
+                to.value = landed.between[1];
+                break;
+        }
+    } else {
         const _from = Date.vnNew();
         _from.setDate(_from.getDate() - 75);
         from.value = getDate(_from, 'from');
         const _to = Date.vnNew();
         _to.setDate(_to.getDate() + 10);
         to.value = getDate(_to, 'to');
+    }
 
     updateFilter();
 

src/pages/Item/ItemList.vue

@@ -391,7 +391,7 @@ onBeforeMount(async () => {
                     {{ row?.subName.toUpperCase() }}
                 </div>
             </div>
-            <FetchedTags :item="row" :columns="3" />
+            <FetchedTags :item="row" />
         </template>
         <template #more-create-dialog="{ data }">
             <VnInput

src/pages/Item/locale/en.yml

@@ -58,6 +58,7 @@ lastEntries:
     pvp: PVP
     label: Label
     grouping: Grouping
+    packing: Packing
     quantity: Quantity
     cost: Cost
     kg: Kg.

src/pages/Item/locale/es.yml

@@ -58,6 +58,7 @@ lastEntries:
     pvp: PVP
     label: Eti.
     grouping: Grouping
+    packing: Packing
     quantity: Cantidad
     cost: Coste
     kg: Kg.

src/pages/Order/Card/OrderCard.vue

@@ -1,38 +1,12 @@
 <script setup>
-import { computed } from 'vue';
-import { useRoute } from 'vue-router';
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
-import OrderFilter from './OrderFilter.vue';
-import OrderSearchbar from './OrderSearchbar.vue';
-import OrderCatalogFilter from './OrderCatalogFilter.vue';
-const config = {
-    OrderCatalog: OrderCatalogFilter,
-};
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => {
-    const route = config[routeName.value];
-    if (route) return null;
-    return 'OrderList';
-});
-const customFilterPanel = computed(() => {
-    const filterPanel = config[routeName.value] ?? OrderFilter;
-    return filterPanel;
-});
 </script>
 
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Order"
         base-url="Orders"
         :descriptor="OrderDescriptor"
-        :filter-panel="customFilterPanel"
-        :search-data-key="customRouteRedirectName"
-    >
-        <template #searchbar>
-            <OrderSearchbar />
-        </template>
-    </VnCard>
+    />
 </template>

src/pages/Order/Card/OrderCatalog.vue

@@ -15,15 +15,18 @@ const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const dataKey = 'OrderCatalogList';
-const arrayData = useArrayData(dataKey);
-const store = arrayData.store;
-const tags = ref([]);
-const itemRefs = ref({});
-
-let catalogParams = {
+const catalogParams = {
     orderFk: route.params.id,
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
+const arrayData = useArrayData(dataKey, {
+    url: 'Orders/CatalogFilter',
+    limit: 50,
+    userParams: catalogParams,
+});
+const store = arrayData.store;
+const tags = ref([]);
+const itemRefs = ref({});
 
 onMounted(() => {
     stateStore.rightDrawer = true;
@@ -66,7 +69,6 @@ function extractValueTags(items) {
     );
     tagValue.value = resultValueTags;
 }
-const autoLoad = computed(() => !!JSON.parse(route?.query.table ?? '{}')?.categoryFk);
 
 watch(
     () => store.data,
@@ -78,16 +80,15 @@ watch(
 </script>
 
 <template>
+    <Teleport to="#section-searchbar" v-if="stateStore.isHeaderMounted()">
         <VnSearchbar
             :data-key="dataKey"
-        :user-params="catalogParams"
-        :static-params="['orderFk', 'orderBy']"
             :redirect="false"
-        url="Orders/CatalogFilter"
             :label="t('Search items')"
             :info="t('You can search items by name or id')"
             :search-remove-params="false"
         />
+    </Teleport>
     <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <OrderCatalogFilter
             :data-key="dataKey"
@@ -98,13 +99,7 @@ watch(
     </Teleport>
     <QPage class="column items-center q-pa-md" data-cy="orderCatalogPage">
         <div class="full-width">
-            <VnPaginate
-                :data-key="dataKey"
-                url="Orders/CatalogFilter"
-                :limit="50"
-                :user-params="catalogParams"
-                :auto-load="autoLoad"
-            >
+            <VnPaginate :data-key="dataKey">
                 <template #body="{ rows }">
                     <div class="catalog-list">
                         <div v-if="rows && !rows?.length" class="no-result">

src/pages/Order/Card/OrderLines.vue

@@ -208,15 +208,28 @@ async function remove(item) {
 async function handleConfirm() {
     const result = await confirm(route.params.id);
     if (result) {
+        const sale = await axios.get(`OrderRows`, {
+            params: {
+                filter: JSON.stringify({
+                    where: { orderFk: route.params.id },
+                }),
+            },
+        });
+        const ticket = await axios.get(`Sales`, {
+            params: {
+                filter: JSON.stringify({
+                    where: { id: sale.data[0].saleFk },
+                }),
+            },
+        });
         quasar.notify({
             message: t('globals.dataSaved'),
             type: 'positive',
         });
         router.push({
-            name: 'TicketList',
-            query: {
-                table: JSON.stringify({ clientFk: descriptorData.store.data.clientFk }),
-            },
+            name: 'TicketSale',
+            params: { id: ticket.data[0].ticketFk },
+            query: { table: JSON.stringify({ filter: { limit: 20, skip: 0 } }) },
         });
     }
 }

src/pages/Order/Card/OrderSearchbar.vue

@@ -1,22 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-
-const { t } = useI18n();
-</script>
-
-<template>
-    <VnSearchbar
-        data-key="OrderList"
-        url="Orders/filter"
-        :label="t('Search order')"
-        :info="t('Search orders by ticket id')"
-    />
-</template>
-
-<style scoped lang="scss"></style>
-<i18n>
-es:
-    Search order: Buscar orden
-    Search orders by ticket id: Buscar pedido por id ticket
-</i18n>

src/pages/Order/OrderList.vue

@@ -8,15 +8,14 @@ import { useRoute } from 'vue-router';
 
 import axios from 'axios';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
-import OrderSearchbar from './Card/OrderSearchbar.vue';
 import OrderFilter from './Card/OrderFilter.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -24,6 +23,8 @@ const tableRef = ref();
 const agencyList = ref([]);
 const route = useRoute();
 const addressOptions = ref([]);
+const dataKey = 'OrderList';
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -178,18 +179,24 @@ const getDateColor = (date) => {
     if (difference < 0) return 'bg-success';
 };
 </script>
+
 <template>
-    <OrderSearchbar />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="order"
+        :array-data-props="{
+            url: 'Orders/filter',
+            order: ['landed DESC', 'clientFk ASC', 'id DESC'],
+        }"
+    >
+        <template #rightMenu>
             <OrderFilter data-key="OrderList" />
         </template>
-    </RightMenu>
+        <template #body>
             <VnTable
                 ref="tableRef"
-        data-key="OrderList"
-        url="Orders/filter"
-        :order="['landed DESC', 'clientFk ASC', 'id DESC']"
+                :data-key="dataKey"
                 :create="{
                     urlCreate: 'Orders/new',
                     title: t('module.cerateOrder'),
@@ -270,7 +277,8 @@ const getDateColor = (date) => {
                                                     : ''
                                             } `
                                         }}
-                                {{ scope.opt?.nickname }}: {{ scope.opt?.street }},
+                                        {{ scope.opt?.nickname }}:
+                                        {{ scope.opt?.street }},
                                         {{ scope.opt?.city }}
                                     </QItemLabel>
                                 </QItemSection>
@@ -292,3 +300,5 @@ const getDateColor = (date) => {
                 </template>
             </VnTable>
         </template>
+    </VnSection>
+</template>

src/pages/Order/locale/en.yml

@@ -21,3 +21,26 @@ lines:
     image: Image
 params:
     tagGroups: Tags
+order:
+    field:
+        salesPersonFk: Sales Person
+    form:
+        clientFk: Client
+        addressFk: Address
+        agencyModeFk: Agency
+    list:
+        newOrder: New Order
+    summary:
+        basket: Basket
+        notConfirmed: Not confirmed
+        created: Created
+        createdFrom: Created From
+        address: Address
+        total: Total
+        items: Items
+        orderTicketList: Order Ticket List
+        amount: Amount
+        confirm: Confirm
+        confirmLines: Confirm lines
+    search: Search orders
+    searchInfo: You can search orders by ticket id

src/pages/Order/locale/es.yml

@@ -21,3 +21,29 @@ lines:
     image: Imagen
 params:
     tagGroups: Tags
+order:
+    field:
+        salesPersonFk: Comercial
+    form:
+        clientFk: Cliente
+        addressFk: Dirección
+        agencyModeFk: Agencia
+    list:
+        newOrder: Nuevo Pedido
+    summary:
+        basket: Cesta
+        notConfirmed: No confirmada
+        created: Creado
+        createdFrom: Creado desde
+        address: Dirección
+        total: Total
+        vat: IVA
+        state: Estado
+        alias: Alias
+        items: Artículos
+        orderTicketList: Tickets del pedido
+        amount: Monto
+        confirm: Confirmar
+        confirmLines: Confirmar lineas
+    search: Buscar pedido
+    searchInfo: Buscar pedidos por el número de ticket

src/pages/Supplier/Card/SupplierFiscalData.vue

@@ -92,6 +92,7 @@ function handleLocation(data, location) {
                 <VnInput
                     v-model="data.name"
                     :label="t('supplier.fiscalData.name')"
+                    uppercase="true"
                     clearable
                 />
                 <VnInput

src/pages/Supplier/SupplierList.vue

@@ -5,6 +5,7 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import SupplierListFilter from './SupplierListFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -23,9 +24,14 @@ const columns = computed(() => [
         align: 'left',
         label: t('globals.name'),
         name: 'socialName',
-        create: true,
+        attrs: {
+            uppercase: true,
+        },
         columnFilter: {
             name: 'search',
+            attrs: {
+                uppercase: false,
+            },
         },
         isTitle: true,
     },
@@ -118,14 +124,18 @@ const columns = computed(() => [
             formInitialData: {},
             mapper: (data) => {
                 data.name = data.socialName;
-                delete data.socialName;
+
                 return data;
             },
         }"
         :right-search="false"
         order="id ASC"
         :columns="columns"
-    />
+    >
+        <template #more-create-dialog="{ data }">
+            <VnInput :label="t('globals.name')" v-model="data.socialName" :uppercase="true" />
+            </template>
+    </VnTable>
 </template>
 
 <i18n>

src/pages/Worker/WorkerList.vue

@@ -138,7 +138,11 @@ function uppercaseStreetModel(data) {
     return {
         get: () => (data.street ? data.street.toUpperCase() : ''),
         set: (value) => {
+            if (value) {
                 data.street = value.toUpperCase();
+            } else {
+                data.street = null;
+            }
         },
     };
 }

src/router/modules/entry.js

@@ -1,98 +1,23 @@
 import { RouterView } from 'vue-router';
 
-export default {
-    path: '/entry',
-    name: 'Entry',
-    meta: {
-        title: 'entries',
-        icon: 'vn:entry',
-        moduleName: 'Entry',
-        keyBinding: 'e',
-    },
-    component: RouterView,
-    redirect: { name: 'EntryMain' },
-    menus: {
-        main: [
-            'EntryList',
-            'MyEntries',
-            'EntryLatestBuys',
-            'EntryStockBought',
-            'EntryWasteRecalc',
-        ],
-        card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
-    },
-    children: [
-        {
-            path: '',
-            name: 'EntryMain',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'EntryList' },
-            children: [
-                {
-                    path: 'list',
-                    name: 'EntryList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Entry/EntryList.vue'),
-                },
-                {
-                    path: 'my',
-                    name: 'MyEntries',
-                    meta: {
-                        title: 'labeler',
-                        icon: 'sell',
-                    },
-                    component: () => import('src/pages/Entry/MyEntries.vue'),
-                },
-                {
-                    path: 'create',
-                    name: 'EntryCreate',
-                    meta: {
-                        title: 'entryCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Entry/EntryCreate.vue'),
-                },
-                {
-                    path: 'latest-buys',
-                    name: 'EntryLatestBuys',
-                    meta: {
-                        title: 'latestBuys',
-                        icon: 'contact_support',
-                    },
-                    component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
-                },
-                {
-                    path: 'stock-Bought',
-                    name: 'EntryStockBought',
-                    meta: {
-                        title: 'reserves',
-                        icon: 'deployed_code_history',
-                    },
-                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
-                },
-                {
-                    path: 'waste-recalc',
-                    name: 'EntryWasteRecalc',
-                    meta: {
-                        title: 'wasteRecalc',
-                        icon: 'compost',
-                    },
-                    component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
-                },
-            ],
-        },
-        {
+const entryCard = {
     name: 'EntryCard',
     path: ':id',
     component: () => import('src/pages/Entry/Card/EntryCard.vue'),
     redirect: { name: 'EntrySummary' },
+    meta: {
+        menu: [
+            'EntryBasicData',
+            'EntryBuys',
+            'EntryNotes',
+            'EntryDms',
+            'EntryLog',
+        ],
+    },
     children: [
         {
-                    name: 'EntrySummary',
             path: 'summary',
+            name: 'EntrySummary',
             meta: {
                 title: 'summary',
                 icon: 'launch',
@@ -150,6 +75,96 @@ export default {
             component: () => import('src/pages/Entry/Card/EntryLog.vue'),
         },
     ],
+};
+
+export default {
+    name: 'Entry',
+    path: '/entry',
+    meta: {
+        title: 'entries',
+        icon: 'vn:entry',
+        moduleName: 'Entry',
+        keyBinding: 'e',
+        menu: [
+            'EntryList',
+            'MyEntries',
+            'EntryLatestBuys',
+            'EntryStockBought',
+            'EntryWasteRecalc',
+        ]
+    },
+    component: RouterView,
+    redirect: { name: 'EntryMain' },
+    children: [
+        {
+            name: 'EntryMain',
+            path: '',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'EntryIndexMain' },
+            children: [
+                {
+                    path:'',
+                    name: 'EntryIndexMain',
+                    redirect: { name: 'EntryList' },
+                    component: () => import('src/pages/Entry/EntryList.vue'),
+                    children: [
+                        {
+                            name: 'EntryList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        entryCard,
+                    ],
+                },
+                {
+                    path: 'create',
+                    name: 'EntryCreate',
+                    meta: {
+                        title: 'entryCreate',
+                        icon: 'add',
+                    },
+                    component: () => import('src/pages/Entry/EntryCreate.vue'),
+                },                
+                {
+                    path: 'my',
+                    name: 'MyEntries',
+                    meta: {
+                        title: 'labeler',
+                        icon: 'sell',
+                    },
+                    component: () => import('src/pages/Entry/MyEntries.vue'),
+                },
+                {
+                    path: 'latest-buys',
+                    name: 'EntryLatestBuys',
+                    meta: {
+                        title: 'latestBuys',
+                        icon: 'contact_support',
+                    },
+                    component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
+                },
+                {
+                    path: 'stock-Bought',
+                    name: 'EntryStockBought',
+                    meta: {
+                        title: 'reserves',
+                        icon: 'deployed_code_history',
+                    },
+                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
+                },
+                {
+                    path: 'waste-recalc',
+                    name: 'EntryWasteRecalc',
+                    meta: {
+                        title: 'wasteRecalc',
+                        icon: 'compost',
+                    },
+                    component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
+                },
+            ],
         },
     ],
 };

src/router/modules/order.js

@@ -1,35 +1,102 @@
 import { RouterView } from 'vue-router';
 
+const orderCard = {
+    name: 'OrderCard',
+    path: ':id',
+    component: () => import('src/pages/Order/Card/OrderCard.vue'),
+    redirect: { name: 'OrderSummary' },
+    meta: {
+        menu: [
+            'OrderBasicData',
+            'OrderCatalog',
+            'OrderVolume',
+            'OrderLines',
+        ],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'OrderSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Order/Card/OrderSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'OrderBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Order/Card/OrderBasicData.vue'),
+        },
+        {
+            path: 'catalog',
+            name: 'OrderCatalog',
+            meta: {
+                title: 'catalog',
+                icon: 'vn:basket',
+            },
+            component: () => import('src/pages/Order/Card/OrderCatalog.vue'),
+        },
+        {
+            path: 'volume',
+            name: 'OrderVolume',
+            meta: {
+                title: 'volume',
+                icon: 'vn:volume',
+            },
+            component: () => import('src/pages/Order/Card/OrderVolume.vue'),
+        },
+        {
+            path: 'line',
+            name: 'OrderLines',
+            meta: {
+                title: 'lines',
+                icon: 'vn:lines',
+            },
+            component: () => import('src/pages/Order/Card/OrderLines.vue'),
+        },
+    ],
+};
+
 export default {
-    path: '/order',
     name: 'Order',
+    path: '/order',
     meta: {
         title: 'order',
         icon: 'vn:basket',
         moduleName: 'Order',
         keyBinding: 'o',
+        menu: ['OrderList'],
     },
     component: RouterView,
     redirect: { name: 'OrderMain' },
-    menus: {
-        main: ['OrderList'],
-        card: ['OrderBasicData', 'OrderCatalog', 'OrderVolume', 'OrderLines'],
-    },
+    children: [
+        {
+            name: 'OrderMain',
+            path: '',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'OrderIndexMain' },
             children: [
                 {
                     path: '',
-            name: 'OrderMain',
-            component: () => import('src/components/common/VnModule.vue'),
+                    name: 'OrderIndexMain',            
                     redirect: { name: 'OrderList' },
+                    component: () => import('src/pages/Order/OrderList.vue'),
                     children: [
                         {
-                    path: 'list',
                             name: 'OrderList',
+                            path: 'list',
                             meta: {
                                 title: 'orderList',
                                 icon: 'view_list',
                             },
-                    component: () => import('src/pages/Order/OrderList.vue'),
+                        },
+                        orderCard,
+                    ],
                 },
                 {
                     path: 'create',
@@ -42,58 +109,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'OrderCard',
-            path: ':id',
-            component: () => import('src/pages/Order/Card/OrderCard.vue'),
-            redirect: { name: 'OrderSummary' },
-            children: [
-                {
-                    name: 'OrderSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Order/Card/OrderSummary.vue'),
-                },
-                {
-                    name: 'OrderBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('src/pages/Order/Card/OrderBasicData.vue'),
-                },
-                {
-                    name: 'OrderCatalog',
-                    path: 'catalog',
-                    meta: {
-                        title: 'catalog',
-                        icon: 'vn:basket',
-                    },
-                    component: () => import('src/pages/Order/Card/OrderCatalog.vue'),
-                },
-                {
-                    name: 'OrderVolume',
-                    path: 'volume',
-                    meta: {
-                        title: 'volume',
-                        icon: 'vn:volume',
-                    },
-                    component: () => import('src/pages/Order/Card/OrderVolume.vue'),
-                },
-                {
-                    name: 'OrderLines',
-                    path: 'line',
-                    meta: {
-                        title: 'lines',
-                        icon: 'vn:lines',
-                    },
-                    component: () => import('src/pages/Order/Card/OrderLines.vue'),
-                },
-            ],
-        },
     ],
 };

src/stores/invoiceOutGlobal.js

@@ -7,7 +7,14 @@ import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
 const { notify } = useNotify();
-
+const initInvoicing = {
+    invoicing: false,
+    nRequests: 0,
+    nPdfs: 0,
+    totalPdfs: 0,
+    addressIndex: 0,
+    errors: [],
+};
 export const useInvoiceOutGlobalStore = defineStore({
     id: 'invoiceOutGlobal',
     state: () => ({
@@ -23,16 +30,11 @@ export const useInvoiceOutGlobalStore = defineStore({
         addresses: [],
         minInvoicingDate: null,
         parallelism: null,
-        invoicing: false,
-        isInvoicing: false,
         status: null,
-        addressIndex: 0,
-        errors: [],
+
         printer: null,
-        nRequests: 0,
-        nPdfs: 0,
-        totalPdfs: 0,
         formData: null,
+        ...initInvoicing,
     }),
     actions: {
         async init() {
@@ -117,12 +119,13 @@ export const useInvoiceOutGlobalStore = defineStore({
                     );
                     throw new Error("There aren't addresses to invoice");
                 }
-                this.invoicing = false;
-                this.status = 'invoicing';
                 this.formData = formData;
-                this.addressIndex = 0;
-                this.errors = [];
-                await this.invoiceClient();
+                this.status = 'invoicing';
+                //reset data
+                for (const key in initInvoicing) {
+                    this[key] = initInvoicing[key];
+                }
+                this.invoiceClient();
             } catch (err) {
                 this.handleError(err);
             }
@@ -184,7 +187,6 @@ export const useInvoiceOutGlobalStore = defineStore({
         async invoiceClient() {
             if (this.invoicing || this.nRequests >= this.parallelism) return;
             const address = this.addresses[this.addressIndex];
-
             if (!address || !this.status || this.status == 'stopping') {
                 this.status = 'stopping';
                 this.invoicing = false;
@@ -192,6 +194,7 @@ export const useInvoiceOutGlobalStore = defineStore({
             }
             try {
                 this.invoicing = true;
+                this.nRequests++;
                 const params = {
                     clientId: address.clientId,
                     addressId: address.id,
@@ -215,6 +218,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                 }
             } finally {
                 this.invoicing = false;
+                this.nRequests--;
                 this.addressIndex++;
                 this.invoiceClient();
             }

test/cypress/integration/claim/claimPhoto.spec.js

@@ -1,5 +1,6 @@
 /// <reference types="cypress" />
-describe('ClaimPhoto', () => {
+// redmine.verdnatura.es/issues/8417
+describe.skip('ClaimPhoto', () => {
     beforeEach(() => {
         const claimId = 1;
         cy.login('developer');

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

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

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

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-
-describe('InvoiceInCorrective', () => {
+// 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)';
     const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';

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

@@ -21,8 +21,8 @@ describe('InvoiceInList', () => {
                 cy.url().should('include', `/invoice-in/${id}/summary`);
             });
     });
-
-    it('should open the details', () => {
+    // https://redmine.verdnatura.es/issues/8420
+    it.skip('should open the details', () => {
         cy.get(firstDetailBtn).click();
         cy.get(summaryHeaders).eq(1).contains('Basic data');
         cy.get(summaryHeaders).eq(4).contains('Vat');

test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js

@@ -35,8 +35,8 @@ describe('InvoiceOut summary', () => {
         cy.dataCy('VnConfirm_confirm').click();
         cy.checkNotification('InvoiceOut deleted');
     });
-
-    it('should transfer the invoice ', () => {
+    // https://redmine.verdnatura.es/issues/8415
+    it.skip('should transfer the invoice ', () => {
         cy.typeSearchbar('T1111111{enter}');
         cy.dataCy('descriptor-more-opts').click();
         cy.get('.q-menu > .q-list > :nth-child(1)').click();

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

@@ -15,8 +15,8 @@ describe('Item list', () => {
         cy.get('.q-menu .q-item').contains('Anthurium').click();
         cy.get('.q-virtual-scroll__content > :nth-child(4) > :nth-child(4)').click();
     });
-
-    it('should create an item', () => {
+    // https://redmine.verdnatura.es/issues/8421
+    it.skip('should create an item', () => {
         const data = {
             Description: { val: `Test item` },
             Type: { val: `Crisantemo`, type: 'select' },

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

@@ -18,8 +18,8 @@ describe('Item tag', () => {
         +cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification("The tag or priority can't be repeated for an item");
     });
-
-    it('should add a new tag', () => {
+    // https://redmine.verdnatura.es/issues/8422
+    it.skip('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();

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

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-
-describe('Ticket expedtion', () => {
+// https://redmine.verdnatura.es/issues/8423
+describe.skip('Ticket expedtion', () => {
     const tableContent = '.q-table .q-virtual-scroll__content';
     const stateTd = 'td:nth-child(9)';
 

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

@@ -30,8 +30,8 @@ describe('TicketList', () => {
         cy.get(firstRow).find('.q-btn:first').click();
         cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
     });
-
-    it('should open ticket summary', () => {
+    // https://redmine.verdnatura.es/issues/8424
+    it.skip('should open ticket summary', () => {
         searchResults();
         cy.get(firstRow).find('.q-btn:last').click();
         cy.dataCy('ticketSummary').should('exist');

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

@@ -53,7 +53,8 @@ describe('VnLocation', () => {
             cy.waitForElement('.q-card');
             cy.get(inputLocation).click();
         });
-        it('Show all options', function () {
+        // https://redmine.verdnatura.es/issues/8436
+        it.skip('Show all options', function () {
             cy.get(locationOptions).should('have.length.at.least', 5);
         });
         it('input filter location as "al"', function () {

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

@@ -18,8 +18,8 @@ describe('ZoneWarehouse', () => {
         cy.get(saveBtn).click();
         cy.checkNotification(dataError);
     });
-
-    it('should create & remove a warehouse', () => {
+    // https://redmine.verdnatura.es/issues/8425
+    it.skip('should create & remove a warehouse', () => {
         cy.addBtnClick();
         cy.fillInForm(data);
         cy.get(saveBtn).click();