Merge branch 'dev' into 8316-entryCardWithVnCardBeta

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

@@ -44,7 +44,7 @@ const onDataSaved = (data) => {
     <FormModelPopup
         url-create="Items/regularize"
         model="Items"
-        :title="t('Regularize stock')"
+        :title="t('item.regularizeStock')"
         :form-initial-data="regularizeFormData"
         @on-data-saved="onDataSaved($event)"
     >

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 hasContent = useHasContent('#right-panel');
-const rightPanel = ref(null);
 
 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/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(() =>
+const modelValue = ref(props.location ? formatLocation(props.location) : null);
-    props.location ? formatLocation(props.location, locationProperties) : 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,12 +72,13 @@ 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>

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/ui/CardDescriptor.vue

@@ -6,6 +6,7 @@ import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
 import { useRoute } from 'vue-router';
+import VnMoreOptions from './VnMoreOptions.vue';
 
 const $props = defineProps({
     url: {
@@ -47,7 +48,6 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
-const menuRef = ref();
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -159,25 +159,11 @@ const toModule = computed(() =>
                         </QTooltip>
                     </QBtn>
                 </RouterLink>
-                <QBtn
+                <VnMoreOptions v-if="$slots.menu">
-                    v-if="$slots.menu"
+                    <template #menu="{ menuRef }">
-                    color="white"
-                    dense
-                    flat
-                    icon="more_vert"
-                    round
-                    size="md"
-                    data-cy="descriptor-more-opts"
-                >
-                    <QTooltip>
-                        {{ t('components.cardDescriptor.moreOptions') }}
-                    </QTooltip>
-                    <QMenu :ref="menuRef">
-                        <QList>
                         <slot name="menu" :entity="entity" :menu-ref="menuRef" />
-                        </QList>
+                    </template>
-                    </QMenu>
+                </VnMoreOptions>
-                </QBtn>
             </div>
             <slot name="before" />
             <div class="body q-py-sm">
@@ -222,8 +208,8 @@ const toModule = computed(() =>
     />
 </template>
 
-<style lang="scss" scoped>
+<style lang="scss">
-:deep(.body) {
+.body {
     background-color: var(--vn-section-color);
     .text-h5 {
         font-size: 20px;
@@ -262,7 +248,9 @@ const toModule = computed(() =>
         }
     }
 }
+</style>
 
+<style lang="scss" scoped>
 .title {
     overflow: hidden;
     text-overflow: ellipsis;

src/components/ui/CardSummary.vue

@@ -1,10 +1,11 @@
 <script setup>
-import { ref, computed, watch, onBeforeMount, onMounted } from 'vue';
+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 { useStateStore } from 'src/stores/useStateStore';
+import VnMoreOptions from './VnMoreOptions.vue';
 
 const props = defineProps({
     url: {
@@ -40,7 +41,6 @@ const { store } = arrayData;
 const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
-const stateStore = useStateStore();
 defineExpose({
     entity,
     fetch,
@@ -52,9 +52,6 @@ onBeforeMount(async () => {
     watch(props, async () => await fetch());
 });
 
-onMounted(() => {
-    stateStore.rightDrawerChangeValue(false);
-});
 async function fetch() {
     store.url = props.url;
     store.filter = props.filter ?? {};
@@ -64,6 +61,7 @@ async function fetch() {
     isLoading.value = false;
 }
 </script>
+
 <template>
     <div class="summary container">
         <QCard class="cardSummary">
@@ -86,9 +84,14 @@ async function fetch() {
                     <slot name="header" :entity="entity" dense>
                         {{ entity.id + ' - ' + entity.name }}
                     </slot>
-                    <slot name="header-right" :entity="entity">
+                    <span class="row no-wrap">
-                        <span></span>
+                        <slot name="header-right" :entity="entity" />
-                    </slot>
+                        <VnMoreOptions v-if="$slots.menu && isDialogOpened()">
+                            <template #menu="{ menuRef }">
+                                <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                            </template>
+                        </VnMoreOptions>
+                    </span>
                 </div>
                 <div class="summaryBody row q-mb-md">
                     <slot name="body" :entity="entity" />
@@ -97,6 +100,7 @@ async function fetch() {
         </QCard>
     </div>
 </template>
+
 <style lang="scss">
 .summary.container {
     display: flex;

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

@@ -0,0 +1,20 @@
+<template>
+    <QBtn
+        color="white"
+        dense
+        flat
+        icon="more_vert"
+        round
+        size="md"
+        data-cy="descriptor-more-opts"
+    >
+        <QTooltip>
+            {{ $t('components.cardDescriptor.moreOptions') }}
+        </QTooltip>
+        <QMenu ref="menuRef">
+            <QList>
+                <slot name="menu" :menu-ref="$refs.menuRef" />
+            </QList>
+        </QMenu>
+    </QBtn>
+</template>

src/composables/useHasAccount.js

@@ -0,0 +1,6 @@
+import axios from 'axios';
+
+export default async (id) => {
+    const { data } = await axios.get(`Accounts/${id}/exists`);
+    return data.exists;
+};

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'

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'

src/pages/Account/Card/AccountDescriptor.vue

@@ -1,13 +1,13 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
-import FetchData from 'src/components/FetchData.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
+import useHasAccount from 'src/composables/useHasAccount.js';
 
 const $props = defineProps({
     id: {
@@ -23,6 +23,7 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 const data = ref(useCardDescription());
+const hasAccount = ref();
 const setData = (entity) => (data.value = useCardDescription(entity.nickname, entity.id));
 
 const filter = {
@@ -30,18 +31,16 @@ const filter = {
     fields: ['id', 'nickname', 'name', 'role'],
     include: { relation: 'role', scope: { fields: ['id', 'name'] } },
 };
-const hasAccount = ref(false);
+
+onMounted(async () => {
+    hasAccount.value = await useHasAccount(entityId.value);
+});
 </script>
 
 <template>
-    <FetchData
-        :url="`Accounts/${entityId}/exists`"
-        auto-load
-        @on-fetch="(data) => (hasAccount = data.exists)"
-    />
     <CardDescriptor
         ref="descriptor"
-        url="VnUsers/preview"
+        :url="`VnUsers/preview`"
         :filter="filter"
         module="Account"
         @on-fetch="setData"
@@ -50,7 +49,7 @@ const hasAccount = ref(false);
         :subtitle="data.subtitle"
     >
         <template #menu>
-            <AccountDescriptorMenu :has-account="hasAccount" />
+            <AccountDescriptorMenu :entity-id="entityId" />
         </template>
         <template #before>
             <VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
@@ -74,7 +73,7 @@ const hasAccount = ref(false);
             <VnLv :label="t('account.card.nickname')" :value="entity.name" />
             <VnLv :label="t('account.card.role')" :value="entity.role.name" />
         </template>
-        <template #icons="{ entity }">
+        <template #actions="{ entity }">
             <QCardActions class="q-gutter-x-md">
                 <QIcon
                     v-if="!entity.active"
@@ -82,7 +81,7 @@ const hasAccount = ref(false);
                     name="vn:disabled"
                     flat
                     round
-                    size="xs"
+                    size="sm"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.deactivated') }}</QTooltip>
@@ -93,7 +92,7 @@ const hasAccount = ref(false);
                     v-if="hasAccount"
                     flat
                     round
-                    size="xs"
+                    size="sm"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.enabled') }}</QTooltip>

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -1,15 +1,17 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, toRefs } 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 VnInputPassword from 'src/components/common/VnInputPassword.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { useQuasar } from 'quasar';
-import VnInputPassword from 'src/components/common/VnInputPassword.vue';
+import { useRouter } from 'vue-router';
 
 const $props = defineProps({
     hasAccount: {
@@ -18,14 +20,20 @@ const $props = defineProps({
         required: true,
     },
 });
+
 const { t } = useI18n();
 const { hasAccount } = toRefs($props);
 const { openConfirmationModal } = useVnConfirm();
 const route = useRoute();
+const router = useRouter();
+const state = useState();
+const user = state.getUser();
 const { notify } = useQuasar();
 const account = computed(() => useArrayData('AccountId').store.data[0]);
 account.value.hasAccount = hasAccount.value;
 const entityId = computed(() => +route.params.id);
+const hasitManagementAccess = ref();
+const hasSysadminAccess = ref();
 
 async function updateStatusAccount(active) {
     if (active) {
@@ -37,7 +45,7 @@ async function updateStatusAccount(active) {
     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',
     });
 }
@@ -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`, {
@@ -105,22 +140,51 @@ async function sync() {
                 class="full-width"
                 clearable
                 clear-icon="close"
+                type="password"
             />
         </template>
     </VnConfirm>
     <QItem
-        v-if="
+        v-if="hasitManagementAccess"
-            entityId == account.id &&
-            useAcl().hasAny([{ model: 'Account', props: '*', accessType: 'WRITE' }])
-        "
         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="
@@ -135,7 +199,7 @@ async function sync() {
     </QItem>
 
     <QItem
-        v-if="!account.active"
+        v-if="!account.active && hasitManagementAccess"
         v-ripple
         clickable
         @click="
@@ -149,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="
@@ -162,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/Account/Card/AccountMailAlias.vue

@@ -9,6 +9,7 @@ import AccountMailAliasCreateForm from './AccountMailAliasCreateForm.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useArrayData } from 'composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
+import useHasAccount from 'src/composables/useHasAccount.js';
 import axios from 'axios';
 
 const { t } = useI18n();
@@ -50,16 +51,6 @@ const columns = computed(() => [
     },
 ]);
 
-const fetchAccountExistence = async () => {
-    try {
-        const { data } = await axios.get(`Accounts/${route.params.id}/exists`);
-        return data.exists;
-    } catch (error) {
-        console.error('Error fetching account existence', error);
-        return false;
-    }
-};
-
 const deleteMailAlias = async (row) => {
     await axios.delete(`${urlPath}/${row.id}`);
     fetchMailAliases();
@@ -79,7 +70,7 @@ const fetchMailAliases = async () => {
 
 const getAccountData = async (reload = true) => {
     loading.value = true;
-    hasAccount.value = await fetchAccountExistence();
+    hasAccount.value = await useHasAccount(route.params.id);
     if (!hasAccount.value) {
         loading.value = false;
         store.data = [];

src/pages/Account/Card/AccountMailForwarding.vue

@@ -9,6 +9,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
 import useNotify from 'src/composables/useNotify.js';
+import useHasAccount from 'src/composables/useHasAccount';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -30,23 +31,9 @@ const hasDataChanged = computed(
         initialData.value.hasData !== hasData.value
 );
 
-const fetchAccountExistence = async () => {
-    try {
-        const { data } = await axios.get(`Accounts/${route.params.id}/exists`);
-        return data.exists;
-    } catch (error) {
-        console.error('Error fetching account existence', error);
-        return false;
-    }
-};
-
 const fetchMailForwards = async () => {
-    try {
     const response = await axios.get(`MailForwards/${route.params.id}`);
     return response.data;
-    } catch {
-        return null;
-    }
 };
 
 const deleteMailForward = async () => {
@@ -72,7 +59,7 @@ const setInitialData = async () => {
     loading.value = true;
     initialData.value.account = route.params.id;
     formData.value.account = route.params.id;
-    hasAccount.value = await fetchAccountExistence(route.params.id);
+    hasAccount.value = await useHasAccount(route.params.id);
     if (!hasAccount.value) {
         loading.value = false;
         return;

src/pages/Account/Card/AccountSummary.vue

@@ -7,6 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
+import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -31,12 +32,14 @@ const filter = {
 <template>
     <CardSummary
         data-key="AccountId"
-        ref="AccountSummary"
         url="VnUsers/preview"
         :filter="filter"
         @on-fetch="(data) => (account = data)"
     >
         <template #header>{{ account.id }} - {{ account.nickname }}</template>
+        <template #menu="">
+            <AccountDescriptorMenu :entity-id="entityId" />
+        </template>
         <template #body>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">

src/pages/Claim/Card/ClaimSummary.vue

@@ -19,6 +19,7 @@ import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import ClaimDescriptorMenu from './ClaimDescriptorMenu.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -228,6 +229,9 @@ function claimUrl(section) {
                 </QList>
             </QBtnDropdown>
         </template>
+        <template #menu="{ entity }">
+            <ClaimDescriptorMenu :claim="entity.claim" />
+        </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
             <QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
                 <VnTitle

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>
+        <template #icons="{ entity }">
-            <QCardActions v-if="customer" class="q-gutter-x-md">
+            <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
+                <QIcon v-if="entity.isFreezed" name="vn:frozen" size="xs" color="primary">
-                    v-if="customer.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/CustomerSummary.vue

@@ -12,6 +12,7 @@ import VnLinkMail from 'src/components/ui/VnLinkMail.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
+import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 const route = useRoute();
 const { t } = useI18n();
 const grafanaUrl = 'https://grafana.verdnatura.es';
@@ -70,6 +71,9 @@ const sumRisk = ({ clientRisks }) => {
         data-key="CustomerSummary"
         module-name="Customer"
     >
+        <template #menu="{ entity }">
+            <CustomerDescriptorMenu :customer="entity" />
+        </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle
@@ -94,14 +98,13 @@ const sumRisk = ({ clientRisks }) => {
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
                             class="q-ml-xs"
-                            :country="entity.country?.code"
                         />
                     </template>
                 </VnLv>
                 <VnLv :value="entity.email" copy
                     ><template #label>
                         {{ t('globals.params.email') }}
-                        <VnLinkMail :email="entity.email"></VnLinkMail> </template
+                        <VnLinkMail email="entity.email"></VnLinkMail> </template
                 ></VnLv>
                 <VnLv
                     :label="t('customer.summary.salesPerson')"
@@ -173,7 +176,7 @@ const sumRisk = ({ clientRisks }) => {
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
                     />
-                    <VnLv :label="t('globals.isVies')" :value="entity.isVies" />
+                    <VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
                 </VnRow>
             </QCard>
             <QCard class="vn-one">

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -247,8 +247,16 @@ function handleLocation(data, location) {
                     :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"
                 />
-                <VnInputNumber :label="t('Latitude')" clearable v-model="data.latitude" />
             </VnRow>
             <h4 class="q-mb-xs">{{ t('Notes') }}</h4>
             <VnRow

src/pages/Entry/Card/EntryDescriptor.vue

@@ -7,9 +7,9 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { toDate } from 'src/filters';
-import { usePrintService } from 'composables/usePrintService';
 import { getUrl } from 'src/composables/getUrl';
 import filter from './EntryFilter.js';
+import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -21,7 +21,6 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const { openReport } = usePrintService();
 const entryDescriptorRef = ref(null);
 const url = ref();
 
@@ -52,10 +51,6 @@ const getEntryRedirectionFilter = (entry) => {
         to,
     });
 };
-
-const showEntryReport = () => {
-    openReport(`Entries/${route.params.id}/entry-order-pdf`);
-};
 </script>
 
 <template>
@@ -68,14 +63,12 @@ const showEntryReport = () => {
         data-key="Entry"
     >
         <template #menu="{ entity }">
-            <QItem v-ripple clickable @click="showEntryReport(entity)">
+            <EntryDescriptorMenu :id="entity.id" />
-                <QItemSection>{{ t('Show entry report') }}</QItemSection>
-            </QItem>
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('globals.agency')" :value="entity.travel?.agency?.name" />
-            <VnLv :label="t('globals.shipped')" :value="toDate(entity.travel?.shipped)" />
+            <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
-            <VnLv :label="t('globals.landed')" :value="toDate(entity.travel?.landed)" />
+            <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
             <VnLv
                 :label="t('globals.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"
@@ -154,7 +147,6 @@ es:
     Supplier card: Ficha del proveedor
     All travels with current agency: Todos los envíos con la agencia actual
     All entries with current supplier: Todas las entradas con el proveedor actual
-    Show entry report: Ver informe del pedido
     Go to module index: Ir al índice del modulo
     Inventory entry: Es inventario
     Virtual entry: Es una redada

src/pages/Entry/Card/EntryDescriptorMenu.vue

@@ -0,0 +1,22 @@
+<script setup>
+import { usePrintService } from 'composables/usePrintService';
+
+const { openReport } = usePrintService();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+function showEntryReport() {
+    openReport(`Entries/${$props.id}/entry-order-pdf`);
+}
+</script>
+
+<template>
+    <QItem v-ripple clickable @click="showEntryReport">
+        <QItemSection>{{ $t('entryList.list.showEntryReport') }}</QItemSection>
+    </QItem>
+</template>

src/pages/Entry/Card/EntrySummary.vue

@@ -12,6 +12,7 @@ import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
@@ -172,6 +173,9 @@ const fetchEntryBuys = async () => {
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
         </template>
+        <template #menu="{ entity }">
+            <EntryDescriptorMenu :id="entity.id" />
+        </template>
         <template #body>
             <QCard class="vn-one">
                 <VnTitle
@@ -207,7 +211,10 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.travelAgency')"
                     :value="entry.travel.agency?.name"
                 />
-                <VnLv :label="t('globals.shipped')" :value="toDate(entry.travel.shipped)" />
+                <VnLv
+                    :label="t('globals.shipped')"
+                    :value="toDate(entry.travel.shipped)"
+                />
                 <VnLv
                     :label="t('globals.warehouseOut')"
                     :value="entry.travel.warehouseOut?.name"

src/pages/Entry/EntryList.vue

@@ -247,7 +247,6 @@ const columns = computed(() => [
 
 <i18n>
 es:
-    Inventory entry: Es inventario
     Virtual entry: Es una redada
     Search entries: Buscar entradas
     You can search by entry reference: Puedes buscar por referencia de la entrada

src/pages/Entry/locale/en.yml

@@ -4,6 +4,7 @@ entry:
 entryList:
     list:
         inventoryEntry: Inventory entry
+        showEntryReport: Show entry report
 entryFilter:
     filter:
         search: General search

src/pages/Entry/locale/es.yml

@@ -4,6 +4,7 @@ entry:
 entryList:
     list:
         inventoryEntry: Es inventario
+        showEntryReport: Ver informe del pedido
 entryFilter:
     filter:
         search: Búsqueda general

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

@@ -1,60 +1,30 @@
 <script setup>
-import { ref, reactive, computed, onBeforeMount, capitalize } from 'vue';
+import { ref, reactive, computed, onBeforeMount } from 'vue';
 import { useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
-import { useAcl } from 'src/composables/useAcl';
-import { downloadFile } from 'src/composables/downloadFile';
-import { useArrayData } from 'src/composables/useArrayData';
-import { usePrintService } from 'composables/usePrintService';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import FetchData from 'src/components/FetchData.vue';
-import SendEmailDialog from 'components/common/SendEmailDialog.vue';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import InvoiceInToBook from '../InvoiceInToBook.vue';
+import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
 
 const $props = defineProps({ id: { type: Number, default: null } });
-
 const { push, currentRoute } = useRouter();
-
-const quasar = useQuasar();
-const { hasAny } = useAcl();
 const { t } = useI18n();
-const { openReport, sendEmail } = usePrintService();
-const arrayData = useArrayData();
 
-const invoiceIn = computed(() => arrayData.store.data);
 const cardDescriptorRef = ref();
 const correctionDialogRef = ref();
 const entityId = computed(() => $props.id || +currentRoute.value.params.id);
 const totalAmount = ref();
-const currentAction = ref();
 const config = ref();
 const cplusRectificationTypes = ref([]);
 const siiTypeInvoiceIns = ref([]);
 const invoiceCorrectionTypes = ref([]);
-const actions = {
+
-    unbook: {
-        title: t('assertAction', { action: t('unbook') }),
-        action: toUnbook,
-    },
-    delete: {
-        title: t('assertAction', { action: t('delete') }),
-        action: deleteInvoice,
-    },
-    clone: {
-        title: t('assertAction', { action: t('clone') }),
-        action: cloneInvoice,
-    },
-    showPdf: { cb: showPdfInvoice },
-    sendPdf: { cb: sendPdfInvoiceConfirmation },
-    correct: { cb: () => correctionDialogRef.value.show() },
-};
 const filter = {
     include: [
         {
@@ -90,7 +60,7 @@ const routes = reactive({
         return {
             name: 'InvoiceInList',
             query: {
-                table: JSON.stringify({ supplierFk: id }),
+                params: JSON.stringify({ supplierFk: id }),
             },
         };
     },
@@ -99,7 +69,7 @@ const routes = reactive({
             return {
                 name: 'InvoiceInList',
                 query: {
-                    table: JSON.stringify({ correctedFk: entityId.value }),
+                    params: JSON.stringify({ correctedFk: entityId.value }),
                 },
             };
         }
@@ -118,21 +88,21 @@ const routes = reactive({
 const correctionFormData = reactive({
     invoiceReason: 2,
     invoiceType: 2,
-    invoiceClass: 8,
+    invoiceClass: 6,
 });
 const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
 
 onBeforeMount(async () => {
     await setInvoiceCorrection(entityId.value);
     const { data } = await axios.get(`InvoiceIns/${entityId.value}/getTotals`);
-    totalAmount.value = data.totalTaxableBase;
+    totalAmount.value = data.totalDueDay;
 });
 
 onBeforeRouteUpdate(async (to, from) => {
     if (to.params.id !== from.params.id) {
         await setInvoiceCorrection(to.params.id);
         const { data } = await axios.get(`InvoiceIns/${to.params.id}/getTotals`);
-        totalAmount.value = data.totalTaxableBase;
+        totalAmount.value = data.totalDueDay;
     }
 });
 
@@ -153,94 +123,6 @@ async function setInvoiceCorrection(id) {
     );
 }
 
-function openDialog() {
-    quasar.dialog({
-        component: VnConfirm,
-        componentProps: {
-            title: t(currentAction.value.title),
-            promise: currentAction.value.action,
-        },
-    });
-}
-
-async function toUnbook() {
-    const { data } = await axios.post(`InvoiceIns/${entityId.value}/toUnbook`);
-    const { isLinked, bookEntry, accountingEntries } = data;
-
-    const type = isLinked ? 'warning' : 'positive';
-    const message = isLinked
-        ? t('isLinked', { bookEntry, accountingEntries })
-        : t('isNotLinked', { bookEntry });
-
-    quasar.notify({ type, message });
-    if (!isLinked) arrayData.store.data.isBooked = false;
-}
-
-async function deleteInvoice() {
-    await axios.delete(`InvoiceIns/${entityId.value}`);
-    quasar.notify({
-        type: 'positive',
-        message: t('Invoice deleted'),
-    });
-    push({ path: '/invoice-in' });
-}
-
-async function cloneInvoice() {
-    const { data } = await axios.post(`InvoiceIns/${entityId.value}/clone`);
-    quasar.notify({
-        type: 'positive',
-        message: t('Invoice cloned'),
-    });
-    push({ path: `/invoice-in/${data.id}/summary` });
-}
-
-const canEditProp = (props) =>
-    hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
-
-const isAgricultural = () => {
-    if (!config.value) return false;
-    return (
-        invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
-        config?.value[0]?.sageWithholdingFk
-    );
-};
-
-function showPdfInvoice() {
-    if (isAgricultural())
-        openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`, null, '_blank');
-}
-
-function sendPdfInvoiceConfirmation() {
-    quasar.dialog({
-        component: SendEmailDialog,
-        componentProps: {
-            data: {
-                address: invoiceIn.value.supplier.contacts[0].email,
-            },
-            promise: sendPdfInvoice,
-        },
-    });
-}
-
-function sendPdfInvoice({ address }) {
-    if (!address)
-        quasar.notify({
-            type: 'negative',
-            message: t(`The email can't be empty`),
-        });
-    else
-        return sendEmail(`InvoiceIns/${entityId.value}/invoice-in-email`, {
-            recipientId: invoiceIn.value.supplier.id,
-            recipient: address,
-        });
-}
-
-function triggerMenu(type) {
-    currentAction.value = actions[type];
-    if (currentAction.value.cb) currentAction.value.cb();
-    else openDialog(type);
-}
-
 const createInvoiceInCorrection = async () => {
     const { data: correctingId } = await axios.post(
         'InvoiceIns/corrective',
@@ -262,7 +144,7 @@ const createInvoiceInCorrection = async () => {
         auto-load
     />
     <FetchData
-        url="siiTypeInvoiceIns"
+        url="SiiTypeInvoiceIns"
         :where="{ code: { like: 'R%' } }"
         @on-fetch="(data) => (siiTypeInvoiceIns = data)"
         auto-load
@@ -281,87 +163,13 @@ const createInvoiceInCorrection = async () => {
         title="supplierRef"
     >
         <template #menu="{ entity }">
-            <InvoiceInToBook>
+            <InvoiceInDescriptorMenu :invoice="entity" />
-                <template #content="{ book }">
-                    <QItem
-                        v-if="!entity?.isBooked && canEditProp('toBook')"
-                        v-ripple
-                        clickable
-                        @click="book(entityId)"
-                    >
-                        <QItemSection>{{ t('To book') }}</QItemSection>
-                    </QItem>
-                </template>
-            </InvoiceInToBook>
-            <QItem
-                v-if="entity?.isBooked && canEditProp('toUnbook')"
-                v-ripple
-                clickable
-                @click="triggerMenu('unbook')"
-            >
-                <QItemSection>
-                    {{ t('To unbook') }}
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-if="canEditProp('deleteById')"
-                v-ripple
-                clickable
-                @click="triggerMenu('delete')"
-            >
-                <QItemSection>{{ t('Delete invoice') }}</QItemSection>
-            </QItem>
-            <QItem
-                v-if="canEditProp('clone')"
-                v-ripple
-                clickable
-                @click="triggerMenu('clone')"
-            >
-                <QItemSection>{{ t('Clone invoice') }}</QItemSection>
-            </QItem>
-            <QItem
-                v-if="isAgricultural()"
-                v-ripple
-                clickable
-                @click="triggerMenu('showPdf')"
-            >
-                <QItemSection>{{ t('Show agricultural receipt as PDF') }}</QItemSection>
-            </QItem>
-            <QItem
-                v-if="isAgricultural()"
-                v-ripple
-                clickable
-                @click="triggerMenu('sendPdf')"
-            >
-                <QItemSection
-                    >{{ t('Send agricultural receipt as PDF') }}...</QItemSection
-                >
-            </QItem>
-            <QItem
-                v-if="!invoiceInCorrection.corrected"
-                v-ripple
-                clickable
-                @click="triggerMenu('correct')"
-            >
-                <QItemSection>{{ t('Create rectificative invoice') }}...</QItemSection>
-            </QItem>
-            <QItem
-                v-if="entity.dmsFk"
-                v-ripple
-                clickable
-                @click="downloadFile(entity.dmsFk)"
-            >
-                <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
-            </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('InvoiceIn.list.issued')" :value="toDate(entity.issued)" />
+            <VnLv :label="t('invoicein.list.issued')" :value="toDate(entity.issued)" />
-            <VnLv
+            <VnLv :label="t('invoicein.summary.bookedDate')" :value="toDate(entity.booked)" />
-                :label="t('InvoiceIn.summary.bookedDate')"
+            <VnLv :label="t('invoicein.list.amount')" :value="toCurrency(totalAmount)" />
-                :value="toDate(entity.booked)"
+            <VnLv :label="t('invoicein.list.supplier')">
-            />
-            <VnLv :label="t('InvoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
-            <VnLv :label="t('InvoiceIn.list.supplier')">
                 <template #value>
                     <span class="link">
                         {{ entity?.supplier?.nickname }}
@@ -378,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"
@@ -394,7 +202,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getTickets(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('InvoiceIn.descriptor.ticketList') }}</QTooltip>
+                    <QTooltip>{{ t('InvoiceOut.card.ticketList') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="
@@ -438,7 +246,7 @@ const createInvoiceInCorrection = async () => {
                             readonly
                         />
                         <VnSelect
-                            :label="`${capitalize(t('globals.class'))}`"
+                            :label="`${useCapitalize(t('globals.class'))}`"
                             v-model="correctionFormData.invoiceClass"
                             :options="siiTypeInvoiceIns"
                             option-value="id"
@@ -448,27 +256,15 @@ const createInvoiceInCorrection = async () => {
                     </QItemSection>
                     <QItemSection>
                         <VnSelect
-                            :label="`${capitalize(t('globals.type'))}`"
+                            :label="`${useCapitalize(t('globals.type'))}`"
                             v-model="correctionFormData.invoiceType"
                             :options="cplusRectificationTypes"
                             option-value="id"
                             option-label="description"
                             :required="true"
-                        >
+                        />
-                            <template #option="{ opt }">
-                                <QItem>
-                                    <QItemSection>
-                                        <QItemLabel
-                                            >{{ opt.code }} -
-                                            {{ opt.description }}</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                                <div></div>
-                            </template>
-                        </VnSelect>
                         <VnSelect
-                            :label="`${capitalize(t('globals.reason'))}`"
+                            :label="`${useCapitalize(t('globals.reason'))}`"
                             v-model="correctionFormData.invoiceReason"
                             :options="invoiceCorrectionTypes"
                             option-value="id"
@@ -512,31 +308,3 @@ const createInvoiceInCorrection = async () => {
     }
 }
 </style>
-<i18n>
-en:
-    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries
-    isLinked: The entry {bookEntry} has been linked to Sage. Please contact administration for further information
-    assertAction: Are you sure you want to {action} this invoice?
-es:
-    book: asentar
-    unbook: desasentar
-    delete: eliminar
-    clone: clonar
-    To book: Contabilizar
-    To unbook: Descontabilizar
-    Delete invoice: Eliminar factura
-    Invoice deleted: Factura eliminada
-    Clone invoice: Clonar factura
-    Invoice cloned: Factura clonada
-    Show agricultural receipt as PDF: Ver recibo agrícola como PDF
-    Send agricultural receipt as PDF: Enviar recibo agrícola como PDF
-    Are you sure you want to send it?: Estás seguro que quieres enviarlo?
-    Send PDF invoice: Enviar factura a PDF
-    Create rectificative invoice: Crear factura rectificativa
-    Rectificative invoice: Factura rectificativa
-    Original invoice: Factura origen
-    Entry: entrada
-    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes
-    isLinked: El asiento {bookEntry} fue enlazado a Sage, por favor contacta con administración
-    assertAction: Estas seguro de querer {action} esta factura?
-</i18n>

src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue

@@ -0,0 +1,206 @@
+<script setup>
+import { ref, computed, toRefs, reactive } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+import axios from 'axios';
+import { useAcl } from 'src/composables/useAcl';
+import { downloadFile } from 'src/composables/downloadFile';
+import { useArrayData } from 'src/composables/useArrayData';
+import { usePrintService } from 'composables/usePrintService';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import SendEmailDialog from 'components/common/SendEmailDialog.vue';
+import InvoiceInToBook from '../InvoiceInToBook.vue';
+
+const { hasAny } = useAcl();
+const { t } = useI18n();
+const { openReport, sendEmail } = usePrintService();
+const { push, currentRoute } = useRouter();
+const $props = defineProps({
+    invoice: {
+        type: Object,
+        required: true,
+    },
+});
+const { invoice } = toRefs($props);
+const quasar = useQuasar();
+const arrayData = useArrayData();
+const currentAction = ref();
+const config = ref();
+const correctionDialogRef = ref();
+const invoiceInCorrection = reactive({ correcting: [], corrected: null });
+const entityId = computed(() => $props.invoice.id || +currentRoute.value.params.id);
+const invoiceIn = computed(() => arrayData.store.data);
+const actions = {
+    unbook: {
+        title: t('assertAction', { action: t('invoicein.descriptorMenu.unbook') }),
+        action: toUnbook,
+    },
+    delete: {
+        title: t('assertAction', { action: t('invoicein.descriptorMenu.delete') }),
+        action: deleteInvoice,
+    },
+    clone: {
+        title: t('assertAction', { action: t('invoicein.descriptorMenu.clone') }),
+        action: cloneInvoice,
+    },
+    showPdf: { cb: showPdfInvoice },
+    sendPdf: { cb: sendPdfInvoiceConfirmation },
+    correct: { cb: () => correctionDialogRef.value.show() },
+};
+const canEditProp = (props) =>
+    hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
+
+function triggerMenu(type) {
+    currentAction.value = actions[type];
+    if (currentAction.value.cb) currentAction.value.cb();
+    else openDialog(type);
+}
+
+function openDialog() {
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t(currentAction.value.title),
+            promise: currentAction.value.action,
+        },
+    });
+}
+
+async function toUnbook() {
+    const { data } = await axios.post(`InvoiceIns/${entityId.value}/toUnbook`);
+    const { isLinked, bookEntry, accountingEntries } = data;
+
+    const type = isLinked ? 'warning' : 'positive';
+    const message = isLinked
+        ? t('isLinked', { bookEntry })
+        : t('isNotLinked', { bookEntry, accountingEntries });
+
+    quasar.notify({ type, message });
+    if (!isLinked) arrayData.store.data.isBooked = false;
+}
+
+async function deleteInvoice() {
+    await axios.delete(`InvoiceIns/${entityId.value}`);
+    quasar.notify({
+        type: 'positive',
+        message: t('invoicein.descriptorMenu.invoiceDeleted'),
+    });
+    push({ path: '/invoice-in' });
+}
+
+async function cloneInvoice() {
+    const { data } = await axios.post(`InvoiceIns/${entityId.value}/clone`);
+    quasar.notify({
+        type: 'positive',
+        message: t('invoicein.descriptorMenu.invoiceCloned'),
+    });
+    push({ path: `/invoice-in/${data.id}/summary` });
+}
+
+const isAgricultural = () => {
+    if (!config.value) return false;
+    return (
+        invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
+        config?.value[0]?.sageWithholdingFk
+    );
+};
+function showPdfInvoice() {
+    if (isAgricultural()) openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`);
+}
+
+function sendPdfInvoiceConfirmation() {
+    quasar.dialog({
+        component: SendEmailDialog,
+        componentProps: {
+            data: {
+                address: invoiceIn.value.supplier.contacts[0].email,
+            },
+            promise: sendPdfInvoice,
+        },
+    });
+}
+
+function sendPdfInvoice({ address }) {
+    if (!address)
+        quasar.notify({
+            type: 'negative',
+            message: t(`The email can't be empty`),
+        });
+    else
+        return sendEmail(`InvoiceIns/${entityId.value}/invoice-in-email`, {
+            recipientId: invoiceIn.value.supplier.id,
+            recipient: address,
+        });
+}
+</script>
+
+<template>
+    <InvoiceInToBook>
+        <template #content="{ book }">
+            <QItem
+                v-if="!invoice?.isBooked && canEditProp('toBook')"
+                v-ripple
+                clickable
+                @click="book(entityId)"
+            >
+                <QItemSection>{{ t('invoicein.descriptorMenu.toBook') }}</QItemSection>
+            </QItem>
+        </template>
+    </InvoiceInToBook>
+    <QItem
+        v-if="invoice?.isBooked && canEditProp('toUnbook')"
+        v-ripple
+        clickable
+        @click="triggerMenu('unbook')"
+    >
+        <QItemSection>
+            {{ t('invoicein.descriptorMenu.toUnbook') }}
+        </QItemSection>
+    </QItem>
+    <QItem
+        v-if="canEditProp('deleteById')"
+        v-ripple
+        clickable
+        @click="triggerMenu('invoicein.descriptorMenu.delete')"
+    >
+        <QItemSection>{{ t('invoicein.descriptorMenu.deleteInvoice') }}</QItemSection>
+    </QItem>
+    <QItem v-if="canEditProp('clone')" v-ripple clickable @click="triggerMenu('clone')">
+        <QItemSection>{{ t('invoicein.descriptorMenu.cloneInvoice') }}</QItemSection>
+    </QItem>
+    <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('showPdf')">
+        <QItemSection>{{
+            t('invoicein.descriptorMenu.showAgriculturalPdf')
+        }}</QItemSection>
+    </QItem>
+    <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('sendPdf')">
+        <QItemSection
+            >{{ t('invoicein.descriptorMenu.sendAgriculturalPdf') }}...</QItemSection
+        >
+    </QItem>
+    <QItem
+        v-if="!invoiceInCorrection.corrected"
+        v-ripple
+        clickable
+        @click="triggerMenu('correct')"
+    >
+        <QItemSection
+            >{{ t('invoicein.descriptorMenu.createCorrective') }}...</QItemSection
+        >
+    </QItem>
+    <QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">
+        <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
+    </QItem>
+</template>
+
+<i18n>
+en:
+    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries		
+    isLinked: The entry has been linked to Sage. Please contact administration for further information		
+    assertAction: Are you sure you want to {action} this invoice?
+es:
+    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes		
+    isLinked: El asiento fue enlazado a Sage, por favor contacta con administración		
+    assertAction: Estas seguro de querer {action} esta factura?
+</i18n>

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -10,6 +10,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceIntoBook from '../InvoiceInToBook.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
 
 const props = defineProps({ id: { type: [Number, String], default: 0 } });
 const { t } = useI18n();
@@ -26,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,
@@ -41,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}`;
         },
@@ -51,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}`;
@@ -62,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,
@@ -70,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,
@@ -81,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,
@@ -103,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,
@@ -114,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}`;
         },
@@ -123,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,
@@ -145,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,
@@ -200,6 +201,9 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </template>
             </InvoiceIntoBook>
         </template>
+        <template #menu="{ entity }">
+            <InvoiceInDescriptorMenu :invoice="entity" />
+        </template>
         <template #body="{ entity }">
             <!--Basic Data-->
             <QCard class="vn-one">
@@ -210,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>
@@ -221,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"
@@ -243,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" />
@@ -268,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">
@@ -290,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
@@ -302,8 +306,8 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                 :color="amountsNotMatch ? 'negative' : 'transparent'"
                                 :title="
                                     amountsNotMatch
-                                        ? t('InvoiceIn.summary.noMatch')
+                                        ? t('invoicein.summary.noMatch')
-                                        : t('InvoiceIn.summary.dueTotal')
+                                        : t('invoicein.summary.dueTotal')
                                 "
                             >
                                 {{ toCurrency(entity.totals.totalDueDay) }}
@@ -314,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"
@@ -362,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">
@@ -400,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:
@@ -12,6 +12,26 @@ InvoiceIn:
         amount: Amount
     descriptor:
         ticketList: Ticket list
+    descriptorMenu:
+        book: Book
+        unbook: Unbook
+        delete: Delete
+        clone: Clone
+        toBook: To book
+        toUnbook: To unbook
+        deleteInvoice: Delete invoice
+        invoiceDeleted: invoice deleted
+        cloneInvoice: Clone invoice
+        invoiceCloned: Invoice cloned
+        showAgriculturalPdf: Show agricultural receipt as PDF
+        sendAgriculturalPdf: Send agricultural receipt as PDF
+        checkSendInvoice: Are you sure you want to send it?
+        sendPdfInvoice: Send PDF invoice
+        createCorrective: Create rectificative invoice
+        correctiveInvoice: Rectificative invoice
+        originalInvoice: Original invoice
+        entry: Entry
+        emailEmpty: The email can't be empty
     card:
         client: Client
         company: Company
@@ -46,8 +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:
@@ -12,6 +12,26 @@ InvoiceIn:
         amount: Importe
     descriptor:
         ticketList: Listado de tickets
+    descriptorMenu:
+        book: Asentar
+        unbook: Desasentar
+        delete: Eliminar
+        clone: Clonar
+        toBook: Contabilizar
+        toUnbook: Descontabilizar
+        deleteInvoice: Eliminar factura
+        invoiceDeleted: Factura eliminada
+        cloneInvoice: Clonar factura
+        invoiceCloned: Factura clonada
+        showAgriculturalPdf: Ver recibo agrícola como PDF
+        sendAgriculturalPdf: Enviar recibo agrícola como PDF
+        checkSendInvoice: ¿Estás seguro que quieres enviarlo?
+        sendPdfInvoice: Enviar factura a PDF
+        createCorrective: Crear factura rectificativa
+        correctiveInvoice: Factura rectificativa
+        originalInvoice: Factura origen
+        entry: Entrada
+        emailEmpty: El email no puede estar vacío
     card:
         client: Cliente
         company: Empresa
@@ -43,8 +63,6 @@ InvoiceIn:
     params:
         search: Id o nombre proveedor
         correctedFk: Rectificada
-invoicein:
-    params:
         account: Cuenta contable
         correctingFk: Rectificativa
 

src/pages/InvoiceOut/Card/InvoiceOutSummary.vue

@@ -10,6 +10,7 @@ import { getUrl } from 'src/composables/getUrl';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
 
 onMounted(async () => {
     fetch();
@@ -113,6 +114,9 @@ const ticketsColumns = ref([
         <template #header="{ entity: { invoiceOut } }">
             <div>{{ invoiceOut.ref }} - {{ invoiceOut.client?.socialName }}</div>
         </template>
+        <template #menu="{ entity }">
+            <InvoiceOutDescriptorMenu :invoice-out-data="entity.invoiceOut" />
+        </template>
         <template #body="{ entity: { invoiceOut } }">
             <QCard class="vn-one">
                 <VnTitle :text="t('globals.pageTitles.basicData')" />

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

@@ -6,17 +6,16 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import RegularizeStockForm from 'components/RegularizeStockForm.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
-import { cloneItem } from 'src/pages/Item/composables/cloneItem';
+import ItemDescriptorMenu from './ItemDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
-        type: [Number, String],
+        type: Number,
         required: false,
         default: null,
     },
@@ -29,7 +28,7 @@ const $props = defineProps({
         default: null,
     },
     saleFk: {
-        type: [Number, String],
+        type: Number,
         default: null,
     },
     warehouseFk: {
@@ -38,7 +37,6 @@ const $props = defineProps({
     },
 });
 
-const { openCloneDialog } = cloneItem();
 const route = useRoute();
 const { t } = useI18n();
 const warehouseConfig = ref(null);
@@ -46,7 +44,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const regularizeStockFormDialog = ref(null);
 const mounted = ref();
 
 const arrayDataStock = useArrayData('descriptorStock', {
@@ -61,14 +58,14 @@ onMounted(async () => {
 const data = ref(useCardDescription());
 const setData = async (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity?.name, entity?.id);
+    data.value = useCardDescription(entity.name, entity.id);
     await updateStock();
 };
 
 const getItemConfigs = async () => {
     const { data } = await axios.get('ItemConfigs/findOne');
     if (!data) return;
-    return (warehouseConfig.value = data.warehouseFk);
+    warehouseConfig.value = data.warehouseFk;
 };
 const updateStock = async () => {
     if (!mounted.value) return;
@@ -89,10 +86,6 @@ const updateStock = async () => {
     if (storeData?.itemFk == entityId.value) return;
     await stock.fetch({});
 };
-
-const openRegularizeStockForm = () => {
-    regularizeStockFormDialog.value.show();
-};
 </script>
 
 <template>
@@ -105,24 +98,12 @@ const openRegularizeStockForm = () => {
         :url="`Items/${entityId}/getCard`"
         @on-fetch="setData"
     >
-        <template #menu="{}">
+        <template #menu>
-            <QItem v-ripple clickable @click="openRegularizeStockForm()">
+            <ItemDescriptorMenu
-                <QItemSection>
+                :entity-id="entityId"
-                    {{ t('Regularize stock') }}
-                    <QDialog ref="regularizeStockFormDialog">
-                        <RegularizeStockForm
-                            :item-fk="entityId"
                 :warehouse-fk="warehouseFk"
-                            @on-data-saved="updateStock()"
+                @regularized="updateStock"
             />
-                    </QDialog>
-                </QItemSection>
-            </QItem>
-            <QItem v-ripple clickable @click="openCloneDialog(entityId)">
-                <QItemSection>
-                    {{ t('globals.clone') }}
-                </QItemSection>
-            </QItem>
         </template>
         <template #before>
             <ItemDescriptorImage
@@ -191,7 +172,6 @@ const openRegularizeStockForm = () => {
 
 <i18n>
 es:
-    Regularize stock: Regularizar stock
     Inactive article: Artículo inactivo
 </i18n>
 

src/pages/Item/Card/ItemDescriptorImage.vue

@@ -131,7 +131,6 @@ const handlePhotoUpdated = (evt = false) => {
 
 <i18n>
 es:
-    Regularize stock: Regularizar stock
     All it's properties will be copied: Todas sus propiedades serán copiadas
     Do you want to clone this item?: ¿Desea clonar este artículo?
     warehouseText: Calculado sobre el almacén de { warehouseName }

src/pages/Item/Card/ItemDescriptorMenu.vue

@@ -0,0 +1,44 @@
+<script setup>
+import RegularizeStockForm from 'components/RegularizeStockForm.vue';
+import { cloneItem } from 'src/pages/Item/composables/cloneItem';
+
+const { openCloneDialog } = cloneItem();
+
+defineProps({
+    entityId: {
+        type: Number,
+        default: null,
+    },
+    warehouseFk: {
+        type: Number,
+        default: null,
+    },
+});
+
+defineEmits(['regularized']);
+</script>
+<template>
+    <QItem v-ripple clickable @click="$refs.regularizeStockFormDialog.show()">
+        <QItemSection>
+            {{ $t('item.regularizeStock') }}
+            <QDialog ref="regularizeStockFormDialog">
+                <RegularizeStockForm
+                    :item-fk="entityId"
+                    :warehouse-fk="warehouseFk"
+                    @on-data-saved="$emit('regularized')"
+                />
+            </QDialog>
+        </QItemSection>
+    </QItem>
+    <QItem v-ripple clickable @click="openCloneDialog(entityId)">
+        <QItemSection>
+            {{ $t('globals.clone') }}
+        </QItemSection>
+    </QItem>
+</template>
+
+<style lang="scss" scoped>
+.weekdaysBtn {
+    margin: 1%;
+}
+</style>

src/pages/Item/Card/ItemSummary.vue

@@ -8,6 +8,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import ItemDescriptorMenu from './ItemDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -43,10 +44,13 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
         <template #header="{ entity: { item } }">
             {{ item.id }} - {{ item.name }}
         </template>
+        <template #menu>
+            <ItemDescriptorMenu :entity-id="entityId" :warehouse-fk="warehouseFk" />
+        </template>
         <template #body="{ entity: { item, tags, visible, available, botanical } }">
             <QCard class="vn-one photo">
                 <ItemDescriptorImage
-                    :entity-id="Number(entityId)"
+                    :entity-id="entityId"
                     :visible="visible"
                     :available="available"
                     :show-edit-button="false"
@@ -89,7 +93,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
             <QCard class="vn-one">
                 <VnTitle
                     :url="getUrl(entityId, 'basic-data')"
-                    :text="t('item.summary.basicData')"
+                    :text="t('item.summary.otherData')"
                 />
                 <VnLv
                     :label="t('item.summary.intrastatCode')"

src/pages/Item/ItemList.vue

@@ -152,7 +152,7 @@ const columns = computed(() => [
         },
         columnField: {
             component: null,
-        }
+        },
     },
     {
         label: t('item.list.category'),
@@ -498,5 +498,4 @@ es:
     Create Item: Crear artículo
     You can search by id: Puedes buscar por id
     Preview: Vista previa
-    Regularize stock: Regularizar stock
 </i18n>

src/pages/Item/ItemRequest.vue

@@ -172,13 +172,13 @@ const changeQuantity = async (request) => {
         };
 
         await axios.patch(`Sales/${request.saleFk}`, params);
+    }
+    await confirmRequest(request);
     notify(t('globals.dataSaved'), 'positive');
-        confirmRequest(request);
-    } else confirmRequest(request);
 };
 
 const confirmRequest = async (request) => {
-    if (request.itemFk && request.saleQuantity) {
+    if (!request.itemFk || !request.saleQuantity) return;
     const params = {
         itemFk: request.itemFk,
         quantity: request.saleQuantity,
@@ -188,8 +188,6 @@ const confirmRequest = async (request) => {
     const { data } = await axios.post(`TicketRequests/${request.id}/confirm`, params);
     request.itemDescription = data.concept;
     request.isOk = true;
-        notify(t('globals.dataSaved'), 'positive');
-    }
 };
 
 const getState = (isOk) => {

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.
@@ -219,3 +220,4 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
+    regularizeStock: Regularize stock

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.
@@ -210,6 +211,7 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
+    regularizeStock: Regularizar stock
     buyRequest:
         ticketId: 'ID Ticket'
         shipped: 'F. envío'

src/pages/Order/Card/OrderDescriptor.vue

@@ -9,7 +9,6 @@ import useCardDescription from 'src/composables/useCardDescription';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import FetchData from 'components/FetchData.vue';
-import OrderDescriptorMenu from 'pages/Order/Card/OrderDescriptorMenu.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const DEFAULT_ITEMS = 0;
@@ -94,9 +93,6 @@ const total = ref(0);
         @on-fetch="setData"
         data-key="orderData"
     >
-        <template #menu="{ entity }">
-            <OrderDescriptorMenu :order="entity" />
-        </template>
         <template #body="{ entity }">
             <VnLv
                 :label="t('globals.state')"

src/pages/Order/Card/OrderLines.vue

@@ -213,9 +213,9 @@ async function handleConfirm() {
             type: 'positive',
         });
         router.push({
-            name: 'TicketList',
+            name: 'TicketSale',
             query: {
-                table: JSON.stringify({ clientFk: descriptorData.store.data.clientFk }),
+                table: JSON.stringify({ id: route.params.id }),
             },
         });
     }

src/pages/Order/Card/OrderSummary.vue

@@ -12,6 +12,7 @@ import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import OrderDescriptorMenu from 'pages/Order/Card/OrderDescriptorMenu.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -91,6 +92,9 @@ async function handleConfirm() {
                     <QTooltip>{{ t('order.summary.confirmLines') }}</QTooltip>
                 </QBtn>
             </template>
+            <template #menu="{ entity }">
+                <OrderDescriptorMenu :order="entity" />
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
                     <VnTitle

src/pages/Route/Card/RouteDescriptorMenu.vue

@@ -52,7 +52,7 @@ async function actualizeVolume() {
     const params = { isOk: true };
     await axios.post(`Routes/${routeId}/updateVolume`, params);
     quasar.notify({
-        message: t('globals.dataUpdated'),
+        message: t('globals.dataSaved'),
         type: 'positive',
     });
 }

src/pages/Route/Card/RouteSummary.vue

@@ -12,6 +12,7 @@ import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import RouteDescriptorMenu from './RouteDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -128,6 +129,9 @@ const ticketColumns = ref([
             <template #header="{ entity }">
                 <span>{{ `${entity?.route.id} - ${entity?.route?.description}` }}</span>
             </template>
+            <template #menu="{ entity }">
+                <RouteDescriptorMenu :route="entity.route" />
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-max">
                     <VnTitle

src/pages/Route/Roadmap/RoadmapSummary.vue

@@ -10,6 +10,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import VnLinkPhone from 'components/ui/VnLinkPhone.vue';
+import RoadmapDescriptorMenu from './RoadmapDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -86,6 +87,9 @@ const filter = {
             <template #header="{ entity }">
                 <span>{{ `${entity?.id} - ${entity?.name}` }}</span>
             </template>
+            <template #menu="{ entity }">
+                <RoadmapDescriptorMenu :route="entity" />
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
                     <VnTitle

src/pages/Shelving/Card/ShelvingDescriptorMenu.vue

@@ -4,6 +4,7 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import VnConfirm from 'components/ui/VnConfirm.vue';
+import { useRoute } from 'vue-router';
 
 const $props = defineProps({
     shelving: {
@@ -14,8 +15,11 @@ const $props = defineProps({
 
 const router = useRouter();
 const quasar = useQuasar();
+const route = useRoute();
 const { t } = useI18n();
 
+const emit = defineEmits(['onRemove']);
+
 function confirmRemove() {
     quasar.dialog({
         component: VnConfirm,
@@ -32,11 +36,12 @@ async function remove() {
         return;
     }
     await axios.delete(`Shelvings/${$props.shelving.id}`);
-    await router.push({ name: 'ShelvingList' });
+    if (route.name != 'ShelvingList') await router.push({ name: 'ShelvingList' });
     quasar.notify({
         message: t('globals.dataDeleted'),
         type: 'positive',
     });
+    emit('onRemove', {});
 }
 </script>
 <template>

src/pages/Shelving/Card/ShelvingSummary.vue

@@ -1,10 +1,11 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
+import ShelvingDescriptorMenu from './ShelvingDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -14,7 +15,7 @@ const $props = defineProps({
 });
 const route = useRoute();
 const { t } = useI18n();
-
+const summary = ref({});
 const entityId = computed(() => $props.id || route.params.id);
 
 const filter = {
@@ -43,7 +44,13 @@ const filter = {
             data-key="ShelvingSummary"
         >
             <template #header="{ entity }">
-                <div>{{ entity.id }} - {{ entity.code }}</div>
+                <div>{{ entity.code }}</div>
+            </template>
+            <template #menu="{ entity }">
+                <ShelvingDescriptorMenu
+                    :shelving="entity"
+                    @on-remove="$refs.summary.fetch()"
+                />
             </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">

src/pages/Ticket/Card/TicketSummary.vue

@@ -96,7 +96,6 @@ function toTicketUrl(section) {
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
         data-key="TicketSummary"
-        data-cy="ticketSummary"
     >
         <template #header-left>
             <VnToSummary
@@ -114,7 +113,7 @@ function toTicketUrl(section) {
                 {{ entity.nickname }}
             </div>
         </template>
-        <template #header-right="{ entity }">
+        <template #header-right>
             <div>
                 <QBtnDropdown
                     ref="stateBtnDropdownRef"
@@ -133,18 +132,11 @@ function toTicketUrl(section) {
                         @update:model-value="changeState"
                     />
                 </QBtnDropdown>
-                <QBtn color="white" dense flat icon="more_vert" round size="md">
-                    <QTooltip>
-                        {{ t('components.cardDescriptor.moreOptions') }}
-                    </QTooltip>
-                    <QMenu>
-                        <QList>
-                            <TicketDescriptorMenu :ticket="entity" />
-                        </QList>
-                    </QMenu>
-                </QBtn>
             </div>
         </template>
+        <template #menu="{ entity }">
+            <TicketDescriptorMenu :ticket="entity" />
+        </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle
@@ -258,7 +250,7 @@ function toTicketUrl(section) {
             <QCard class="vn-one" v-if="entity.notes.length">
                 <VnTitle
                     :url="toTicketUrl('observation')"
-                    :text="t('globals.pageTitles.notes')"
+                    :text="t('ticket.pageTitles.notes')"
                 />
                 <QVirtualScroll
                     :items="entity.notes"

src/pages/Travel/Card/TravelSummary.vue

@@ -11,6 +11,7 @@ import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import { toDate, toCurrency } from 'src/filters';
 import axios from 'axios';
+import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
 
 const $props = defineProps({
     id: {
@@ -242,7 +243,9 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
         <template #header>
             <span>{{ travel.id }} - {{ travel.ref }}</span>
         </template>
-
+        <template #menu="{ entity }">
+            <TravelDescriptorMenuItems :travel="entity" />
+        </template>
         <template #body>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -6,11 +6,10 @@ import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
-import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
 import EditPictureForm from 'components/EditPictureForm.vue';
-import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
+import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -28,8 +27,6 @@ const image = ref(null);
 
 const route = useRoute();
 const { t } = useI18n();
-const state = useState();
-const user = state.getUser();
 const showEditPhotoForm = ref(false);
 const toggleEditPictureForm = () => {
     showEditPhotoForm.value = !showEditPhotoForm.value;
@@ -45,18 +42,6 @@ const getIsExcluded = async () => {
     workerExcluded.value = data.exists;
 };
 
-const handleExcluded = async () => {
-    if (workerExcluded.value)
-        await axios.delete(`WorkerDisableExcludeds/${entityId.value}`);
-    else
-        await axios.post(`WorkerDisableExcludeds`, {
-            workerFk: entityId.value,
-            dated: new Date(),
-        });
-
-    workerExcluded.value = !workerExcluded.value;
-};
-
 const handlePhotoUpdated = (evt = false) => {
     image.value.reload(evt);
 };
@@ -72,25 +57,11 @@ const handlePhotoUpdated = (evt = false) => {
         @on-fetch="getIsExcluded"
     >
         <template #menu="{ entity }">
-            <QItem v-ripple clickable @click="handleExcluded">
+            <WorkerDescriptorMenu
-                <QItemSection>
+                :worker="entity"
-                    {{
+                :is-excluded="workerExcluded"
-                        workerExcluded
+                @show-dialog="$refs.changePassRef.show"
-                            ? t('Click to allow the user to be disabled')
+            />
-                            : t('Click to exclude the user from getting disabled')
-                    }}
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-if="!entity.user.emailVerified && user.id != entity.id"
-                v-ripple
-                clickable
-                @click="$refs.changePassRef.show"
-            >
-                <QItemSection>
-                    {{ t('globals.changePass') }}
-                </QItemSection>
-            </QItem>
         </template>
         <template #before>
             <div class="relative-position">
@@ -144,14 +115,10 @@ const handlePhotoUpdated = (evt = false) => {
                 :value="entity.user?.emailUser?.email"
                 copy
             />
-            <VnLv :label="t('worker.list.department')">
+            <VnLv
-                <template #value>
+                :label="t('worker.list.department')"
-                        <span class="link" v-text="entity.department?.department?.name" />
+                :value="entity.department ? entity.department.department.name : null"
-                        <DepartmentDescriptorProxy
-                            :id="entity.department?.department?.id"
             />
-                </template>
-            </VnLv>
             <VnLv :value="entity.phone">
                 <template #label>
                     {{ t('globals.phone') }}
@@ -211,8 +178,6 @@ const handlePhotoUpdated = (evt = false) => {
 
 <i18n>
 es:
-    Go to client: Ir a cliente
-    Go to user: Ir al usuario
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
 </i18n>

src/pages/Worker/Card/WorkerDescriptorMenu.vue

@@ -0,0 +1,65 @@
+<script setup>
+import { computed, ref, toRefs } from 'vue';
+import axios from 'axios';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useState } from 'src/composables/useState';
+
+const $props = defineProps({
+    worker: {
+        type: Object,
+        required: true,
+    },
+    isExcluded: {
+        type: Boolean,
+        required: true,
+    },
+});
+const route = useRoute();
+const { t } = useI18n();
+const state = useState();
+const user = state.getUser();
+const { worker } = toRefs($props);
+const workerExcluded = ref($props.isExcluded);
+const entityId = computed(() => {
+    return $props.worker.id || route.params.id;
+});
+const emit = defineEmits(['show-dialog']);
+const handleExcluded = async () => {
+    if (workerExcluded.value)
+        await axios.delete(`WorkerDisableExcludeds/${entityId.value}`);
+    else
+        await axios.post(`WorkerDisableExcludeds`, {
+            workerFk: entityId.value,
+            dated: new Date(),
+        });
+
+    workerExcluded.value = !workerExcluded.value;
+};
+
+const showChangePasswordDialog = () => {
+    emit('show-dialog', true);
+};
+</script>
+
+<template>
+    <QItem v-ripple clickable @click="handleExcluded">
+        <QItemSection>
+            {{
+                workerExcluded
+                    ? t('Click to allow the user to be disabled')
+                    : t('Click to exclude the user from getting disabled')
+            }}
+        </QItemSection>
+    </QItem>
+    <QItem
+        v-if="!worker.user.emailVerified && user.id == worker.id"
+        v-ripple
+        clickable
+        @click="showChangePasswordDialog"
+    >
+        <QItemSection>
+            {{ t('globals.changePass') }}
+        </QItemSection>
+    </QItem>
+</template>

src/pages/Worker/Card/WorkerSummary.vue

@@ -11,6 +11,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
+import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -42,6 +43,9 @@ onBeforeMount(async () => {
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>
         </template>
+        <template #menu="{ entity }">
+            <WorkerDescriptorMenu :worker="entity" :is-excluded="workerExcluded" />
+        </template>
         <template #body="{ entity: worker }">
             <QCard class="vn-one">
                 <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />

src/pages/Zone/Card/ZoneBasicData.vue

@@ -100,6 +100,16 @@ const agencyOptions = ref([]);
                     required="true"
                     clearable
                 />
+                <VnInput
+                    v-model="data.priceOptimum"
+                    :label="t('Price optimum')"
+                    type="number"
+                    min="0"
+                    required="true"
+                    clearable
+                />
+            </VnRow>
+            <VnRow>
                 <VnInput
                     v-model="data.bonus"
                     :label="t('Bonus')"
@@ -107,8 +117,6 @@ const agencyOptions = ref([]);
                     min="0"
                     clearable
                 />
-            </VnRow>
-            <VnRow>
                 <VnSelect
                     :label="t('Distribution point')"
                     v-model="data.addressFk"
@@ -152,6 +160,7 @@ es:
     Traveling days: Dias de viaje
     Closing: Cierre
     Price: Precio
+    Price optimum: Precio óptimo
     Bonus: Bonificación
     Inflation: Inflación
     Volumetric: Volumétrico

src/pages/Zone/Card/ZoneEventInclusionForm.vue

@@ -182,13 +182,19 @@ onMounted(() => {
                     min="0"
                 />
                 <VnInput
-                    v-model="eventInclusionFormData.bonus"
+                    v-model="eventInclusionFormData.priceOptimum"
-                    :label="t('zone.bonus')"
+                    :label="t('list.priceOptimum')"
                     type="number"
                     min="0"
                 />
             </VnRow>
             <VnRow>
+                <VnInput
+                    v-model="eventInclusionFormData.bonus"
+                    :label="t('zone.bonus')"
+                    type="number"
+                    min="0"
+                />
                 <VnInput
                     v-model="eventInclusionFormData.m3Max"
                     :label="t('zone.m3Max')"

src/pages/Zone/Card/ZoneSummary.vue

@@ -11,6 +11,7 @@ import { getUrl } from 'src/composables/getUrl';
 import { toCurrency } from 'filters/index';
 import { toTimeFormat } from 'src/filters/date';
 import axios from 'axios';
+import ZoneDescriptorMenuItems from './ZoneDescriptorMenuItems.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -79,6 +80,9 @@ onMounted(async () => {
         <template #header="{ entity }">
             <div>#{{ entity.id }} - {{ entity.name }}</div>
         </template>
+        <template #menu="{ entity }">
+            <ZoneDescriptorMenuItems :zone="entity" />
+        </template>
         <template #body="{ entity: zone }">
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />

src/pages/Zone/locale/es.yml

@@ -22,6 +22,7 @@ list:
     agency: Agencia
     close: Cierre
     price: Precio
+    priceOptimum: Precio óptimo
     create: Crear zona
     openSummary: Detalles
     searchZone: Buscar zonas

src/stores/invoiceOutGlobal.js

@@ -7,10 +7,16 @@ 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: () => ({
         initialDataLoading: true,
         formInitialData: {
@@ -24,15 +30,11 @@ export const useInvoiceOutGlobalStore = defineStore({
         addresses: [],
         minInvoicingDate: null,
         parallelism: null,
-        invoicing: false,
-        isInvoicing: false,
         status: null,
-        addressIndex: 0,
+
-        errors: [],
         printer: null,
-        nRequests: 0,
+        formData: null,
-        nPdfs: 0,
+        ...initInvoicing,
-        totalPdfs: 0,
     }),
     actions: {
         async init() {
@@ -93,8 +95,6 @@ export const useInvoiceOutGlobalStore = defineStore({
         },
 
         async makeInvoice(formData, clientsToInvoice) {
-            this.invoicing = true;
-            const promises = [];
             try {
                 this.printer = formData.printer;
                 const params = {
@@ -119,11 +119,13 @@ export const useInvoiceOutGlobalStore = defineStore({
                     );
                     throw new Error("There aren't addresses to invoice");
                 }
+                this.formData = formData;
                 this.status = 'invoicing';
-                for (let index = 0; index < this.parallelism; index++) {
+                //reset data
-                    promises.push(this.invoiceClient(formData, index));
+                for (const key in initInvoicing) {
+                    this[key] = initInvoicing[key];
                 }
-                await Promise.all(promises);
+                this.invoiceClient();
             } catch (err) {
                 this.handleError(err);
             }
@@ -182,45 +184,43 @@ export const useInvoiceOutGlobalStore = defineStore({
             }
         },
 
-        async invoiceClient(formData, index) {
+        async invoiceClient() {
-            const address = this.addresses[index];
+            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;
                 return;
             }
             try {
+                this.invoicing = true;
+                this.nRequests++;
                 const params = {
                     clientId: address.clientId,
                     addressId: address.id,
-                    invoiceDate: new Date(formData.invoiceDate),
+                    invoiceDate: new Date(this.formData.invoiceDate),
-                    maxShipped: new Date(formData.maxShipped),
+                    maxShipped: new Date(this.formData.maxShipped),
-                    companyFk: formData.companyFk,
+                    companyFk: this.formData.companyFk,
-                    serialType: formData.serialType,
+                    serialType: this.formData.serialType,
                 };
 
-                this.invoicing = true;
-
                 const { data } = await axios.post('InvoiceOuts/invoiceClient', params);
-
+                if (data) this.makePdfAndNotify(data, address);
-                if (data) await this.makePdfAndNotify(data, address);
-                this.isInvoicing = false;
             } catch (err) {
                 if (err?.response?.status >= 400 && err?.response?.status < 500) {
                     this.invoiceClientError(address, err.response?.data?.error?.message);
                     return;
                 } else {
-                    this.invoicing = false;
                     notify(
                         'invoiceOut.globalInvoices.errors.criticalInvoiceError',
                         'negative'
                     );
-                    throw new Error('Critical invoicing error, process stopped');
                 }
             } finally {
+                this.invoicing = false;
+                this.nRequests--;
                 this.addressIndex++;
-                if (this.status != 'stopping')
+                this.invoiceClient();
-                    await this.invoiceClient(formData, this.addressIndex);
             }
         },
 
@@ -231,9 +231,11 @@ export const useInvoiceOutGlobalStore = defineStore({
                 const params = { printerFk: this.printer };
                 await axios.post(`InvoiceOuts/${invoiceId}/makePdfAndNotify`, params);
                 this.nPdfs++;
-                this.nRequests--;
             } catch (err) {
                 this.invoiceClientError(client, err.response?.data?.error?.message, true);
+            } finally {
+                this.nRequests--;
+                this.invoiceClient();
             }
         },
 

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

@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 
 describe('InvoiceInCorrective', () => {
-    const createRectificative = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
+    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 ';
 
@@ -13,7 +13,7 @@ describe('InvoiceInCorrective', () => {
 
         cy.openActionsDescriptor();
 
-        cy.get(createRectificative).click();
+        cy.get(createCorrective).click();
         cy.get(saveDialog).click();
         cy.wait('@corrective').then((interception) => {
             const correctingId = interception.response.body;