Merge branch 'dev' into 6911-saveOnEnter

Jenkinsfile

@@ -54,7 +54,6 @@ pipeline {
     }
     environment {
         PROJECT_NAME = 'lilium'
-        STACK_NAME   = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
         stage('Install') {
@@ -104,15 +103,18 @@ pipeline {
             when {
                 expression { PROTECTED_BRANCH }
             }
-            environment {
-                DOCKER_HOST = "${env.SWARM_HOST}"
-            }
             steps {
                 script {
                     def packageJson = readJSON file: 'package.json'
                     env.VERSION = packageJson.version
                 }
-                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
+                withKubeConfig([
+                    serverUrl: "$KUBERNETES_API",
+                    credentialsId: 'kubernetes',
+                    namespace: 'lilium'
+                ]) {
+                    sh 'kubectl set image deployment/lilium-$BRANCH_NAME lilium-$BRANCH_NAME=$REGISTRY/salix-frontend:$VERSION'
+                }
             }
         }
     }

docker-compose.yml

@@ -1,17 +1,7 @@
 version: '3.7'
 services:
   main:
-    image: registry.verdnatura.es/salix-frontend:${BRANCH_NAME:?}
+    image: registry.verdnatura.es/salix-frontend:${VERSION:?}
     build:
       context: .
       dockerfile: ./Dockerfile
-    ports:
-      - 4000
-    deploy:
-      replicas: ${FRONT_REPLICAS:?}
-      placement:
-        constraints:
-          - node.role == worker
-      resources:
-        limits:
-          memory: 1G

package.json

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

src/components/CreateManualInvoiceForm.vue

@@ -48,7 +48,11 @@ const onDataSaved = async (formData, requestResponse) => {
     />
     <FetchData
         url="Tickets"
-        :filter="{ fields: ['id', 'nickname'], order: 'shipped DESC', limit: 30 }"
+        :filter="{
+            fields: ['id', 'nickname'],
+            where: { refFk: null },
+            order: 'shipped DESC',
+        }"
         @on-fetch="(data) => (ticketsOptions = data)"
         auto-load
     />

src/components/CrudModel.vue

@@ -1,6 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@@ -10,6 +11,7 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
 
+const { push } = useRouter();
 const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -60,6 +62,11 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    goTo: {
+        type: String,
+        default: '',
+        description: 'It is used for redirect on click "save and continue"',
+    },
 });
 
 const isLoading = ref(false);
@@ -128,6 +135,11 @@ async function onSubmit() {
     await saveChanges($props.saveFn ? formData.value : null);
 }
 
+async function onSumbitAndGo() {
+    await onSubmit();
+    push({ path: $props.goTo });
+}
+
 async function saveChanges(data) {
     if ($props.saveFn) {
         $props.saveFn(data, getChanges);
@@ -310,7 +322,40 @@ watch(formUrl, async () => {
                 :title="t('globals.reset')"
                 v-if="$props.defaultReset"
             />
+            <QBtnDropdown
+                v-if="$props.goTo && $props.defaultSave"
+                @click="onSumbitAndGo"
+                :label="tMobile('globals.saveAndContinue')"
+                :title="t('globals.saveAndContinue')"
+                :disable="!hasChanges"
+                color="primary"
+                icon="save"
+                split
+            >
+                <QList>
+                    <QItem
+                        color="primary"
+                        clickable
+                        v-close-popup
+                        @click="onSubmit"
+                        :title="t('globals.save')"
+                    >
+                        <QItemSection>
+                            <QItemLabel>
+                                <QIcon
+                                    name="save"
+                                    color="white"
+                                    class="q-mr-sm"
+                                    size="sm"
+                                />
+                                {{ t('globals.save').toUpperCase() }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </QList>
+            </QBtnDropdown>
             <QBtn
+                v-else-if="!$props.goTo && $props.defaultSave"
                 :label="tMobile('globals.save')"
                 ref="saveButtonRef"
                 color="primary"
@@ -318,7 +363,6 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                v-if="$props.defaultSave"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>

src/components/FetchData.vue

@@ -24,7 +24,7 @@ const $props = defineProps({
         default: '',
     },
     limit: {
-        type: String,
+        type: [String, Number],
         default: '',
     },
     params: {

src/components/FormModel.vue

@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
-import { onBeforeRouteLeave } from 'vue-router';
+import { onBeforeRouteLeave, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useState } from 'src/composables/useState';
@@ -11,7 +11,9 @@ import useNotify from 'src/composables/useNotify.js';
 import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
+import { useArrayData } from 'src/composables/useArrayData';
 
+const { push } = useRouter();
 const quasar = useQuasar();
 const state = useState();
 const stateStore = useStateStore();
@@ -74,55 +76,17 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    goTo: {
+        type: String,
+        default: '',
+        description: 'It is used for redirect on click "save and continue"',
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 
 const componentIsRendered = ref(false);
-
+const arrayData = useArrayData($props.model);
-onMounted(async () => {
-    originalData.value = $props.formInitialData;
-    nextTick(() => {
-        componentIsRendered.value = true;
-    });
-
-    // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
-    state.set($props.model, $props.formInitialData);
-    if ($props.autoLoad && !$props.formInitialData) {
-        await fetch();
-    }
-
-    // Si así se desea disparamos el watcher del form después de 100ms, asi darle tiempo de que se haya cargado la data inicial
-    // para evitar que detecte cambios cuando es data inicial default
-    if ($props.observeFormChanges) {
-        setTimeout(() => {
-            startFormWatcher();
-        }, 100);
-    }
-});
-
-onBeforeRouteLeave((to, from, next) => {
-    if (hasChanges.value && $props.observeFormChanges)
-        quasar.dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('Unsaved changes will be lost'),
-                message: t('Are you sure exit without saving?'),
-                promise: () => next(),
-            },
-        });
-    else next();
-});
-
-onUnmounted(() => {
-    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
-    if (hasChanges.value) {
-        state.set($props.model, originalData.value);
-        return;
-    }
-    if ($props.clearStoreOnUnmount) state.unset($props.model);
-});
-
 const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
 const isResetting = ref(false);
@@ -143,29 +107,72 @@ const defaultButtons = computed(() => ({
     },
     ...$props.defaultButtons,
 }));
-const startFormWatcher = () => {
+
+onMounted(async () => {
+    originalData.value = JSON.parse(JSON.stringify($props.formInitialData ?? {}));
+
+    nextTick(() => (componentIsRendered.value = true));
+
+    // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
+    state.set($props.model, $props.formInitialData);
+
+    if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch();
+    else if (arrayData.store.data) updateAndEmit(arrayData.store.data, 'onFetch');
+
+    if ($props.observeFormChanges) {
+        watch(
+            () => formData.value,
+            (newVal, oldVal) => {
+                if (!oldVal) return;
+                hasChanges.value =
+                    !isResetting.value &&
+                    JSON.stringify(newVal) !== JSON.stringify(originalData.value);
+                isResetting.value = false;
+            },
+            { deep: true }
+        );
+    }
+});
+
+if (!$props.url)
     watch(
-        () => formData.value,
+        () => arrayData.store.data,
-        (val) => {
+        (val) => updateAndEmit(val, 'onFetch')
-            hasChanges.value = !isResetting.value && val;
-            isResetting.value = false;
-        },
-        { deep: true }
     );
-};
+
+watch(formUrl, async () => {
+    originalData.value = null;
+    reset();
+    await fetch();
+});
+
+onBeforeRouteLeave((to, from, next) => {
+    if (hasChanges.value && $props.observeFormChanges)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('Unsaved changes will be lost'),
+                message: t('Are you sure exit without saving?'),
+                promise: () => next(),
+            },
+        });
+    else next();
+});
+
+onUnmounted(() => {
+    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
+    if (hasChanges.value) return state.set($props.model, originalData.value);
+    if ($props.clearStoreOnUnmount) state.unset($props.model);
+});
 
 async function fetch() {
     try {
         let { data } = await axios.get($props.url, {
             params: { filter: JSON.stringify($props.filter) },
         });
-
         if (Array.isArray(data)) data = data[0] ?? {};
 
-        state.set($props.model, data);
+        updateAndEmit(data, 'onFetch');
-        originalData.value = data && JSON.parse(JSON.stringify(data));
-
-        emit('onFetch', state.get($props.model));
     } catch (error) {
         state.set($props.model, {});
         originalData.value = {};
@@ -173,38 +180,39 @@ async function fetch() {
 }
 
 async function save() {
-    if ($props.observeFormChanges && !hasChanges.value) {
+    if ($props.observeFormChanges && !hasChanges.value)
-        notify('globals.noChanges', 'negative');
+        return notify('globals.noChanges', 'negative');
-        return;
-    }
-    isLoading.value = true;
 
+    isLoading.value = true;
     try {
         const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
+        const method = $props.urlCreate ? 'post' : 'patch';
+        const url =
+            $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
         let response;
+
         if ($props.saveFn) response = await $props.saveFn(body);
-        else
+        else response = await axios[method](url, body);
-            response = await axios[$props.urlCreate ? 'post' : 'patch'](
+
-                $props.urlCreate || $props.urlUpdate || $props.url,
-                body
-            );
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
-        emit('onDataSaved', formData.value, response?.data);
-        originalData.value = JSON.parse(JSON.stringify(formData.value));
         hasChanges.value = false;
+        isLoading.value = false;
+
+        updateAndEmit(response?.data, 'onDataSaved');
     } catch (err) {
         console.error(err);
         notify('errors.writeRequest', 'negative');
     }
-    isLoading.value = false;
+}
+
+async function saveAndGo() {
+    await save();
+    push({ path: $props.goTo });
 }
 
 function reset() {
-    state.set($props.model, originalData.value);
+    updateAndEmit(originalData.value, 'onFetch');
-    originalData.value = JSON.parse(JSON.stringify(originalData.value));
-
-    emit('onFetch', state.get($props.model));
     if ($props.observeFormChanges) {
         hasChanges.value = false;
         isResetting.value = true;
@@ -226,17 +234,15 @@ function filter(value, update, filterOptions) {
     );
 }
 
-watch(formUrl, async () => {
+function updateAndEmit(val, evt) {
-    originalData.value = null;
+    state.set($props.model, val);
-    reset();
+    originalData.value = val && JSON.parse(JSON.stringify(val));
-    fetch();
+    if (!$props.url) arrayData.store.data = val;
-});
 
-defineExpose({
+    emit(evt, state.get($props.model));
-    save,
+}
-    isLoading,
+
-    hasChanges,
+defineExpose({ save, isLoading, hasChanges });
-});
 </script>
 <template>
     <div class="column items-center full-width">
@@ -273,10 +279,42 @@ defineExpose({
                     :disable="!hasChanges"
                     :title="t(defaultButtons.reset.label)"
                 />
+                <QBtnDropdown
+                    v-if="$props.goTo"
+                    @click="saveAndGo"
+                    :label="tMobile('globals.saveAndContinue')"
+                    :title="t('globals.saveAndContinue')"
+                    :disable="!hasChanges"
+                    color="primary"
+                    icon="save"
+                    split
+                >
+                    <QList>
+                        <QItem
+                            clickable
+                            v-close-popup
+                            @click="save"
+                            :title="t('globals.save')"
+                        >
+                            <QItemSection>
+                                <QItemLabel>
+                                    <QIcon
+                                        name="save"
+                                        color="white"
+                                        class="q-mr-sm"
+                                        size="sm"
+                                    />
+                                    {{ t('globals.save').toUpperCase() }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QList>
+                </QBtnDropdown>
                 <QBtn
-                    :label="tMobile(defaultButtons.save.label)"
+                    v-else
-                    :color="defaultButtons.save.color"
+                    :label="tMobile('globals.save')"
-                    :icon="defaultButtons.save.icon"
+                    color="primary"
+                    icon="save"
                     @click="save"
                     :disable="!hasChanges"
                     :title="t(defaultButtons.save.label)"

src/components/common/VnCard.vue

@@ -20,6 +20,8 @@ const props = defineProps({
     searchUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
+    searchCustomRouteRedirect: { type: String, default: undefined },
+    searchRedirect: { type: Boolean, default: true },
 });
 
 const stateStore = useStateStore();
@@ -42,7 +44,7 @@ onBeforeMount(async () => {
 if (props.baseUrl) {
     onBeforeRouteUpdate(async (to, from) => {
         if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${route.params.id}`;
+            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
             await arrayData.fetch({ append: false });
         }
     });
@@ -62,6 +64,8 @@ watchEffect(() => {
                     :url="props.searchUrl"
                     :label="props.searchbarLabel"
                     :info="props.searchbarInfo"
+                    :custom-route-redirect-name="searchCustomRouteRedirect"
+                    :redirect="searchRedirect"
                 />
             </slot>
         </Teleport>

src/components/common/VnDms.vue

@@ -78,6 +78,7 @@ async function save() {
     const body = mapperDms(dms.value);
     const response = await axios.post(getUrl(), body[0], body[1]);
     emit('onDataSaved', body[1].params, response);
+    return response;
 }
 
 function defaultData() {

src/components/common/VnInputTime.vue

@@ -2,6 +2,7 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import isValidDate from 'filters/isValidDate';
+import VnInput from 'components/common/VnInput.vue';
 
 const props = defineProps({
     modelValue: {
@@ -74,7 +75,7 @@ const styleAttrs = computed(() => {
         @click="isPopupOpen = true"
     >
         <template #append>
-            <QIcon name="schedule" class="cursor-pointer">
+            <QIcon name="Schedule" class="cursor-pointer">
                 <QPopupProxy
                     v-model="isPopupOpen"
                     cover

src/components/common/VnLog.vue

@@ -622,21 +622,6 @@ setLogTree();
             </QList>
         </div>
     </div>
-    <Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">
-        <div class="row q-gutter-x-sm">
-            <QBtn
-                flat
-                @click.stop="stateStore.toggleRightDrawer()"
-                round
-                dense
-                icon="menu"
-            >
-                <QTooltip bottom anchor="bottom right">
-                    {{ t('globals.collapseMenu') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-    </Teleport>
     <QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
         <QScrollArea class="fit text-grey-8">
             <QList dense>

src/components/common/VnTitle.vue

@@ -1,16 +1,16 @@
 <script setup>
-const $props = defineProps({
+defineProps({
     url: { type: String, default: null },
     text: { type: String, default: null },
     icon: { type: String, default: 'open_in_new' },
 });
 </script>
 <template>
-    <div class="titleBox">
+    <div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
         <div class="header-link">
-            <a :href="$props.url" :class="$props.url ? 'link' : 'color-vn-text'">
+            <a :href="url" :class="url ? 'link' : 'color-vn-text'">
-                {{ $props.text }}
+                {{ text }}
-                <QIcon v-if="url" :name="$props.icon" />
+                <QIcon v-if="url" :name="icon" />
             </a>
         </div>
     </div>
@@ -19,7 +19,4 @@ const $props = defineProps({
 a {
     font-size: large;
 }
-.titleBox {
-    padding-bottom: 2%;
-}
 </style>

src/components/ui/CardDescriptor.vue

@@ -5,6 +5,7 @@ import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
+import { useRoute } from 'vue-router';
 
 const $props = defineProps({
     url: {
@@ -15,21 +16,21 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    module: {
-        type: String,
-        required: true,
-    },
     title: {
         type: String,
         default: '',
     },
     subtitle: {
         type: Number,
-        default: 0,
+        default: null,
     },
     dataKey: {
         type: String,
-        default: '',
+        default: null,
+    },
+    module: {
+        type: String,
+        default: null,
     },
     summary: {
         type: Object,
@@ -40,21 +41,27 @@ const $props = defineProps({
 const state = useState();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const arrayData = useArrayData($props.dataKey || $props.module, {
+let arrayData;
-    url: $props.url,
+let store;
-    filter: $props.filter,
+let entity;
-    skip: 0,
-});
-const { store } = arrayData;
-const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
-defineExpose({
+defineExpose({ getData });
-    getData,
+
-});
 onBeforeMount(async () => {
-    await getData();
+    arrayData = useArrayData($props.dataKey, {
-    watch($props, async () => await getData());
+        url: $props.url,
+        filter: $props.filter,
+        skip: 0,
+    });
+    store = arrayData.store;
+    entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+    // It enables to load data only once if the module is the same as the dataKey
+    if ($props.dataKey !== useRoute().meta.moduleName) await getData();
+    watch(
+        () => [$props.url, $props.filter],
+        async () => await getData()
+    );
 });
 
 async function getData() {
@@ -132,7 +139,7 @@ const emit = defineEmits(['onFetch']);
                     <QItemLabel header class="ellipsis text-h5" :lines="1">
                         <div class="title">
                             <span v-if="$props.title" :title="$props.title">
-                                {{ $props.title }}
+                                {{ entity[title] ?? $props.title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span :title="entity.name">

src/components/ui/CardSummary.vue

@@ -56,11 +56,20 @@ async function fetch() {
 }
 
 const showRedirectToSummaryIcon = computed(() => {
-    const routeExists = route.matched.some(
+    const exist = existSummary(route.matched);
-        (route) => route.name === `${route.meta.moduleName}Summary`
+    return !isSummary.value && route.meta.moduleName && exist;
-    );
-    return !isSummary.value && route.meta.moduleName && routeExists;
 });
+
+function existSummary(routes) {
+    const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`);
+    if (hasSummary) return hasSummary;
+    for (const current of routes) {
+        if (current.path != '/' && current.children) {
+            const exist = existSummary(current.children);
+            if (exist) return exist;
+        }
+    }
+}
 </script>
 
 <template>

src/components/ui/FetchedTags.vue

@@ -1,5 +1,7 @@
 <script setup>
-defineProps({
+import { computed } from 'vue';
+
+const $props = defineProps({
     maxLength: {
         type: Number,
         required: true,
@@ -8,53 +10,40 @@ defineProps({
         type: Object,
         required: true,
     },
+    tag: {
+        type: String,
+        required: false,
+        default: 'tag',
+    },
+    value: {
+        type: String,
+        required: false,
+        default: 'value',
+    },
+});
+const tags = computed(() => {
+    return Object.keys($props.item)
+        .filter((i) => i.startsWith(`${$props.tag}`))
+        .reduce((acc, tag) => {
+            const n = tag.split(`${$props.tag}`)[1];
+            const key = `${$props.tag}${n}`;
+            const value = `${$props.value}${n}`;
+            acc[$props.item[key] ?? key] = $props.item[value] ?? '';
+            return acc;
+        }, {});
 });
 </script>
 <template>
     <div class="fetchedTags">
         <div class="wrap">
             <div
+                v-for="(val, key) in tags"
+                :key="key"
                 class="inline-tag"
-                :class="{ empty: !$props.item.value5 }"
+                :title="`${key}: ${val}`"
-                :title="$props.item.tag5 + ': ' + $props.item.value5"
+                :class="{ empty: !val }"
             >
-                {{ $props.item.value5 }}
+                {{ val }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.tag6 }"
-                :title="$props.item.tag6 + ': ' + $props.item.value6"
-            >
-                {{ $props.item.value6 }}
-            </div>
-
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value7 }"
-                :title="$props.item.tag7 + ': ' + $props.item.value7"
-            >
-                {{ $props.item.value7 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value8 }"
-                :title="$props.item.tag8 + ': ' + $props.item.value8"
-            >
-                {{ $props.item.value8 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value9 }"
-                :title="$props.item.tag9 + ': ' + $props.item.value9"
-            >
-                {{ $props.item.value9 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value10 }"
-                :title="$props.item.tag10 + ': ' + $props.item.value10"
-            >
-                {{ $props.item.value10 }}
             </div>
         </div>
     </div>
@@ -72,7 +61,7 @@ defineProps({
     .inline-tag {
         height: 1rem;
         margin: 0.05rem;
-        color: $secondary;
+        color: $color-font-secondary;
         text-align: center;
         font-size: smaller;
         padding: 1px;
@@ -83,9 +72,8 @@ defineProps({
         min-width: 4rem;
         max-width: 4rem;
     }
-
     .empty {
-        border: 1px solid $color-spacer-light;
+        border: 1px solid #2b2b2b;
     }
 }
 </style>

src/components/ui/QCalendarMonthWrapper.vue

@@ -59,12 +59,10 @@ const containerClasses = computed(() => {
 // Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
 .q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
     background-color: $primary !important;
-    color: white !important;
 }
 
 .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
     background-color: $primary !important;
-    color: white !important;
 }
 
 .q-calendar-month__head--weekday {
@@ -112,7 +110,6 @@ const containerClasses = computed(() => {
             cursor: pointer;
         }
     }
-
     .q-calendar-month__week--days > div:nth-child(6),
     .q-calendar-month__week--days > div:nth-child(7) {
         // Cambia el color de los días sábado y domingo
@@ -150,7 +147,7 @@ const containerClasses = computed(() => {
     .q-calendar-month__head--workweek,
     .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
         text-transform: capitalize;
-        color: #777;
+        color: var(---color-font-secondary);
         font-weight: bold;
         font-size: 0.8rem;
         text-align: center;

src/components/ui/VnSearchbar.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -67,11 +67,19 @@ const props = defineProps({
     },
 });
 
-const arrayData = useArrayData(props.dataKey, { ...props });
+let arrayData = useArrayData(props.dataKey, { ...props });
-const { store } = arrayData;
+let store = arrayData.store;
 const searchText = ref('');
 const { navigate } = useRedirect();
 
+watch(
+    () => props.dataKey,
+    (val) => {
+        arrayData = useArrayData(val, { ...props });
+        store = arrayData.store;
+    }
+);
+
 onMounted(() => {
     const params = store.userParams;
     if (params && params.search) {

src/css/app.scss

@@ -169,6 +169,13 @@ select:-webkit-autofill {
 
 /* q-notification row items-stretch q-notification--standard bg-negative text-white */
 
+.q-card,
+.q-table,
+.q-table__bottom,
+.q-drawer {
+    background-color: var(--vn-section-color);
+}
+
 input[type='number'] {
     -moz-appearance: textfield;
 }

src/css/icons.scss

@@ -1,10 +1,10 @@
 @font-face {
     font-family: 'icon';
-    src: url('fonts/icon.eot?2omjsr');
+    src: url('fonts/icon.eot?1om04h');
-    src: url('fonts/icon.eot?2omjsr#iefix') format('embedded-opentype'),
+    src: url('fonts/icon.eot?1om04h#iefix') format('embedded-opentype'),
-        url('fonts/icon.ttf?2omjsr') format('truetype'),
+        url('fonts/icon.ttf?1om04h') format('truetype'),
-        url('fonts/icon.woff?2omjsr') format('woff'),
+        url('fonts/icon.woff?1om04h') format('woff'),
-        url('fonts/icon.svg?2omjsr#icon') format('svg');
+        url('fonts/icon.svg?1om04h#icon') format('svg');
     font-weight: normal;
     font-style: normal;
     font-display: block;
@@ -27,392 +27,410 @@
 }
 
 .icon-100:before {
-    content: '\e926';
+    content: '\e901';
 }
 .icon-Client_unpaid:before {
-    content: '\e925';
+    content: '\e98c';
-}
-.icon-Client_unpaid:before {
-    content: '\e925';
 }
 .icon-History:before {
-    content: '\e964';
+    content: '\e902';
 }
 .icon-Person:before {
-    content: '\e984';
+    content: '\e903';
 }
 .icon-accessory:before {
-    content: '\e948';
+    content: '\e904';
 }
 .icon-account:before {
-    content: '\e927';
+    content: '\e905';
 }
 .icon-actions:before {
-    content: '\e928';
+    content: '\e907';
 }
 .icon-addperson:before {
-    content: '\e929';
+    content: '\e908';
-}
-.icon-agency:before {
-    content: '\e92a';
 }
 .icon-agency:before {
     content: '\e92a';
 }
 .icon-agency-term:before {
-    content: '\e92b';
+    content: '\e909';
-}
-.icon-albaran:before {
-    content: '\e92c';
 }
 .icon-albaran:before {
     content: '\e92c';
 }
 .icon-anonymous:before {
-    content: '\e92d';
-}
-.icon-apps:before {
-    content: '\e92e';
-}
-.icon-artificial:before {
-    content: '\e92f';
-}
-.icon-attach:before {
-    content: '\e930';
-}
-.icon-barcode:before {
-    content: '\e932';
-}
-.icon-basket:before {
-    content: '\e933';
-}
-.icon-basketadd:before {
-    content: '\e934';
-}
-.icon-bin:before {
-    content: '\e935';
-}
-.icon-botanical:before {
-    content: '\e936';
-}
-.icon-bucket:before {
-    content: '\e937';
-}
-.icon-buscaman:before {
-    content: '\e938';
-}
-.icon-buyrequest:before {
-    content: '\e939';
-}
-.icon-calc_volum:before {
-    content: '\e93a';
-}
-.icon-calendar:before {
-    content: '\e940';
-}
-.icon-catalog:before {
-    content: '\e941';
-}
-.icon-claims:before {
-    content: '\e942';
-}
-.icon-client:before {
-    content: '\e943';
-}
-.icon-clone:before {
-    content: '\e945';
-}
-.icon-columnadd:before {
-    content: '\e946';
-}
-.icon-columndelete:before {
-    content: '\e947';
-}
-.icon-components:before {
-    content: '\e949';
-}
-.icon-consignatarios:before {
-    content: '\e94b';
-}
-.icon-control:before {
-    content: '\e94c';
-}
-.icon-credit:before {
-    content: '\e94d';
-}
-.icon-defaulter:before {
-    content: '\e94e';
-}
-.icon-deletedTicket:before {
-    content: '\e94f';
-}
-.icon-deleteline:before {
-    content: '\e950';
-}
-.icon-delivery:before {
-    content: '\e951';
-}
-.icon-deliveryprices:before {
-    content: '\e952';
-}
-.icon-details:before {
-    content: '\e954';
-}
-.icon-dfiscales:before {
-    content: '\e955';
-}
-.icon-disabled:before {
-    content: '\e965';
-}
-.icon-doc:before {
-    content: '\e956';
-}
-.icon-entry:before {
-    content: '\e958';
-}
-.icon-exit:before {
-    content: '\e959';
-}
-.icon-eye:before {
-    content: '\e95a';
-}
-.icon-fixedPrice:before {
-    content: '\e95b';
-}
-.icon-flower:before {
-    content: '\e95c';
-}
-.icon-frozen:before {
-    content: '\e95d';
-}
-.icon-fruit:before {
-    content: '\e95e';
-}
-.icon-funeral:before {
-    content: '\e95f';
-}
-.icon-grafana:before {
-    content: '\e931';
-}
-.icon-grafana:before {
-    content: '\e931';
-}
-.icon-greenery:before {
-    content: '\e91e';
-}
-.icon-greuge:before {
-    content: '\e960';
-}
-.icon-grid:before {
-    content: '\e961';
-}
-.icon-handmade:before {
-    content: '\e94a';
-}
-.icon-handmadeArtificial:before {
-    content: '\e962';
-}
-.icon-headercol:before {
-    content: '\e963';
-}
-.icon-info:before {
-    content: '\e966';
-}
-.icon-inventory:before {
-    content: '\e967';
-}
-.icon-invoice:before {
-    content: '\e969';
-}
-.icon-invoice-in:before {
-    content: '\e96a';
-}
-.icon-invoice-in-create:before {
-    content: '\e96b';
-}
-.icon-invoice-out:before {
-    content: '\e96c';
-}
-.icon-isTooLittle:before {
-    content: '\e96e';
-}
-.icon-item:before {
-    content: '\e96f';
-}
-.icon-languaje:before {
-    content: '\e912';
-}
-.icon-lines:before {
-    content: '\e971';
-}
-.icon-linesprepaired:before {
-    content: '\e972';
-}
-.icon-link-to-corrected:before {
-    content: '\e900';
-}
-.icon-link-to-correcting:before {
-    content: '\e906';
-}
-.icon-logout:before {
-    content: '\e90a';
-}
-.icon-mana:before {
-    content: '\e974';
-}
-.icon-mandatory:before {
-    content: '\e975';
-}
-.icon-net:before {
-    content: '\e976';
-}
-.icon-newalbaran:before {
-    content: '\e977';
-}
-.icon-niche:before {
-    content: '\e979';
-}
-.icon-no036:before {
-    content: '\e97a';
-}
-.icon-noPayMethod:before {
-    content: '\e97b';
-}
-.icon-notes:before {
-    content: '\e97c';
-}
-.icon-noweb:before {
-    content: '\e97e';
-}
-.icon-onlinepayment:before {
-    content: '\e97f';
-}
-.icon-package:before {
-    content: '\e980';
-}
-.icon-payment:before {
-    content: '\e982';
-}
-.icon-pbx:before {
-    content: '\e983';
-}
-.icon-pets:before {
-    content: '\e985';
-}
-.icon-photo:before {
-    content: '\e986';
-}
-.icon-plant:before {
-    content: '\e987';
-}
-.icon-polizon:before {
-    content: '\e989';
-}
-.icon-preserved:before {
-    content: '\e98a';
-}
-.icon-recovery:before {
-    content: '\e98b';
-}
-.icon-regentry:before {
-    content: '\e901';
-}
-.icon-reserva:before {
-    content: '\e902';
-}
-.icon-revision:before {
-    content: '\e903';
-}
-.icon-risk:before {
-    content: '\e904';
-}
-.icon-services:before {
-    content: '\e905';
-}
-.icon-settings:before {
-    content: '\e907';
-}
-.icon-shipment:before {
-    content: '\e908';
-}
-.icon-sign:before {
-    content: '\e909';
-}
-.icon-sms:before {
     content: '\e90b';
 }
-.icon-solclaim:before {
+.icon-apps:before {
     content: '\e90c';
 }
-.icon-solunion:before {
+.icon-artificial:before {
     content: '\e90d';
 }
-.icon-splitline:before {
+.icon-attach:before {
     content: '\e90e';
 }
-.icon-splur:before {
+.icon-barcode:before {
     content: '\e90f';
 }
-.icon-stowaway:before {
+.icon-basket:before {
     content: '\e910';
 }
-.icon-supplier:before {
+.icon-basketadd:before {
     content: '\e911';
 }
-.icon-supplierfalse:before {
+.icon-bin:before {
     content: '\e913';
 }
-.icon-tags:before {
+.icon-botanical:before {
     content: '\e914';
 }
-.icon-tax:before {
+.icon-bucket:before {
     content: '\e915';
 }
-.icon-thermometer:before {
+.icon-buscaman:before {
     content: '\e916';
 }
-.icon-ticket:before {
+.icon-buyrequest:before {
     content: '\e917';
 }
-.icon-ticketAdd:before {
+.icon-calc_volum .path1:before {
     content: '\e918';
+    color: rgb(0, 0, 0);
 }
-.icon-traceability:before {
+.icon-calc_volum .path2:before {
     content: '\e919';
+    margin-left: -1em;
+    color: rgb(0, 0, 0);
 }
-.icon-transaction:before {
+.icon-calc_volum .path3:before {
-    content: '\e93b';
-}
-.icon-transaction:before {
-    content: '\e93b';
-}
-.icon-treatments:before {
     content: '\e91c';
+    margin-left: -1em;
+    color: rgb(0, 0, 0);
 }
-.icon-trolley:before {
+.icon-calc_volum .path4:before {
-    content: '\e91a';
-}
-.icon-troncales:before {
-    content: '\e91b';
-}
-.icon-unavailable:before {
     content: '\e91d';
+    margin-left: -1em;
+    color: rgb(0, 0, 0);
 }
-.icon-volume:before {
+.icon-calc_volum .path5:before {
+    content: '\e91e';
+    margin-left: -1em;
+    color: rgb(0, 0, 0);
+}
+.icon-calc_volum .path6:before {
     content: '\e91f';
+    margin-left: -1em;
+    color: rgb(255, 255, 255);
 }
-.icon-wand:before {
+.icon-calendar:before {
     content: '\e920';
 }
-.icon-web:before {
+.icon-catalog:before {
     content: '\e921';
 }
-.icon-wiki:before {
+.icon-claims:before {
     content: '\e922';
 }
-.icon-worker:before {
+.icon-client:before {
     content: '\e923';
 }
-.icon-zone:before {
+.icon-clone:before {
     content: '\e924';
 }
+.icon-columnadd:before {
+    content: '\e925';
+}
+.icon-columndelete:before {
+    content: '\e926';
+}
+.icon-components:before {
+    content: '\e927';
+}
+.icon-consignatarios:before {
+    content: '\e928';
+}
+.icon-control:before {
+    content: '\e929';
+}
+.icon-credit:before {
+    content: '\e92b';
+}
+.icon-defaulter:before {
+    content: '\e92d';
+}
+.icon-deletedTicket:before {
+    content: '\e92e';
+}
+.icon-deleteline:before {
+    content: '\e92f';
+}
+.icon-delivery:before {
+    content: '\e930';
+}
+.icon-deliveryprices:before {
+    content: '\e932';
+}
+.icon-details:before {
+    content: '\e933';
+}
+.icon-dfiscales:before {
+    content: '\e934';
+}
+.icon-disabled:before {
+    content: '\e935';
+}
+.icon-doc:before {
+    content: '\e936';
+}
+.icon-entry:before {
+    content: '\e937';
+}
+.icon-exit:before {
+    content: '\e938';
+}
+.icon-eye:before {
+    content: '\e939';
+}
+.icon-fixedPrice:before {
+    content: '\e93a';
+}
+.icon-flower:before {
+    content: '\e93b';
+}
+.icon-frozen:before {
+    content: '\e93c';
+}
+.icon-fruit:before {
+    content: '\e93d';
+}
+.icon-funeral:before {
+    content: '\e93e';
+}
+.icon-grafana:before {
+    content: '\e906';
+}
+.icon-greenery:before {
+    content: '\e93f';
+}
+.icon-greuge:before {
+    content: '\e940';
+}
+.icon-grid:before {
+    content: '\e941';
+}
+.icon-handmade:before {
+    content: '\e942';
+}
+.icon-handmadeArtificial:before {
+    content: '\e943';
+}
+.icon-headercol:before {
+    content: '\e945';
+}
+.icon-info:before {
+    content: '\e946';
+}
+.icon-inventory:before {
+    content: '\e947';
+}
+.icon-invoice:before {
+    content: '\e968';
+    color: #5f5f5f;
+}
+.icon-invoice-in:before {
+    content: '\e949';
+}
+.icon-invoice-in-create:before {
+    content: '\e94a';
+}
+.icon-invoice-out:before {
+    content: '\e94b';
+}
+.icon-isTooLittle:before {
+    content: '\e94c';
+}
+.icon-item:before {
+    content: '\e94d';
+}
+.icon-languaje:before {
+    content: '\e970';
+}
+.icon-lines:before {
+    content: '\e94e';
+}
+.icon-linesprepaired:before {
+    content: '\e94f';
+}
+.icon-link-to-corrected:before {
+    content: '\e931';
+}
+.icon-link-to-correcting:before {
+    content: '\e944';
+}
+.icon-logout:before {
+    content: '\e973';
+}
+.icon-mana:before {
+    content: '\e950';
+}
+.icon-mandatory:before {
+    content: '\e951';
+}
+.icon-net:before {
+    content: '\e952';
+}
+.icon-newalbaran:before {
+    content: '\e954';
+}
+.icon-niche:before {
+    content: '\e955';
+}
+.icon-no036:before {
+    content: '\e956';
+}
+.icon-noPayMethod:before {
+    content: '\e958';
+}
+.icon-notes:before {
+    content: '\e959';
+}
+.icon-noweb:before {
+    content: '\e95a';
+}
+.icon-onlinepayment:before {
+    content: '\e95b';
+}
+.icon-package:before {
+    content: '\e95c';
+}
+.icon-payment:before {
+    content: '\e95d';
+}
+.icon-pbx:before {
+    content: '\e95e';
+}
+.icon-pets:before {
+    content: '\e95f';
+}
+.icon-photo:before {
+    content: '\e960';
+}
+.icon-plant:before {
+    content: '\e961';
+}
+.icon-polizon:before {
+    content: '\e962';
+}
+.icon-preserved:before {
+    content: '\e963';
+}
+.icon-recovery:before {
+    content: '\e964';
+}
+.icon-regentry:before {
+    content: '\e965';
+}
+.icon-reserva:before {
+    content: '\e966';
+}
+.icon-revision:before {
+    content: '\e967';
+}
+.icon-risk:before {
+    content: '\e969';
+}
+.icon-saysimple:before {
+    content: '\e912';
+}
+.icon-services:before {
+    content: '\e96a';
+}
+.icon-settings:before {
+    content: '\e96b';
+}
+.icon-shipment:before {
+    content: '\e96c';
+}
+.icon-sign:before {
+    content: '\e90a';
+}
+.icon-sms:before {
+    content: '\e96e';
+}
+.icon-solclaim:before {
+    content: '\e96f';
+}
+.icon-solunion:before {
+    content: '\e971';
+}
+.icon-splitline:before {
+    content: '\e972';
+}
+.icon-splur:before {
+    content: '\e974';
+}
+.icon-stowaway:before {
+    content: '\e975';
+}
+.icon-supplier:before {
+    content: '\e976';
+}
+.icon-supplierfalse:before {
+    content: '\e977';
+}
+.icon-tags:before {
+    content: '\e979';
+}
+.icon-tax:before {
+    content: '\e97a';
+}
+.icon-thermometer:before {
+    content: '\e97b';
+}
+.icon-ticket:before {
+    content: '\e97c';
+}
+.icon-ticketAdd:before {
+    content: '\e97e';
+}
+.icon-traceability:before {
+    content: '\e97f';
+}
+.icon-transaction:before {
+    content: '\e91b';
+}
+.icon-treatments:before {
+    content: '\e980';
+}
+.icon-trolley:before {
+    content: '\e900';
+}
+.icon-troncales:before {
+    content: '\e982';
+}
+.icon-unavailable:before {
+    content: '\e983';
+}
+.icon-visible_columns_Icono:before {
+    content: '\e984';
+}
+.icon-volume:before {
+    content: '\e985';
+}
+.icon-wand:before {
+    content: '\e986';
+}
+.icon-web:before {
+    content: '\e987';
+}
+.icon-wiki:before {
+    content: '\e989';
+}
+.icon-worker:before {
+    content: '\e98a';
+}
+.icon-zone:before {
+    content: '\e98b';
+}

src/css/quasar.variables.scss

@@ -32,7 +32,7 @@ $primary-light: lighten($primary, 35%);
 $dark-shadow-color: black;
 $layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
 $spacing-md: 16px;
-
+$color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }

src/i18n/locale/en.yml

@@ -24,6 +24,7 @@ globals:
     create: Create
     edit: Edit
     save: Save
+    saveAndContinue: Save and continue
     remove: Remove
     reset: Reset
     close: Close
@@ -866,7 +867,7 @@ worker:
         sex: Sexo
         seniority: Antigüedad
         fi: DNI/NIE/NIF
-        birth: Cumpleaños
+        birth: Fecha de nacimiento
         isFreelance: Autónomo
         isSsDiscounted: Bonificación SS
         hasMachineryAuthorized: Autorizado para llevar maquinaria

src/i18n/locale/es.yml

@@ -24,6 +24,7 @@ globals:
     create: Crear
     edit: Modificar
     save: Guardar
+    saveAndContinue: Guardar y continuar
     remove: Eliminar
     reset: Restaurar
     close: Cerrar

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -320,13 +320,13 @@ function exprBuilder(param, value) {
                     <QTable
                         :columns="columns"
                         :rows="rows"
-                        class="full-width q-mt-md"
+                        class="full-width"
                         row-key="clientFk"
                         selection="multiple"
                         v-model:selected="selected"
                     >
                         <template #header="props">
-                            <QTr :props="props" class="bg">
+                            <QTr :props="props" class="bg" style="min-height: 200px">
                                 <QTh>
                                     <QCheckbox v-model="props.selected" />
                                 </QTh>
@@ -372,8 +372,9 @@ function exprBuilder(param, value) {
                                                 <VnInput
                                                     type="textarea"
                                                     v-model="props.value"
-                                                    autogrow
+                                                    readonly
-                                                    :disable="true"
+                                                    dense
+                                                    rows="2"
                                                 />
                                             </div>
                                             <div v-else>{{ props.value }}</div>

src/pages/Entry/Card/EntryBuys.vue

@@ -410,7 +410,7 @@ const lockIconType = (groupingMode, mode) => {
                             <span v-if="props.row.item.subName" class="subName">
                                 {{ props.row.item.subName }}
                             </span>
-                            <fetched-tags :item="props.row.item" :max-length="5" />
+                            <FetchedTags :item="props.row.item" :max-length="5" />
                         </QTd>
                     </QTr>
                     <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->

src/pages/Entry/Card/EntrySummary.vue

@@ -338,7 +338,7 @@ const fetchEntryBuys = async () => {
                                 <span v-if="row.item.subName" class="subName">
                                     {{ row.item.subName }}
                                 </span>
-                                <fetched-tags :item="row.item" :max-length="5" />
+                                <FetchedTags :item="row.item" :max-length="5" />
                             </QTd>
                         </QTr>
                         <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->

src/pages/Entry/EntryLatestBuys.vue

@@ -707,7 +707,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-tags="{ row }">
                 <QTd>
-                    <fetched-tags :item="row" :max-length="6" />
+                    <FetchedTags :item="row" :max-length="6" />
                 </QTd>
             </template>
             <template #body-cell-entryFk="{ row }">

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -9,18 +9,21 @@ import { downloadFile } from 'src/composables/downloadFile';
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const quasar = useQuasar();
-const route = useRoute();
 const { t } = useI18n();
 
 const dms = ref({});
+const route = useRoute();
 const editDownloadDisabled = ref(false);
-const arrayData = useArrayData('InvoiceIn');
+const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
-const invoiceIn = computed(() => arrayData.store.data);
 const userConfig = ref(null);
+const invoiceId = computed(() => +route.params.id);
 
+const expenses = ref([]);
 const currencies = ref([]);
 const currenciesRef = ref();
 const companies = ref([]);
@@ -31,14 +34,11 @@ const warehouses = ref([]);
 const warehousesRef = ref();
 const allowTypesRef = ref();
 const allowedContentTypes = ref([]);
+const sageWithholdings = ref([]);
 const inputFileRef = ref();
 const editDmsRef = ref();
 const createDmsRef = ref();
 
-const requiredFieldRule = (val) => val || t('globals.requiredField');
-const dateMask = '####-##-##';
-const fillMask = '_';
-
 async function checkFileExists(dmsId) {
     if (!dmsId) return;
     try {
@@ -173,11 +173,17 @@ async function upsert() {
         @on-fetch="(data) => (userConfig = data)"
         auto-load
     />
+    <FetchData url="Expenses" auto-load @on-fetch="(data) => (expenses = data)" />
+    <FetchData
+        url="SageWithholdings"
+        auto-load
+        @on-fetch="(data) => (sageWithholdings = data)"
+    />
     <FormModel
-        v-if="invoiceIn"
+        model="InvoiceIn"
-        :url="`InvoiceIns/${route.params.id}`"
+        :go-to="`/invoice-in/${invoiceId}/vat`"
-        model="invoiceIn"
+        auto-load
-        :auto-load="true"
+        :url-update="`InvoiceIns/${invoiceId}/updateInvoiceIn`"
     >
         <template #form="{ data }">
             <VnRow>
@@ -201,7 +207,7 @@ async function upsert() {
                         </QItem>
                     </template>
                 </VnSelect>
-                <QInput
+                <VnInput
                     clearable
                     clear-icon="close"
                     :label="t('Supplier ref')"
@@ -209,75 +215,29 @@ async function upsert() {
                 />
             </VnRow>
             <VnRow>
-                <QInput
+                <VnInputDate :label="t('Expedition date')" v-model="data.issued" />
-                    :label="t('Expedition date')"
+                <VnInputDate
-                    v-model="data.issued"
-                    :mask="dateMask"
-                >
-                    <template #append>
-                        <QIcon name="event" class="cursor-pointer" :fill-mask="fillMask">
-                            <QPopupProxy
-                                cover
-                                transition-show="scale"
-                                transition-hide="scale"
-                            >
-                                <QDate v-model="data.issued">
-                                    <div class="row items-center justify-end">
-                                        <QBtn
-                                            v-close-popup
-                                            label="Close"
-                                            color="primary"
-                                            flat
-                                        />
-                                    </div>
-                                </QDate>
-                            </QPopupProxy>
-                        </QIcon>
-                    </template>
-                </QInput>
-                <QInput
                     :label="t('Operation date')"
                     v-model="data.operated"
-                    :mask="dateMask"
-                    :fill-mask="fillMask"
                     autofocus
-                >
+                />
-                    <template #append>
-                        <QIcon name="event" class="cursor-pointer">
-                            <QPopupProxy
-                                cover
-                                transition-show="scale"
-                                transition-hide="scale"
-                            >
-                                <QDate v-model="data.operated" landscape>
-                                    <div class="row items-center justify-end">
-                                        <QBtn
-                                            :label="t('globals.cancel')"
-                                            color="primary"
-                                            flat
-                                            v-close-popup
-                                        />
-                                        <QBtn
-                                            :label="t('globals.confirm')"
-                                            color="primary"
-                                            flat
-                                            v-close-popup
-                                        />
-                                    </div>
-                                </QDate>
-                            </QPopupProxy>
-                        </QIcon>
-                    </template>
-                </QInput>
             </VnRow>
             <VnRow>
-                <QInput
+                <VnSelect
                     :label="t('Undeductible VAT')"
                     v-model="data.deductibleExpenseFk"
-                    clearable
+                    :options="expenses"
-                    clear-icon="close"
+                    option-value="id"
-                />
+                    option-label="id"
-                <QInput
+                    :filter-options="['id', 'name']"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInput
                     :label="t('Document')"
                     v-model="data.dmsFk"
                     clearable
@@ -322,7 +282,7 @@ async function upsert() {
                             <QTooltip>{{ t('Create document') }}</QTooltip>
                         </QBtn>
                     </template>
-                </QInput>
+                </VnInput>
             </VnRow>
             <VnRow>
                 <QInput
@@ -398,6 +358,7 @@ async function upsert() {
                     option-value="id"
                     option-label="code"
                 />
+
                 <VnSelect
                     v-if="companiesRef"
                     :label="t('Company')"
@@ -407,7 +368,15 @@ async function upsert() {
                     option-label="code"
                 />
             </VnRow>
-            <QCheckbox :label="t('invoiceIn.summary.booked')" v-model="data.isBooked" />
+            <VnRow>
+                <VnSelect
+                    :label="t('invoiceIn.summary.sage')"
+                    v-model="data.withholdingSageFk"
+                    :options="sageWithholdings"
+                    option-value="id"
+                    option-label="withholding"
+                />
+            </VnRow>
         </template>
     </FormModel>
     <QDialog ref="editDmsRef" @keyup.enter="upsert">
@@ -423,7 +392,7 @@ async function upsert() {
             </QCardSection>
             <QCardSection class="q-py-none">
                 <QItem>
-                    <QInput
+                    <VnInput
                         class="full-width q-pa-xs"
                         :label="t('Reference')"
                         v-model="dms.reference"
@@ -432,45 +401,45 @@ async function upsert() {
                     />
                     <VnSelect
                         class="full-width q-pa-xs"
-                        :label="`${t('Company')}*`"
+                        :label="t('Company')"
                         v-model="dms.companyId"
                         :options="companies"
                         option-value="id"
                         option-label="code"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                     />
                 </QItem>
                 <QItem>
                     <VnSelect
                         class="full-width q-pa-xs"
-                        :label="`${t('Warehouse')}*`"
+                        :label="t('Warehouse')"
                         v-model="dms.warehouseId"
                         :options="warehouses"
                         option-value="id"
                         option-label="name"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                     />
                     <VnSelect
                         class="full-width q-pa-xs"
-                        :label="`${t('Type')}*`"
+                        :label="t('Type')"
                         v-model="dms.dmsTypeId"
                         :options="dmsTypes"
                         option-value="id"
                         option-label="name"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                     />
                 </QItem>
                 <QItem>
-                    <QInput
+                    <VnInput
-                        class="full-width q-pa-xs"
+                        :label="t('Description')"
+                        v-model="dms.description"
+                        :required="true"
                         type="textarea"
+                        class="full-width q-pa-xs"
                         size="lg"
                         autogrow
-                        :label="`${t('Description')}*`"
-                        v-model="dms.description"
                         clearable
                         clear-icon="close"
-                        :rules="[(val) => val.length || t('Required field')]"
                     />
                 </QItem>
                 <QItem>
@@ -534,7 +503,7 @@ async function upsert() {
             </QCardSection>
             <QCardSection class="q-pb-none">
                 <QItem>
-                    <QInput
+                    <VnInput
                         class="full-width q-pa-xs"
                         :label="t('Reference')"
                         v-model="dms.reference"
@@ -546,7 +515,7 @@ async function upsert() {
                         :options="companies"
                         option-value="id"
                         option-label="code"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                     />
                 </QItem>
                 <QItem>
@@ -557,7 +526,7 @@ async function upsert() {
                         :options="warehouses"
                         option-value="id"
                         option-label="name"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                     />
                     <VnSelect
                         class="full-width q-pa-xs"
@@ -566,11 +535,11 @@ async function upsert() {
                         :options="dmsTypes"
                         option-value="id"
                         option-label="name"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                     />
                 </QItem>
                 <QItem>
-                    <QInput
+                    <VnInput
                         class="full-width q-pa-xs"
                         type="textarea"
                         size="lg"

src/pages/InvoiceIn/Card/InvoiceInCorrective.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useCapitalize } from 'src/composables/useCapitalize';
@@ -8,12 +8,11 @@ import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const router = useRouter();
+const { push, currentRoute } = useRouter();
-const route = useRoute();
 const { t } = useI18n();
 
-const invoiceId = route.params.id;
+const invoiceId = +currentRoute.value.params.id;
-const arrayData = useArrayData('InvoiceIn');
+const arrayData = useArrayData(currentRoute.value.meta.moduleName);
 const invoiceIn = computed(() => arrayData.store.data);
 const invoiceInCorrectionRef = ref();
 const filter = {
@@ -74,7 +73,7 @@ const rowsSelected = ref([]);
 
 const requiredFieldRule = (val) => val || t('globals.requiredField');
 
-const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/summary`);
+const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`);
 </script>
 <template>
     <FetchData

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -1,12 +1,11 @@
 <script setup>
-import { ref, reactive, computed, onBeforeMount, watch } from 'vue';
+import { ref, reactive, computed, onBeforeMount } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
 import { useRole } from 'src/composables/useRole';
-import useCardDescription from 'src/composables/useCardDescription';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
@@ -17,27 +16,23 @@ 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';
 
-const $props = defineProps({
+const $props = defineProps({ id: { type: Number, default: null } });
-    id: {
+
-        type: Number,
+const { push, currentRoute } = useRouter();
-        required: false,
-        default: null,
-    },
-});
 
-const route = useRoute();
-const router = useRouter();
 const quasar = useQuasar();
 const { hasAny } = useRole();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
-const arrayData = useArrayData('InvoiceIn');
+const { store } = useArrayData(currentRoute.value.meta.moduleName);
 
-const invoiceIn = computed(() => arrayData.store.data);
+const invoiceIn = computed(() => store.data);
 const cardDescriptorRef = ref();
 const correctionDialogRef = ref();
-const entityId = computed(() => $props.id || +route.params.id);
+const entityId = computed(() => $props.id || +currentRoute.value.params.id);
 const totalAmount = ref();
 const currentAction = ref();
 const config = ref();
@@ -45,28 +40,21 @@ const cplusRectificationTypes = ref([]);
 const siiTypeInvoiceOuts = ref([]);
 const invoiceCorrectionTypes = ref([]);
 const actions = {
-    book: {
+    unbook: {
-        title: 'Are you sure you want to book this invoice?',
+        title: t('assertAction', { action: t('unbook') }),
-        cb: checkToBook,
+        action: toUnbook,
-        action: toBook,
     },
     delete: {
-        title: 'Are you sure you want to delete this invoice?',
+        title: t('assertAction', { action: t('delete') }),
         action: deleteInvoice,
     },
     clone: {
-        title: 'Are you sure you want to clone this invoice?',
+        title: t('assertAction', { action: t('clone') }),
         action: cloneInvoice,
     },
-    showPdf: {
+    showPdf: { cb: showPdfInvoice },
-        cb: showPdfInvoice,
+    sendPdf: { cb: sendPdfInvoiceConfirmation },
-    },
+    correct: { cb: () => correctionDialogRef.value.show() },
-    sendPdf: {
-        cb: sendPdfInvoiceConfirmation,
-    },
-    correct: {
-        cb: () => correctionDialogRef.value.show(),
-    },
 };
 const filter = {
     include: [
@@ -94,11 +82,7 @@ const filter = {
         },
     ],
 };
-const data = ref(useCardDescription());
+const invoiceInCorrection = reactive({ correcting: [], corrected: null });
-const invoiceInCorrection = reactive({
-    correcting: [],
-    corrected: null,
-});
 const routes = reactive({
     getSupplier: (id) => {
         return { name: 'SupplierCard', params: { id } };
@@ -139,16 +123,17 @@ const correctionFormData = reactive({
 });
 const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
 
-onBeforeMount(async () => await setInvoiceCorrection(entityId.value));
+onBeforeMount(async () => {
+    await setInvoiceCorrection(entityId.value);
+    const { data } = await axios.get(`InvoiceIns/${entityId.value}/getTotals`);
+    totalAmount.value = data.totalDueDay;
+});
 
-watch(
+onBeforeRouteLeave(async (to, from) => {
-    () => route.params.id,
+    invoiceInCorrection.correcting.length = 0;
-    async (newId) => {
+    invoiceInCorrection.corrected = null;
-        invoiceInCorrection.correcting.length = 0;
+    if (to.params.id !== from.params.id) await setInvoiceCorrection(entityId.value);
-        invoiceInCorrection.corrected = null;
+});
-        if (newId) await setInvoiceCorrection(entityId.value);
-    }
-);
 
 async function setInvoiceCorrection(id) {
     const [{ data: correctingData }, { data: correctedData }] = await Promise.all([
@@ -179,17 +164,6 @@ async function setInvoiceCorrection(id) {
     );
 }
 
-async function setData(entity) {
-    data.value = useCardDescription(entity.supplierRef, entity.id);
-    const { totalDueDay } = await getTotals();
-    totalAmount.value = totalDueDay;
-}
-
-async function getTotals() {
-    const { data } = await axios.get(`InvoiceIns/${entityId.value}/getTotals`);
-    return data;
-}
-
 function openDialog() {
     quasar.dialog({
         component: VnConfirm,
@@ -200,38 +174,17 @@ function openDialog() {
     });
 }
 
-async function checkToBook() {
+async function toUnbook() {
-    let directBooking = true;
+    const { data } = await axios.post(`InvoiceIns/${entityId.value}/toUnbook`);
+    const { isLinked, bookEntry, accountingEntries } = data;
 
-    const totals = await getTotals();
+    const type = isLinked ? 'warning' : 'positive';
-    const taxableBaseNotEqualDueDay = totals.totalDueDay != totals.totalTaxableBase;
+    const message = isLinked
-    const vatNotEqualDueDay = totals.totalDueDay != totals.totalVat;
+        ? t('isLinked', { bookEntry, accountingEntries })
+        : t('isNotLinked', { bookEntry });
 
-    if (taxableBaseNotEqualDueDay && vatNotEqualDueDay) directBooking = false;
+    quasar.notify({ type, message });
-
+    if (!isLinked) store.data.isBooked = false;
-    const { data: dueDaysCount } = await axios.get('InvoiceInDueDays/count', {
-        where: {
-            invoiceInFk: entityId.value,
-            dueDated: { gte: Date.vnNew() },
-        },
-    });
-
-    if (dueDaysCount) directBooking = false;
-
-    if (!directBooking) openDialog();
-    else toBook();
-}
-
-async function toBook() {
-    await axios.post(`InvoiceIns/${entityId.value}/toBook`);
-
-    quasar.notify({
-        type: 'positive',
-        message: t('globals.dataSaved'),
-    });
-
-    await cardDescriptorRef.value.getData();
-    setTimeout(() => location.reload(), 500);
 }
 
 async function deleteInvoice() {
@@ -240,7 +193,7 @@ async function deleteInvoice() {
         type: 'positive',
         message: t('Invoice deleted'),
     });
-    router.push({ path: '/invoice-in' });
+    push({ path: '/invoice-in' });
 }
 
 async function cloneInvoice() {
@@ -249,11 +202,9 @@ async function cloneInvoice() {
         type: 'positive',
         message: t('Invoice cloned'),
     });
-    router.push({ path: `/invoice-in/${data.id}/summary` });
+    push({ path: `/invoice-in/${data.id}/summary` });
 }
 
-const requiredFieldRule = (val) => val || t('globals.requiredField');
-
 const isAdministrative = () => hasAny(['administrative']);
 
 const isAgricultural = () =>
@@ -299,10 +250,9 @@ const createInvoiceInCorrection = async () => {
         'InvoiceIns/corrective',
         Object.assign(correctionFormData, { id: entityId.value })
     );
-    router.push({ path: `/invoice-in/${correctingId}/summary` });
+    push({ path: `/invoice-in/${correctingId}/summary` });
 };
 </script>
-
 <template>
     <FetchData
         url="InvoiceInConfigs"
@@ -329,21 +279,33 @@ const createInvoiceInCorrection = async () => {
     <CardDescriptor
         ref="cardDescriptorRef"
         module="InvoiceIn"
+        data-key="InvoiceIn"
         :url="`InvoiceIns/${entityId}`"
         :filter="filter"
-        :title="data.title"
+        title="supplierRef"
-        :subtitle="data.subtitle"
-        @on-fetch="setData"
-        data-key="invoiceInData"
     >
         <template #menu="{ entity }">
+            <InvoiceInToBook>
+                <template #content="{ book }">
+                    <QItem
+                        v-if="!entity?.isBooked && isAdministrative()"
+                        v-ripple
+                        clickable
+                        @click="book(entityId)"
+                    >
+                        <QItemSection>{{ t('To book') }}</QItemSection>
+                    </QItem>
+                </template>
+            </InvoiceInToBook>
             <QItem
-                v-if="!entity.isBooked && isAdministrative()"
+                v-if="entity?.isBooked && isAdministrative()"
                 v-ripple
                 clickable
-                @click="triggerMenu('book')"
+                @click="triggerMenu('unbook')"
             >
-                <QItemSection>{{ t('To book') }}</QItemSection>
+                <QItemSection>
+                    {{ t('To unbook') }}
+                </QItemSection>
             </QItem>
             <QItem
                 v-if="isAdministrative()"
@@ -399,13 +361,20 @@ const createInvoiceInCorrection = async () => {
         <template #body="{ entity }">
             <VnLv :label="t('invoiceIn.card.issued')" :value="toDate(entity.issued)" />
             <VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />
-            <VnLv :label="t('invoiceIn.card.amount')" :value="toCurrency(totalAmount)" />
             <VnLv
-                :label="t('invoiceIn.summary.supplier')"
+                :label="t('invoiceIn.card.amount')"
-                :value="entity.supplier?.nickname"
+                :value="toCurrency(totalAmount, entity.currency?.code)"
             />
+            <VnLv :label="t('invoiceIn.summary.supplier')">
+                <template #value>
+                    <span class="link">
+                        {{ entity?.supplier?.nickname }}
+                        <SupplierDescriptorProxy :id="entity?.supplierFk" />
+                    </span>
+                </template>
+            </VnLv>
         </template>
-        <template #actions="{ entity }">
+        <template #action="{ entity }">
             <QCardActions>
                 <QBtn
                     size="md"
@@ -478,7 +447,7 @@ const createInvoiceInCorrection = async () => {
                             :options="siiTypeInvoiceOuts"
                             option-value="id"
                             option-label="code"
-                            :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                     </QItemSection>
                     <QItemSection>
@@ -488,7 +457,7 @@ const createInvoiceInCorrection = async () => {
                             :options="cplusRectificationTypes"
                             option-value="id"
                             option-label="description"
-                            :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                         <VnSelect
                             :label="`${useCapitalize(t('globals.reason'))}*`"
@@ -496,7 +465,7 @@ const createInvoiceInCorrection = async () => {
                             :options="invoiceCorrectionTypes"
                             option-value="id"
                             option-label="description"
-                            :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                     </QItemSection>
                 </QItem>
@@ -533,11 +502,18 @@ 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
-    Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
+    To unbook: Descontabilizar
     Delete invoice: Eliminar factura
-    Are you sure you want to delete this invoice?:  Estas seguro de querer eliminar esta factura?
     Invoice deleted: Factura eliminada
     Clone invoice: Clonar factura
     Invoice cloned: Factura clonada
@@ -549,4 +525,7 @@ es:
     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/InvoiceInDueDay.vue

@@ -9,24 +9,21 @@ import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
+import { toCurrency } from 'src/filters';
 
 const route = useRoute();
 const { t } = useI18n();
-const arrayData = useArrayData('InvoiceIn');
+const arrayData = useArrayData(route.meta.moduleName);
 const invoiceIn = computed(() => arrayData.store.data);
 
 const rowsSelected = ref([]);
 const banks = ref([]);
 const invoiceInFormRef = ref();
-const invoiceId = route.params.id;
+const invoiceId = +route.params.id;
 
 const placeholder = 'yyyy/mm/dd';
 
-const filter = {
+const filter = { where: { invoiceInFk: invoiceId } };
-    where: {
-        invoiceInFk: invoiceId,
-    },
-};
 
 const columns = computed(() => [
     {
@@ -73,6 +70,7 @@ async function insert() {
     await axios.post('/InvoiceInDueDays/new', { id: +invoiceId });
     await invoiceInFormRef.value.reload();
 }
+const getTotalAmount = (rows) => rows.reduce((acc, { amount }) => acc + +amount, 0);
 </script>
 <template>
     <FetchData
@@ -184,6 +182,19 @@ async function insert() {
                         />
                     </QTd>
                 </template>
+                <template #bottom-row>
+                    <QTr class="bg">
+                        <QTd />
+                        <QTd />
+                        <QTd />
+                        <QTd>
+                            {{
+                                toCurrency(getTotalAmount(rows), invoiceIn.currency.code)
+                            }}
+                        </QTd>
+                        <QTd />
+                    </QTr>
+                </template>
                 <template #item="props">
                     <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
                         <QCard>
@@ -294,7 +305,11 @@ async function insert() {
         <QBtn color="primary" icon="add" size="lg" round @click="insert" />
     </QPageSticky>
 </template>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.bg {
+    background-color: var(--vn-light-gray);
+}
+</style>
 <i18n>
     es:
         Date: Fecha

src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue

@@ -6,26 +6,21 @@ import { toCurrency } from 'src/filters';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
-const route = useRoute();
 
+const route = useRoute();
+const currency = computed(
+    () => useArrayData(route.meta.moduleName).store.data?.currency?.code
+);
 const invoceInIntrastat = ref([]);
-const amountTotal = computed(() => getTotal('amount'));
-const netTotal = computed(() => getTotal('net'));
-const stemsTotal = computed(() => getTotal('stems'));
 const rowsSelected = ref([]);
 const countries = ref([]);
 const intrastats = ref([]);
 const invoiceInFormRef = ref();
-
+const invoiceInId = computed(() => +route.params.id);
-const filter = {
+const filter = { where: { invoiceInFk: invoiceInId.value } };
-    where: {
-        invoiceInFk: route.params.id,
-    },
-};
-
 const columns = computed(() => [
     {
         name: 'code',
@@ -77,13 +72,8 @@ const columns = computed(() => [
     },
 ]);
 
-function getTotal(type) {
+const getTotal = (data, key) =>
-    if (!invoceInIntrastat.value.length) return 0.0;
+    data.reduce((acc, cur) => acc + +String(cur[key]).replace(',', '.'), 0);
-    return invoceInIntrastat.value.reduce(
-        (total, intrastat) => total + intrastat[type],
-        0.0
-    );
-}
 </script>
 <template>
     <FetchData
@@ -99,30 +89,12 @@ function getTotal(type) {
         @on-fetch="(data) => (intrastats = data)"
     />
     <div class="invoiceIn-intrastat">
-        <QCard v-if="invoceInIntrastat.length" class="full-width q-mb-md q-pa-sm">
-            <QItem class="justify-end">
-                <div>
-                    <QItemLabel>
-                        <VnLv
-                            :label="t('Total amount')"
-                            :value="toCurrency(amountTotal)"
-                        />
-                    </QItemLabel>
-                    <QItemLabel>
-                        <VnLv :label="t('Total net')" :value="netTotal" />
-                    </QItemLabel>
-                    <QItemLabel>
-                        <VnLv :label="t('Total stems')" :value="stemsTotal" />
-                    </QItemLabel>
-                </div>
-            </QItem>
-        </QCard>
         <CrudModel
             ref="invoiceInFormRef"
             data-key="InvoiceInIntrastats"
             url="InvoiceInIntrastats"
-            auto-load
+            :auto-load="!currency"
-            :data-required="{ invoiceInFk: route.params.id }"
+            :data-required="{ invoiceInFk: invoiceInId }"
             :filter="filter"
             v-model:selected="rowsSelected"
             @on-fetch="(data) => (invoceInIntrastat = data)"
@@ -172,6 +144,22 @@ function getTotal(type) {
                             />
                         </QTd>
                     </template>
+                    <template #bottom-row>
+                        <QTr class="bg">
+                            <QTd />
+                            <QTd />
+                            <QTd>
+                                {{ toCurrency(getTotal(rows, 'amount'), currency) }}
+                            </QTd>
+                            <QTd>
+                                {{ getTotal(rows, 'net') }}
+                            </QTd>
+                            <QTd>
+                                {{ getTotal(rows, 'stems') }}
+                            </QTd>
+                            <QTd />
+                        </QTr>
+                    </template>
                     <template #item="props">
                         <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
                             <QCard>

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -3,32 +3,24 @@ import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency, toDate } from 'src/filters';
+import { useArrayData } from 'src/composables/useArrayData';
 import { getUrl } from 'src/composables/getUrl';
 import CardSummary from 'components/ui/CardSummary.vue';
 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';
 
-onMounted(async () => {
+const props = defineProps({ id: { type: [Number, String], default: 0 } });
-    salixUrl.value = await getUrl('');
-    invoiceInUrl.value = salixUrl.value + `invoiceIn/${entityId.value}/`;
-});
-
-const route = useRoute();
 const { t } = useI18n();
+const route = useRoute();
 
-const $props = defineProps({
+const entityId = computed(() => props.id || +route.params.id);
-    id: {
+const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
-        type: Number,
+const currency = computed(() => invoiceIn.value?.currency?.code);
-        default: 0,
-    },
-});
-
-const entityId = computed(() => $props.id || route.params.id);
-
-const salixUrl = ref();
 const invoiceInUrl = ref();
 const amountsNotMatch = ref(null);
-const intrastatTotals = ref({});
+const intrastatTotals = ref({ amount: 0, net: 0, stems: 0 });
 
 const vatColumns = ref([
     {
@@ -42,14 +34,16 @@ const vatColumns = ref([
         name: 'landed',
         label: 'invoiceIn.summary.taxableBase',
         field: (row) => row.taxableBase,
-        format: (value) => toCurrency(value),
+        format: (value) => toCurrency(value, currency.value),
         sortable: true,
         align: 'left',
     },
     {
         name: 'vat',
         label: 'invoiceIn.summary.sageVat',
-        field: (row) => row.taxTypeSage?.vat,
+        field: (row) => {
+            if (row.taxTypeSage) return `#${row.taxTypeSage.id} : ${row.taxTypeSage.vat}`;
+        },
         format: (value) => value,
         sortable: true,
         align: 'left',
@@ -57,7 +51,10 @@ const vatColumns = ref([
     {
         name: 'transaction',
         label: 'invoiceIn.summary.sageTransaction',
-        field: (row) => row.transactionTypeSage?.transaction,
+        field: (row) => {
+            if (row.transactionTypeSage)
+                return `#${row.transactionTypeSage.id} : ${row.transactionTypeSage?.transaction}`;
+        },
         format: (value) => value,
         sortable: true,
         align: 'left',
@@ -66,9 +63,9 @@ const vatColumns = ref([
         name: 'rate',
         label: 'invoiceIn.summary.rate',
         field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
-        format: (value) => toCurrency(value),
+        format: (value) => toCurrency(value, currency.value),
         sortable: true,
-        align: 'left',
+        align: 'center',
     },
     {
         name: 'currency',
@@ -99,7 +96,7 @@ const dueDayColumns = ref([
         name: 'amount',
         label: 'invoiceIn.summary.amount',
         field: (row) => row.amount,
-        format: (value) => toCurrency(value),
+        format: (value) => toCurrency(value, currency.value),
         sortable: true,
         align: 'left',
     },
@@ -122,13 +119,15 @@ const intrastatColumns = ref([
         },
         sortable: true,
         align: 'left',
+        style: 'width: 10px',
     },
     {
         name: 'amount',
         label: 'invoiceIn.summary.amount',
-        field: (row) => toCurrency(row.amount),
+        field: (row) => toCurrency(row.amount, currency.value),
         sortable: true,
         align: 'left',
+        style: 'width: 10px',
     },
     {
         name: 'net',
@@ -155,58 +154,55 @@ const intrastatColumns = ref([
     },
 ]);
 
-function getAmountNotMatch(totals) {
+onMounted(async () => {
-    return (
+    invoiceInUrl.value = `${await getUrl('')}invoiceIn/${entityId.value}/`;
+});
+
+const init = (data) => {
+    if (!data) return;
+
+    const { totals, invoiceInIntrastat } = data;
+    amountsNotMatch.value =
         totals.totalDueDay != totals.totalTaxableBase &&
-        totals.totalDueDay != totals.totalVat
+        totals.totalDueDay != totals.totalVat;
-    );
-}
 
-function getIntrastatTotals(intrastat) {
+    invoiceInIntrastat.forEach((val) => {
-    const totals = {
+        intrastatTotals.value.amount += val.amount;
-        amount: intrastat.reduce((acc, cur) => acc + cur.amount, 0),
+        intrastatTotals.value.net += val.net;
-        net: intrastat.reduce((acc, cur) => acc + cur.net, 0),
+        intrastatTotals.value.stems += val.stems;
-        stems: intrastat.reduce((acc, cur) => acc + cur.stems, 0),
+    });
-    };
+};
 
-    return totals;
+const taxRate = (taxableBase = 0, rate = 0) => (rate / 100) * taxableBase;
-}
 
-function getTaxTotal(tax) {
+const getTotalTax = (tax) =>
-    return tax.reduce(
+    tax.reduce((acc, cur) => acc + taxRate(cur.taxableBase, cur.taxTypeSage?.rate), 0);
-        (acc, cur) => acc + taxRate(cur.taxableBase, cur.taxTypeSage?.rate),
-        0
-    );
-}
 
-function setData(entity) {
+const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
-    if (!entity) return false;
-
-    amountsNotMatch.value = getAmountNotMatch(entity.totals);
-
-    if (entity.invoiceInIntrastat.length)
-        intrastatTotals.value = { ...getIntrastatTotals(entity.invoiceInIntrastat) };
-}
-
-function taxRate(taxableBase = 0, rate = 0) {
-    return (rate / 100) * taxableBase;
-}
-
-function getLink(param) {
-    return `#/invoice-in/${entityId.value}/${param}`;
-}
 </script>
 
 <template>
     <CardSummary
         data-key="InvoiceInSummary"
         :url="`InvoiceIns/${entityId}/summary`"
-        @on-fetch="(data) => setData(data)"
+        @on-fetch="(data) => init(data)"
     >
-        <template #header="{ entity: invoiceIn }">
+        <template #header="{ entity }">
-            <div>{{ invoiceIn.id }} - {{ invoiceIn.supplier?.name }}</div>
+            <div>{{ entity.id }} - {{ entity.supplier?.name }}</div>
         </template>
-        <template #body="{ entity: invoiceIn }">
+        <template #header-right v-if="!invoiceIn?.isBooked">
+            <InvoiceIntoBook>
+                <template #content="{ book }">
+                    <QBtn
+                        :label="t('To book')"
+                        color="orange-11"
+                        text-color="black"
+                        @click="book(entityId)"
+                    />
+                </template>
+            </InvoiceIntoBook>
+        </template>
+        <template #body="{ entity }">
             <!--Basic Data-->
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -217,19 +213,26 @@ function getLink(param) {
                 </QCardSection>
                 <VnLv
                     :label="t('invoiceIn.summary.supplier')"
-                    :value="invoiceIn.supplier?.name"
+                    :value="entity.supplier?.name"
-                />
+                >
+                    <template #value>
+                        <span class="link">
+                            {{ entity.supplier?.name }}
+                            <SupplierDescriptorProxy :id="entity.supplierFk" />
+                        </span>
+                    </template>
+                </VnLv>
                 <VnLv
                     :label="t('invoiceIn.summary.supplierRef')"
-                    :value="invoiceIn.supplierRef"
+                    :value="entity.supplierRef"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.currency')"
-                    :value="invoiceIn.currency?.code"
+                    :value="entity.currency?.code"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.docNumber')"
-                    :value="`${invoiceIn.serial}/${invoiceIn.serialNumber}`"
+                    :value="`${entity.serial}/${entity.serialNumber}`"
                 />
             </QCard>
             <QCard class="vn-one">
@@ -242,19 +245,19 @@ function getLink(param) {
                 <VnLv
                     :ellipsis-value="false"
                     :label="t('invoiceIn.summary.issued')"
-                    :value="toDate(invoiceIn.issued)"
+                    :value="toDate(entity.issued)"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.operated')"
-                    :value="toDate(invoiceIn.operated)"
+                    :value="toDate(entity.operated)"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.bookEntried')"
-                    :value="toDate(invoiceIn.bookEntried)"
+                    :value="toDate(entity.bookEntried)"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.bookedDate')"
-                    :value="toDate(invoiceIn.booked)"
+                    :value="toDate(entity.booked)"
                 />
             </QCard>
             <QCard class="vn-one">
@@ -266,20 +269,19 @@ function getLink(param) {
                 </QCardSection>
                 <VnLv
                     :label="t('invoiceIn.summary.sage')"
-                    :value="invoiceIn.sageWithholding?.withholding"
+                    :value="entity.sageWithholding?.withholding"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.vat')"
-                    :value="invoiceIn.expenseDeductible?.name"
+                    :value="entity.expenseDeductible?.name"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.company')"
-                    :value="invoiceIn.company?.code"
+                    :value="entity.company?.code"
                 />
-                <QCheckbox
+                <VnLv
                     :label="t('invoiceIn.summary.booked')"
-                    v-model="invoiceIn.isBooked"
+                    :value="invoiceIn?.isBooked"
-                    :disable="true"
                 />
             </QCard>
             <QCard class="vn-one">
@@ -290,58 +292,62 @@ function getLink(param) {
                     />
                 </QCardSection>
                 <QCardSection class="q-pa-none">
-                    <div class="bordered q-px-sm q-mx-auto">
+                    <VnLv
-                        <VnLv
+                        :label="t('invoiceIn.summary.taxableBase')"
-                            :label="t('invoiceIn.summary.taxableBase')"
+                        :value="toCurrency(entity.totals.totalTaxableBase, currency)"
-                            :value="toCurrency(invoiceIn.totals.totalTaxableBase)"
+                    />
-                        />
+                    <VnLv
-                        <VnLv
+                        label="Total"
-                            label="Total"
+                        :value="toCurrency(entity.totals.totalVat, currency)"
-                            :value="toCurrency(invoiceIn.totals.totalVat)"
+                    />
-                        />
+                    <VnLv :label="t('invoiceIn.summary.dueTotal')">
-                        <VnLv :label="t('invoiceIn.summary.dueTotal')">
+                        <template #value>
-                            <template #value>
+                            <QChip
-                                <QChip
+                                dense
-                                    dense
+                                class="q-pa-xs"
-                                    class="q-pa-xs"
+                                :color="amountsNotMatch ? 'negative' : 'transparent'"
-                                    :color="amountsNotMatch ? 'negative' : 'transparent'"
+                                :title="
-                                    :title="
+                                    amountsNotMatch
-                                        amountsNotMatch
+                                        ? t('invoiceIn.summary.noMatch')
-                                            ? t('invoiceIn.summary.noMatch')
+                                        : t('invoiceIn.summary.dueTotal')
-                                            : t('invoiceIn.summary.dueTotal')
+                                "
-                                    "
+                            >
-                                >
+                                {{ toCurrency(entity.totals.totalDueDay, currency) }}
-                                    {{ toCurrency(invoiceIn.totals.totalDueDay) }}
+                            </QChip>
-                                </QChip>
+                        </template>
-                            </template>
+                    </VnLv>
-                        </VnLv>
-                    </div>
                 </QCardSection>
             </QCard>
             <!--Vat-->
-            <QCard v-if="invoiceIn.invoiceInTax.length">
+            <QCard v-if="entity.invoiceInTax.length" class="vat">
                 <VnTitle :url="getLink('vat')" :text="t('invoiceIn.card.vat')" />
                 <QTable
                     :columns="vatColumns"
-                    :rows="invoiceIn.invoiceInTax"
+                    :rows="entity.invoiceInTax"
                     flat
                     hide-pagination
                 >
-                    <template #header="props">
+                    <template #header="vatProps">
-                        <QTr :props="props" class="bg">
+                        <QTr :props="vatProps" class="bg">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                            <QTh
+                                v-for="col in vatProps.cols"
+                                :key="col.name"
+                                :props="vatProps"
+                            >
                                 {{ t(col.label) }}
                             </QTh>
                         </QTr>
                     </template>
                     <template #bottom-row>
                         <QTr class="bg">
-                            <QTd></QTd>
-                            <QTd>{{ toCurrency(invoiceIn.totals.totalTaxableBase) }}</QTd>
-                            <QTd></QTd>
                             <QTd></QTd>
                             <QTd>{{
-                                toCurrency(getTaxTotal(invoiceIn.invoiceInTax))
+                                toCurrency(entity.totals.totalTaxableBase, currency)
+                            }}</QTd>
+                            <QTd></QTd>
+                            <QTd></QTd>
+                            <QTd class="text-center">{{
+                                toCurrency(getTotalTax(entity.invoiceInTax, currency))
                             }}</QTd>
                             <QTd></QTd>
                         </QTr>
@@ -349,17 +355,17 @@ function getLink(param) {
                 </QTable>
             </QCard>
             <!--Due Day-->
-            <QCard v-if="invoiceIn.invoiceInDueDay.length">
+            <QCard v-if="entity.invoiceInDueDay.length" class="due-day">
                 <VnTitle :url="getLink('due-day')" :text="t('invoiceIn.card.dueDay')" />
-                <QTable
+                <QTable :columns="dueDayColumns" :rows="entity.invoiceInDueDay" flat>
-                    class="full-width"
+                    <template #header="dueDayProps">
-                    :columns="dueDayColumns"
+                        <QTr :props="dueDayProps" class="bg">
-                    :rows="invoiceIn.invoiceInDueDay"
+                            <QTh
-                    flat
+                                table-header-style="max-width:50%"
-                >
+                                v-for="col in dueDayProps.cols"
-                    <template #header="props">
+                                :key="col.name"
-                        <QTr :props="props" class="bg">
+                                :props="dueDayProps"
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                            >
                                 {{ t(col.label) }}
                             </QTh>
                         </QTr>
@@ -368,26 +374,32 @@ function getLink(param) {
                         <QTr class="bg">
                             <QTd></QTd>
                             <QTd></QTd>
-                            <QTd>{{ toCurrency(invoiceIn.totals.totalDueDay) }}</QTd>
+                            <QTd>
+                                {{ toCurrency(entity.totals.totalDueDay, currency) }}
+                            </QTd>
                             <QTd></QTd>
                         </QTr>
                     </template>
                 </QTable>
             </QCard>
             <!--Intrastat-->
-            <QCard v-if="invoiceIn.invoiceInIntrastat.length">
+            <QCard v-if="entity.invoiceInIntrastat.length">
                 <VnTitle
                     :url="getLink('intrastat')"
                     :text="t('invoiceIn.card.intrastat')"
                 />
                 <QTable
                     :columns="intrastatColumns"
-                    :rows="invoiceIn.invoiceInIntrastat"
+                    :rows="entity.invoiceInIntrastat"
                     flat
                 >
-                    <template #header="props">
+                    <template #header="intrastatProps">
-                        <QTr :props="props" class="bg">
+                        <QTr :props="intrastatProps" class="bg">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                            <QTh
+                                v-for="col in intrastatProps.cols"
+                                :key="col.name"
+                                :props="intrastatProps"
+                            >
                                 {{ t(col.label) }}
                             </QTh>
                         </QTr>
@@ -395,7 +407,7 @@ function getLink(param) {
                     <template #bottom-row>
                         <QTr class="bg">
                             <QTd></QTd>
-                            <QTd>{{ toCurrency(intrastatTotals.amount) }}</QTd>
+                            <QTd>{{ toCurrency(intrastatTotals.amount, currency) }}</QTd>
                             <QTd>{{ intrastatTotals.net }}</QTd>
                             <QTd>{{ intrastatTotals.stems }}</QTd>
                             <QTd></QTd>
@@ -410,13 +422,28 @@ function getLink(param) {
 .bg {
     background-color: var(--vn-accent-color);
 }
-.bordered {
+@media (min-width: $breakpoint-md) {
-    border: 1px solid var(--vn-text-color);
+    .summaryBody {
-    max-width: 18em;
+        .vat {
+            flex: 65%;
+        }
+
+        .due-day {
+            flex: 30%;
+        }
+        .vat,
+        .due-day {
+            .q-table th {
+                padding-right: 0;
+            }
+        }
+    }
 }
 </style>
 <i18n>
     es:
         Search invoice: Buscar factura recibida
         You can search by invoice reference: Puedes buscar por referencia de la factura
+        Totals: Totales
+        To book: Contabilizar
 </i18n>

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -11,13 +11,14 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'src/components/CrudModel.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
-const route = useRoute();
+const router = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
 
-const arrayData = useArrayData('InvoiceIn');
+const arrayData = useArrayData(router.meta.moduleName);
 const invoiceIn = computed(() => arrayData.store.data);
-
+const invoiceId = +router.params.id;
+const currency = computed(() => invoiceIn.value?.currency?.code);
 const expenses = ref([]);
 const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
@@ -55,7 +56,7 @@ const columns = computed(() => [
     {
         name: 'taxablebase',
         label: t('Taxable base'),
-        field: (row) => toCurrency(row.taxableBase),
+        field: (row) => toCurrency(row.taxableBase, currency.value),
         model: 'taxableBase',
         sortable: true,
         tabIndex: 2,
@@ -68,7 +69,7 @@ const columns = computed(() => [
         options: sageTaxTypes.value,
         model: 'taxTypeSageFk',
         optionValue: 'id',
-        optionLabel: 'vat',
+        optionLabel: 'id',
         sortable: true,
         tabindex: 3,
         align: 'left',
@@ -80,7 +81,7 @@ const columns = computed(() => [
         options: sageTransactionTypes.value,
         model: 'transactionTypeSageFk',
         optionValue: 'id',
-        optionLabel: 'transaction',
+        optionLabel: 'id',
         sortable: true,
         tabIndex: 4,
         align: 'left',
@@ -90,7 +91,7 @@ const columns = computed(() => [
         label: t('Rate'),
         sortable: true,
         tabIndex: 5,
-        field: (row) => toCurrency(taxRate(row, row.taxTypeSageFk)),
+        field: (row) => toCurrency(taxRate(row, row.taxTypeSageFk), currency.value),
         align: 'left',
     },
     {
@@ -114,7 +115,7 @@ const filter = {
         'transactionTypeSageFk',
     ],
     where: {
-        invoiceInFk: route.params.id,
+        invoiceInFk: invoiceId,
     },
 };
 
@@ -161,6 +162,9 @@ async function addExpense() {
         });
     }
 }
+const getTotalTaxableBase = (rows) =>
+    rows.reduce((acc, { taxableBase }) => acc + +taxableBase, 0);
+const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0);
 </script>
 <template>
     <FetchData
@@ -181,9 +185,10 @@ async function addExpense() {
         data-key="InvoiceInTaxes"
         url="InvoiceInTaxes"
         :filter="filter"
-        :data-required="{ invoiceInFk: route.params.id }"
+        :data-required="{ invoiceInFk: invoiceId }"
         auto-load
         v-model:selected="rowsSelected"
+        :go-to="`/invoice-in/${invoiceId}/due-day`"
     >
         <template #body="{ rows }">
             <QTable
@@ -191,7 +196,7 @@ async function addExpense() {
                 selection="multiple"
                 :columns="columns"
                 :rows="rows"
-                row-key="$index"                
+                row-key="$index"
                 :grid="$q.screen.lt.sm"
             >
                 <template #body-cell-expense="{ row, col }">
@@ -303,6 +308,19 @@ async function addExpense() {
                         />
                     </QTd>
                 </template>
+                <template #bottom-row>
+                    <QTr class="bg">
+                        <QTd />
+                        <QTd />
+                        <QTd>
+                            {{ toCurrency(getTotalTaxableBase(rows), currency) }}
+                        </QTd>
+                        <QTd />
+                        <QTd />
+                        <QTd> {{ toCurrency(getTotalRate(rows), currency) }}</QTd>
+                        <QTd />
+                    </QTr>
+                </template>
                 <template #item="props">
                     <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
                         <QCard bordered flat class="q-my-xs">
@@ -391,7 +409,7 @@ async function addExpense() {
                                     </VnSelect>
                                 </QItem>
                                 <QItem>
-                                    {{ toCurrency(taxRate(props.row)) }}
+                                    {{ toCurrency(taxRate(props.row), currency) }}
                                 </QItem>
                                 <QItem>
                                     <QInput
@@ -458,6 +476,10 @@ async function addExpense() {
     </QPageSticky>
 </template>
 <style lang="scss" scoped>
+.bg {
+    background-color: var(--vn-light-gray);
+}
+
 @media (max-width: $breakpoint-xs) {
     .q-dialog {
         .q-card {

src/pages/InvoiceIn/InvoiceInCreate.vue

@@ -0,0 +1,124 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { useState } from 'src/composables/useState';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const state = useState();
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const stateStore = useStateStore();
+
+const user = state.getUser();
+const newInvoiceIn = reactive({
+    supplierFk: +route.query?.supplierFk || null,
+    supplierRef: null,
+    companyFk: user.value.companyFk || null,
+    issued: Date.vnNew(),
+});
+const suppliersOptions = ref([]);
+const companiesOptions = ref([]);
+
+const redirectToInvoiceInBasicData = ({ id }) => {
+    router.push({ name: 'InvoiceInBasicData', params: { id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="Suppliers"
+        :filter="{ fields: ['id', 'nickname'] }"
+        order="nickname"
+        @on-fetch="(data) => (suppliersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="companiesRef"
+        url="Companies"
+        :filter="{ fields: ['id', 'code'] }"
+        order="code"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                custom-route-redirect-name="InvoiceInSummary"
+                data-key="InvoiceInSummary"
+            />
+        </Teleport>
+    </template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            url-create="InvoiceIns"
+            model="InvoiceIn"
+            :form-initial-data="newInvoiceIn"
+            @on-data-saved="redirectToInvoiceInBasicData"
+        >
+            <template #form="{ data, validate }">
+                <VnRow>
+                    <VnSelect
+                        :label="t('Supplier')"
+                        v-model="data.supplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :required="true"
+                        :rules="validate('entry.supplierFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnInput
+                        :label="t('invoiceIn.summary.supplierRef')"
+                        v-model="data.supplierRef"
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnSelect
+                        :label="t('Company')"
+                        v-model="data.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        map-options
+                        hide-selected
+                        :required="true"
+                        :rules="validate('invoiceIn.companyFk')"
+                    />
+                    <VnInputDate
+                        :label="t('invoiceIn.summary.issued')"
+                        v-model="data.issued"
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+    es:
+        Supplier: Proveedor
+        Travel: Envío
+        Company: Empresa
+</i18n>

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -4,33 +4,17 @@ import { useI18n } from 'vue-i18n';
 
 import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+defineProps({ dataKey: { type: String, required: true } });
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
 const suppliers = ref([]);
-const suppliersRef = ref();
 </script>
 
 <template>
-    <FetchData
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
-        ref="suppliersRef"
-        url="Suppliers"
-        :filter="{ fields: ['id', 'nickname'] }"
-        order="nickname"
-        limit="30"
-        @on-fetch="(data) => (suppliers = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -38,22 +22,6 @@ const suppliersRef = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('params.supplierFk')"
-                        v-model="params.supplierFk"
-                        :options="suppliers"
-                        option-value="id"
-                        option-label="nickname"
-                        @input-value="suppliersRef.fetch()"
-                        dense
-                        outlined
-                        rounded
-                    >
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -68,21 +36,11 @@ const suppliersRef = ref();
                     </VnInput>
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate :label="t('From')" v-model="params.from" is-outlined />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
-                        :label="t('params.serial')"
+                        :label="t('params.fi')"
-                        v-model="params.serial"
+                        v-model="params.fi"
                         is-outlined
                         lazy-rules
                     >
@@ -92,11 +50,61 @@ const suppliersRef = ref();
                     </VnInput>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.supplierFk"
+                        url="Suppliers"
+                        :fields="['id', 'nickname']"
+                        :label="t('params.supplierFk')"
+                        option-value="id"
+                        option-label="nickname"
+                        :options="suppliers"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.account')"
+                        v-model="params.account"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="person" size="sm" />
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnCurrency v-model="params.amount" is-outlined />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate :label="t('From')" v-model="params.from" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('Issued')"
+                        v-model="params.issued"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem class="q-mb-md">
                 <QItemSection>
                     <QCheckbox
@@ -111,8 +119,8 @@ const suppliersRef = ref();
                 <QItem>
                     <QItemSection>
                         <VnInput
-                            :label="t('params.fi')"
+                            :label="t('params.serialNumber')"
-                            v-model="params.fi"
+                            v-model="params.serialNumber"
                             is-outlined
                             lazy-rules
                         >
@@ -125,8 +133,8 @@ const suppliersRef = ref();
                 <QItem>
                     <QItemSection>
                         <VnInput
-                            :label="t('params.serialNumber')"
+                            :label="t('params.serial')"
-                            v-model="params.serialNumber"
+                            v-model="params.serial"
                             is-outlined
                             lazy-rules
                         >
@@ -150,29 +158,6 @@ const suppliersRef = ref();
                         </VnInput>
                     </QItemSection>
                 </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('params.account')"
-                            v-model="params.account"
-                            is-outlined
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="person" size="sm" />
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('Issued')"
-                            v-model="params.issued"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
             </QExpansionItem>
         </template>
     </VnFilterPanel>

src/pages/InvoiceIn/InvoiceInList.vue

@@ -13,6 +13,7 @@ import InvoiceInFilter from './InvoiceInFilter.vue';
 import { getUrl } from 'src/composables/getUrl';
 import InvoiceInSummary from './Card/InvoiceInSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -85,7 +86,15 @@ function navigate(id) {
                             <VnLv
                                 :label="t('invoiceIn.list.supplier')"
                                 :value="row.supplierName"
-                            />
+                                @click.stop
+                            >
+                                <template #value>
+                                    <span class="link">
+                                        {{ row.supplierName }}
+                                        <SupplierDescriptorProxy :id="row.supplierFk" />
+                                    </span>
+                                </template>
+                            </VnLv>
                             <VnLv
                                 :label="t('invoiceIn.list.serialNumber')"
                                 :value="row.serialNumber"
@@ -137,13 +146,7 @@ function navigate(id) {
         </div>
     </QPage>
     <QPageSticky position="bottom-right" :offset="[20, 20]">
-        <QBtn
+        <QBtn color="primary" icon="add" size="lg" round :href="`/#/invoice-in/create`" />
-            color="primary"
-            icon="add"
-            size="lg"
-            round
-            :href="`${url}invoice-in/create`"
-        />
     </QPageSticky>
 </template>
 

src/pages/InvoiceIn/InvoiceInToBook.vue

@@ -0,0 +1,63 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import axios from 'axios';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+const { notify, dialog } = useQuasar();
+const { t } = useI18n();
+
+defineExpose({ checkToBook });
+
+const { store } = useArrayData(useRoute().meta.moduleName);
+
+async function checkToBook(id) {
+    let directBooking = true;
+
+    const { data: totals } = await axios.get(`InvoiceIns/${id}/getTotals`);
+    const taxableBaseNotEqualDueDay = totals.totalDueDay != totals.totalTaxableBase;
+    const vatNotEqualDueDay = totals.totalDueDay != totals.totalVat;
+
+    if (taxableBaseNotEqualDueDay && vatNotEqualDueDay) directBooking = false;
+
+    const { data: dueDaysCount } = await axios.get('InvoiceInDueDays/count', {
+        where: {
+            invoiceInFk: id,
+            dueDated: { gte: Date.vnNew() },
+        },
+    });
+
+    if (dueDaysCount) directBooking = false;
+
+    if (directBooking) return toBook(id);
+
+    dialog({
+        component: VnConfirm,
+        componentProps: { title: t('Are you sure you want to book this invoice?') },
+    }).onOk(async () => await toBook(id));
+}
+
+async function toBook(id) {
+    let type = 'positive';
+    let message = t('globals.dataSaved');
+
+    try {
+        await axios.post(`InvoiceIns/${id}/toBook`);
+        store.data.isBooked = true;
+    } catch (e) {
+        type = 'negative';
+        message = t('It was not able to book the invoice');
+    } finally {
+        notify({ type, message });
+    }
+}
+</script>
+<template>
+    <slot name="content" :book="checkToBook" />
+</template>
+<i18n>
+es:
+    Are you sure you want to book this invoice?: ¿Estás seguro de querer asentar esta factura?
+    It was not able to book the invoice: No se pudo contabilizar la factura
+</i18n>

src/pages/Item/ItemFixedPrice.vue

@@ -459,7 +459,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         {{ row.name }}
                     </span>
                     <ItemDescriptorProxy :id="row.itemFk" />
-                    <fetched-tags :item="row" :max-length="6" />
+                    <FetchedTags :item="row" :max-length="6" />
                 </QTd>
             </template>
             <template #body-cell-groupingPrice="props">

src/pages/Item/ItemList.vue

@@ -521,7 +521,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     <template #body-cell-description="{ row }">
                         <QTd class="col">
                             <span>{{ row.name }} {{ row.subName }}</span>
-                            <fetched-tags :item="row" :max-length="6" />
+                            <FetchedTags :item="row" :max-length="6" />
                         </QTd>
                     </template>
                     <template #body-cell-isActive="{ row }">

src/pages/Item/locale/en.yml

@@ -81,3 +81,10 @@ itemTags:
 searchbar:
     label: Search item
     info: Search by item id
+itemType:
+    shared:
+        code: Code
+        name: Name
+        worker: Worker
+        category: Category
+        temperature: Temperature

src/pages/Item/locale/es.yml

@@ -81,3 +81,10 @@ itemTags:
 searchbar:
     label: Buscar artículo
     info: Buscar por id de artículo
+itemType:
+    shared:
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        category: Reino
+        temperature: Temperatura

src/pages/Order/Card/OrderSummary.vue

@@ -176,10 +176,7 @@ const detailsColumns = ref([
                                             {{ props.row.item.subName }}
                                         </span>
                                     </div>
-                                    <fetched-tags
+                                    <FetchedTags :item="props.row.item" :max-length="5" />
-                                        :item="props.row.item"
-                                        :max-length="5"
-                                    />
                                 </QTd>
                                 <QTd key="quantity" :props="props">
                                     {{ props.row.quantity }}

src/pages/Order/OrderLines.vue

@@ -160,7 +160,7 @@ async function confirmOrder() {
                                     <span class="text-uppercase subname">
                                         {{ row.item.subName }}
                                     </span>
-                                    <fetched-tags :item="row.item" :max-length="5" />
+                                    <FetchedTags :item="row.item" :max-length="5" />
                                 </div>
                                 <VnLv :label="t('item')" :value="String(row.item.id)" />
                                 <VnLv

src/pages/Order/OrderVolume.vue

@@ -77,7 +77,7 @@ const loadVolumes = async (rows) => {
                         >
                             <template #list-items>
                                 <div class="q-mb-sm">
-                                    <fetched-tags :item="row.item" :max-length="5" />
+                                    <FetchedTags :item="row.item" :max-length="5" />
                                 </div>
                                 <VnLv :label="t('item')" :value="row.item.id" />
                                 <VnLv :label="t('subName')">

src/pages/Route/RouteList.vue

@@ -12,6 +12,7 @@ import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import axios from 'axios';
 import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -19,6 +20,7 @@ import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import { useQuasar } from 'quasar';
+import { useArrayData } from 'composables/useArrayData';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -26,10 +28,7 @@ const { validate } = useValidator();
 const quasar = useQuasar();
 const session = useSession();
 const { viewSummary } = useSummaryDialog();
-
+const visibleColumns = ref([]);
-onMounted(() => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));
-
 const selectedRows = ref([]);
 const columns = computed(() => [
     {
@@ -83,14 +82,14 @@ const columns = computed(() => [
     },
     {
         name: 'started',
-        label: t('Hour started'),
+        label: t('hourStarted'),
         field: (row) => toHour(row.started),
         sortable: true,
         align: 'left',
     },
     {
         name: 'finished',
-        label: t('Hour finished'),
+        label: t('hourFinished'),
         field: (row) => toHour(row.finished),
         sortable: true,
         align: 'left',
@@ -109,7 +108,10 @@ const columns = computed(() => [
         align: 'right',
     },
 ]);
-
+const arrayData = useArrayData('EntryLatestBuys', {
+    url: 'Buys/latestBuysFilter',
+    order: ['itemFk DESC'],
+});
 const refreshKey = ref(0);
 const workers = ref([]);
 const agencyList = ref([]);
@@ -121,7 +123,7 @@ const updateRoute = async (route) => {
         return err;
     }
 };
-
+const allColumnNames = ref([]);
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
 
@@ -174,6 +176,13 @@ const openTicketsDialog = (id) => {
         })
         .onOk(() => refreshKey.value++);
 };
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    allColumnNames.value = columns.value.map((col) => col.name);
+    await arrayData.fetch({ append: false });
+});
+onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
@@ -231,7 +240,16 @@ const openTicketsDialog = (id) => {
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
     <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
     <QPage class="column items-center">
-        <VnSubToolbar class="justify-end">
+        <VnSubToolbar>
+            <template #st-data>
+                <TableVisibleColumns
+                    class="LeftIcon"
+                    :all-columns="allColumnNames"
+                    table-code="routesList"
+                    labels-traductions-path="globals"
+                    @on-config-saved="visibleColumns = [...$event]"
+                />
+            </template>
             <template #st-actions>
                 <QBtn
                     icon="vn:clone"
@@ -267,7 +285,7 @@ const openTicketsDialog = (id) => {
                 :key="refreshKey"
                 data-key="RouteList"
                 url="Routes/filter"
-                :order="['created DESC', 'id DESC']"
+                :order="['created ASC', 'started ASC', 'id ASC']"
                 :limit="20"
                 auto-load
             >
@@ -281,9 +299,10 @@ const openTicketsDialog = (id) => {
                             row-key="id"
                             selection="multiple"
                             :rows-per-page-options="[0]"
+                            :visible-columns="visibleColumns"
                             hide-pagination
-                            :pagination="{ sortBy: 'ID', descending: true }"
                             :no-data-label="t('globals.noResults')"
+                            style="max-height: 82vh"
                         >
                             <template #body-cell-worker="{ row }">
                                 <QTd class="table-input-cell">
@@ -336,7 +355,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-vehicle="{ row }">
-                                <QTd class="table-input-cell">
+                                <QTd class="table-input-cell small-column">
                                     <VnSelect
                                         :label="t('Vehicle')"
                                         v-model="row.vehicleFk"
@@ -353,7 +372,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-date="{ row }">
-                                <QTd class="table-input-cell">
+                                <QTd class="table-input-cell small-column">
                                     <VnInputDate
                                         v-model="row.created"
                                         hide-bottom-space
@@ -378,10 +397,10 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-started="{ row }">
-                                <QTd class="table-input-cell">
+                                <QTd class="table-input-cell small-column">
                                     <VnInputTime
                                         v-model="row.started"
-                                        :label="t('Hour started')"
+                                        :label="t('hourStarted')"
                                         :rules="validate('route.started')"
                                         :is-clearable="false"
                                         hide-bottom-space
@@ -391,11 +410,11 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-finished="{ row }">
-                                <QTd class="table-input-cell">
+                                <QTd class="table-input-cell small-column">
                                     <VnInputTime
                                         v-model="row.finished"
                                         autofocus
-                                        :label="t('Hour finished')"
+                                        :label="t('hourFinished')"
                                         :rules="validate('route.finished')"
                                         :is-clearable="false"
                                         hide-bottom-space
@@ -405,7 +424,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-isServed="props">
-                                <QTd>
+                                <QTd class="table-input-cell small-column">
                                     <QCheckbox v-model="props.value" disable>
                                         <QTooltip>
                                             {{
@@ -486,15 +505,18 @@ const openTicketsDialog = (id) => {
 .table-actions {
     gap: 12px;
 }
-
+th:last-child,
-.lock-icon-cell {
+td:last-child {
-    text-align: center;
+    background-color: var(--vn-section-color);
-    margin-left: -20%;
+    position: sticky;
+    right: 0;
 }
 </style>
 <i18n>
 en:
     newRoute: New Route
+    hourStarted: Started hour
+    hourFinished: Finished hour
 es:
     ID: ID
     Worker: Trabajador

src/pages/Route/RouteMain.vue

@@ -1,8 +1,10 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'src/components/LeftMenu.vue';
+import { onMounted } from 'vue';
 
 const stateStore = useStateStore();
+onMounted(() => (stateStore.leftDrawer = false));
 </script>
 
 <template>

src/pages/Supplier/Card/SupplierConsumption.vue

@@ -204,7 +204,7 @@ onMounted(async () => {
 
                     <QTd no-hover>
                         <span>{{ buy.subName }}</span>
-                        <fetched-tags :item="buy" :max-length="5" />
+                        <FetchedTags :item="buy" :max-length="5" />
                     </QTd>
                     <QTd no-hover> {{ dashIfEmpty(buy.quantity) }}</QTd>
                     <QTd no-hover> {{ dashIfEmpty(buy.price) }}</QTd>

src/pages/Supplier/Card/SupplierDescriptor.vue

@@ -183,7 +183,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('Go to client') }}</QTooltip>
                 </QBtn>
                 <QBtn
-                    :href="`${url}invoice-in/create?supplierFk=${entity.id}`"
+                    :href="`#/invoice-in/create?supplierFk=${entity.id}`"
                     size="md"
                     icon="vn:invoice-in-create"
                     color="primary"

src/pages/Worker/Card/WorkerBasicData.vue

@@ -201,6 +201,6 @@ es:
     isDisable: Trabajador desactivado
     fi: DNI/NIE/NIF
     sex: Sexo
-    birth: Cumpleaños
+    birth: Fecha de Nacimiento
     isSsDiscounted: Bonificación SS
 </i18n>

src/pages/Worker/Card/WorkerCalendar.vue

@@ -82,6 +82,7 @@ const onFetchAbsences = (data) => {
                 type: type.code,
                 absenceId: absence.id,
                 isFestive: false,
+                isHoliday: false,
             });
         });
     }

src/pages/Worker/Card/WorkerCalendarItem.vue

@@ -126,7 +126,7 @@ const handleEventSelected = (event, { year, month, day }) => {
     }
 
     const date = new Date(year, month - 1, day);
-    if (!event.absenceId) createEvent(date);
+    if (!event?.absenceId) createEvent(date);
     else if (event.type == props.absenceType.code) deleteEvent(event, date);
     else editEvent(event);
 };
@@ -136,24 +136,31 @@ const getEventByTimestamp = ({ year, month, day }) => {
     return props.events[stamp] || null;
 };
 
+const isFestive = (timestamp) => {
+    const event = getEventByTimestamp(timestamp);
+    if (!event) return false;
+
+    const { isFestive } = event;
+    return isFestive;
+};
 const getEventAttrs = (timestamp) => {
     const event = getEventByTimestamp(timestamp);
     if (!event) return {};
 
-    const { name, color, isFestive } = event;
+    const { name, color, isFestive, type } = event;
 
     // Atributos a asignar a cada slot que representa un evento en el calendario
 
     const attrs = {
         title: name,
-        style: color ? `background-color: ${color};` : '',
+        style: color ? `background-color: ${color};` : ``,
         label: timestamp.day,
     };
 
     if (isFestive) {
         attrs.class = '--festive';
-        attrs.label = event.absenceId ? timestamp.day : '';
+        attrs.label = event.absenceId ?? timestamp.day;
-    }
+    } else attrs.class = `--${type}`;
 
     return attrs;
 };
@@ -162,7 +169,6 @@ const isToday = (timestamp) => {
     const { year, month, day } = timestamp;
     return todayTimestamp.value === new Date(year, month - 1, day).getTime();
 };
-
 onBeforeMount(() => {
     updateSelectedDate(_year.value);
 });
@@ -203,7 +209,6 @@ watch(_year, (newValue) => {
                 <template #day="{ scope: { timestamp } }">
                     <!-- Este slot representa cada día del calendario y muestra un botón representando el correspondiente evento -->
                     <QBtn
-                        v-if="getEventByTimestamp(timestamp)"
                         v-bind="{ ...getEventAttrs(timestamp) }"
                         @click="
                             handleEventSelected(getEventByTimestamp(timestamp), timestamp)
@@ -223,6 +228,11 @@ watch(_year, (newValue) => {
 </template>
 
 <style lang="scss">
+.q-calendar-month__day:has(.q-calendar-month__day--content):has(.q-btn.--festive)
+    .q-calendar-month__day--label__wrapper
+    button {
+    color: transparent;
+}
 .calendar-event {
     display: flex;
     justify-content: center;
@@ -231,14 +241,19 @@ watch(_year, (newValue) => {
     font-size: 13px;
     line-height: 1.715em;
     cursor: pointer;
-    color: white;
 
     &.--today {
         border: 2px solid $info;
     }
 
     &.--festive {
-        border: 2px solid $negative;
+        color: $negative;
+    }
+
+    &.--holiday {
+        & > span:nth-child(2) .block {
+            color: white;
+        }
     }
 
     &:hover {

src/pages/Worker/Card/WorkerLocker.vue

@@ -27,7 +27,7 @@ const save = async (data) => {
     const lockerId = data.id ?? originaLockerId.value;
     const workerFk = lockerId == originaLockerId.value ? null : entityId.value;
 
-    await axios.patch(`Lockers/${lockerId}`, { workerFk });
+    return axios.patch(`Lockers/${lockerId}`, { workerFk });
 };
 
 const init = async (data) => {

src/pages/Worker/Card/WorkerPda.vue

@@ -71,66 +71,47 @@ function reloadData() {
                     bordered
                     :key="row.id"
                     v-for="row of rows"
-                    class="card q-pt-xs q-mb-sm"
+                    class="card q-px-md q-mb-sm container"
                 >
-                    <QItem>
+                    <VnRow>
-                        <QItemSection side-left>
+                        <VnInput
-                            <VnRow>
+                            :label="t('worker.pda.currentPDA')"
-                                <QField
+                            :model-value="row?.deviceProductionFk"
-                                    :label="t('worker.pda.currentPDA')"
+                            disable
-                                    :model-value="row?.deviceProductionFk"
+                        />
-                                    disable
+                        <VnInput
-                                >
+                            :label="t('Model')"
-                                    <template #control>
+                            :model-value="row?.deviceProduction?.modelFk"
-                                        <div tabindex="0" style="padding: none">
+                            disable
-                                            <span>Id: </span>
+                        />
-                                            <span>
+                        <VnInput
-                                                {{ row?.deviceProductionFk }}&nbsp;
+                            :label="t('Serial number')"
-                                            </span>
+                            :model-value="row?.deviceProduction?.serialNumber"
-                                            <span>{{ t('Model') }}: </span>
+                            disable
-                                            <span>
+                        />
-                                                {{ row?.deviceProduction?.modelFk }}&nbsp;
+                        <VnInput
-                                            </span>
+                            :label="t('Current SIM')"
-                                            <span>{{ t('SIM serial number') }}: </span>
+                            :model-value="row?.simSerialNumber"
-                                            <span>
+                            disable
-                                                {{
+                        />
-                                                    row?.deviceProduction?.serialNumber
+                        <QBtn
-                                                }}&nbsp;
+                            flat
-                                            </span>
+                            icon="delete"
-                                        </div>
+                            color="primary"
-                                    </template>
+                            class="btn-delete"
-                                </QField>
+                            @click="
-                                <QField
+                                openConfirmationModal(
-                                    :label="t('Current SIM')"
+                                    t(`Remove PDA`),
-                                    :model-value="row?.simSerialNumber"
+                                    t('Do you want to remove this PDA?'),
-                                    disable
+                                    () => deallocatePDA(row.deviceProductionFk)
-                                >
+                                )
-                                    <template #control>
+                            "
-                                        <div tabindex="0">{{ row?.simSerialNumber }}</div>
+                        >
-                                    </template>
+                            <QTooltip>
-                                </QField>
+                                {{ t('worker.pda.removePDA') }}
-                            </VnRow>
+                            </QTooltip>
-                        </QItemSection>
+                        </QBtn>
-                        <QItemSection side>
+                    </VnRow>
-                            <QIcon
-                                name="delete"
-                                size="sm"
-                                class="cursor-pointer"
-                                color="primary"
-                                @click="
-                                    openConfirmationModal(
-                                        t(`Remove PDA`),
-                                        t('Do you want to remove this PDA?'),
-                                        () => deallocatePDA(row.deviceProductionFk)
-                                    )
-                                "
-                            >
-                                <QTooltip>
-                                    {{ t('worker.pda.removePDA') }}
-                                </QTooltip>
-                            </QIcon>
-                        </QItemSection>
-                    </QItem>
                 </QCard>
             </template>
         </VnPaginate>
@@ -187,26 +168,20 @@ function reloadData() {
     </QPage>
 </template>
 <style lang="scss" scoped>
-.centerCard {
+.btn-delete {
-    padding: 5%;
+    max-width: 4%;
-    width: 100%;
+    margin-top: 30px;
-    max-width: 70%;
-    margin: 0 auto;
-}
-.label {
-    color: red;
-}
-.q-field {
-    height: 65px;
 }
 </style>
 <i18n>
 es:
+    Model: Modelo
+    Serial number: Número de serie
+    Current SIM: SIM actual
+    Add new device: Añadir nuevo dispositivo
+    PDA deallocated: PDA desasignada
     Remove PDA: Eliminar PDA
     Do you want to remove this PDA?: ¿Desea eliminar este PDA?
-    PDA deallocated: PDA desasignada
+    You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
-    SIM serial number: Número de serie de la SIM
-    Model: Modelo
     This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
-    Add new device: Añadir nuevo dispositivo
 </i18n>

src/pages/Worker/Card/WorkerSummary.vue

@@ -73,7 +73,7 @@ const filter = {
         <template #body="{ entity: worker }">
             <QCard class="vn-one">
                 <VnTitle
-                    :url="workerUrl + `basic-data`"
+                    :url="`#/worker/${entityId}/basic-data`"
                     :text="t('worker.summary.basicData')"
                 />
                 <VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
@@ -113,7 +113,7 @@ const filter = {
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="workerUrl + `basic-data`"
+                    :url="`#/worker/${entityId}/basic-data`"
                     :text="t('worker.summary.basicData')"
                 />
                 <VnLv

src/pages/Worker/WorkerDepartment.vue

@@ -1,10 +1,10 @@
 <script setup>
-import VnTree from 'components/ui/VnTree.vue';
+import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
 </script>
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <VnTree />
+        <WorkerDepartmentTree />
     </QPage>
 </template>
 

src/pages/Worker/WorkerDepartmentTree.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import CreateDepartmentChild from '../CreateDepartmentChild.vue';
+import CreateDepartmentChild from './CreateDepartmentChild.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 import { useRouter } from 'vue-router';

src/pages/Zone/Card/ZoneCard.vue

@@ -5,38 +5,29 @@ import { computed } from 'vue';
 
 import VnCard from 'components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
-import { useStateStore } from 'stores/useStateStore';
 
 const { t } = useI18n();
-const stateStore = useStateStore();
 const route = useRoute();
 
 const routeName = computed(() => route.name);
+const customRouteRedirectName = computed(() => {
+    if (routeName.value === 'ZoneLocations') return null;
+    return routeName.value;
+});
 const searchBarDataKeys = {
     ZoneWarehouses: 'ZoneWarehouses',
     ZoneSummary: 'ZoneSummary',
+    ZoneLocations: 'ZoneLocations',
 };
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                :data-key="searchBarDataKeys[routeName]"
-                :custom-route-redirect-name="routeName"
-                :label="t('list.searchZone')"
-                :info="t('list.searchInfo')"
-            />
-        </Teleport>
-    </template>
     <VnCard
         data-key="Zone"
-        base-url="Zones"
         :descriptor="ZoneDescriptor"
-        searchbar-data-key="ZoneList"
+        :search-data-key="searchBarDataKeys[routeName]"
-        searchbar-url="Zones/filter"
+        :search-custom-route-redirect="customRouteRedirectName"
-        searchbar-label="Search zones"
+        :search-redirect="!!customRouteRedirectName"
-        searchbar-info="You can search by zone reference"
+        :searchbar-label="t('list.searchZone')"
+        :searchbar-info="t('list.searchInfo')"
     />
 </template>

src/pages/Zone/Card/ZoneLocations.vue

@@ -1 +1,80 @@
-<template>Zone Locations</template>
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import ZoneLocationsTree from './ZoneLocationsTree.vue';
+
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const onSelected = async (val, node) => {
+    try {
+        if (val === null) val = undefined;
+        const params = { geoId: node.id, isIncluded: val };
+        await axios.post(`Zones/${route.params.id}/toggleIsIncluded`, params);
+    } catch (err) {
+        console.error('Error updating included', err);
+    }
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <QCard class="full-width q-pa-md" style="max-width: 800px">
+            <ZoneLocationsTree :root-label="t('zoneLocations.locations')">
+                <template #checkbox="{ node }">
+                    <QCheckbox
+                        v-if="node.id"
+                        v-model="node.selected"
+                        :label="node.name"
+                        @update:model-value="($event) => onSelected($event, node)"
+                        toggle-indeterminate
+                        color="transparent"
+                        :class="[
+                            'checkbox',
+                            node.selected
+                                ? '--checked'
+                                : node.selected == false
+                                ? '--unchecked'
+                                : '--indeterminate',
+                        ]"
+                    />
+                </template>
+            </ZoneLocationsTree>
+        </QCard>
+    </QPage>
+</template>
+
+<style lang="scss">
+.checkbox {
+    &.--checked {
+        .q-checkbox__bg {
+            border: 1px solid $info !important;
+        }
+        .q-checkbox__svg {
+            color: white !important;
+            background-color: $info !important;
+        }
+    }
+
+    &.--unchecked {
+        .q-checkbox__bg {
+            border: 1px solid $negative !important;
+        }
+        .q-checkbox__svg {
+            background-color: $negative !important;
+        }
+    }
+
+    &.--indeterminate {
+        .q-checkbox__bg {
+            border: 1px solid $white !important;
+        }
+        .q-checkbox__svg {
+            color: transparent !important;
+        }
+    }
+}
+</style>

src/pages/Zone/Card/ZoneLocationsTree.vue

@@ -0,0 +1,172 @@
+<script setup>
+import { onMounted, ref, computed, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+import { useArrayData } from 'composables/useArrayData';
+import { onUnmounted } from 'vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const state = useState();
+
+const treeRef = ref();
+const expanded = ref([]);
+
+const arrayData = useArrayData('ZoneLocations', {
+    url: `Zones/${route.params.id}/getLeaves`,
+});
+const { store } = arrayData;
+const storeData = computed(() => store.data);
+
+const nodes = ref([
+    { id: null, name: t('zoneLocations.locations'), sons: true, childs: [{}] },
+]);
+
+const previousExpandedNodes = ref(new Set());
+
+const onNodeExpanded = async (nodeKeysArray) => {
+    let nodeKeysSet = new Set(nodeKeysArray);
+    const lastNodeKey = nodeKeysArray.at(-1);
+
+    if (!nodeKeysSet.has(null)) return;
+
+    const wasExpanded = !previousExpandedNodes.value.has(lastNodeKey);
+    if (wasExpanded) await fetchNodeLeaves(lastNodeKey);
+    else {
+        const difference = new Set(
+            [...previousExpandedNodes.value].filter((x) => !nodeKeysSet.has(x))
+        );
+        const collapsedNode = Array.from(difference).pop();
+        const node = treeRef.value?.getNodeByKey(collapsedNode);
+        const allNodeIds = getNodeIds(node);
+        expanded.value = expanded.value.filter((id) => !allNodeIds.includes(id));
+    }
+    previousExpandedNodes.value = nodeKeysSet;
+};
+
+const formatNodeSelected = (node) => {
+    if (node.selected === 1) node.selected = true;
+    else if (node.selected === 0) node.selected = false;
+
+    if (node.childs && node.childs.length > 0) {
+        expanded.value.push(node.id);
+
+        node.childs.forEach((childNode) => {
+            formatNodeSelected(childNode);
+        });
+    }
+
+    if (node.sons > 0 && !node.childs) node.childs = [{}];
+};
+
+const fetchNodeLeaves = async (nodeKey) => {
+    try {
+        const node = treeRef.value?.getNodeByKey(nodeKey);
+        if (!node || node.sons === 0) return;
+
+        const params = { parentId: node.id };
+        const response = await axios.get(`Zones/${route.params.id}/getLeaves`, {
+            params,
+        });
+        if (response.data) {
+            node.childs = response.data.map((n) => {
+                formatNodeSelected(n);
+                return n;
+            });
+        }
+
+        state.set('Tree', node);
+    } catch (err) {
+        console.error('Error fetching department leaves', err);
+        throw new Error();
+    }
+};
+
+function getNodeIds(node) {
+    let ids = [];
+    if (node.id) ids.push(node.id);
+
+    if (node.childs)
+        node.childs.forEach((child) => {
+            ids = ids.concat(getNodeIds(child));
+        });
+    return ids;
+}
+
+watch(storeData, async (val) => {
+    // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
+    nodes.value[0].childs = [...val];
+    const fetchedNodeKeys = val.flatMap(getNodeIds);
+    state.set('Tree', [...fetchedNodeKeys]);
+
+    if (store.userParams?.search === '') {
+        val.forEach((n) => {
+            formatNodeSelected(n);
+        });
+    } else {
+        for (let n of state.get('Tree')) {
+            await fetchNodeLeaves(n);
+        }
+        expanded.value = [null, ...fetchedNodeKeys];
+    }
+    previousExpandedNodes.value = new Set(expanded.value);
+});
+
+onMounted(async () => {
+    if (store.userParams?.search) {
+        await arrayData.fetch({ append: false });
+        return;
+    }
+    const stateTree = state.get('Tree');
+    const tree = stateTree ? [...state.get('Tree')] : [null];
+    const lastStateTree = state.get('TreeState');
+    if (tree) {
+        for (let n of tree) {
+            await fetchNodeLeaves(n);
+        }
+
+        if (lastStateTree) {
+            tree.push(lastStateTree);
+            await fetchNodeLeaves(lastStateTree);
+        }
+    }
+
+    setTimeout(() => {
+        if (lastStateTree) {
+            document.getElementById(lastStateTree).scrollIntoView();
+        }
+    }, 1000);
+
+    previousExpandedNodes.value = new Set(expanded.value);
+});
+
+onUnmounted(() => {
+    state.set('Tree', undefined);
+});
+</script>
+
+<template>
+    <QTree
+        ref="treeRef"
+        :nodes="nodes"
+        node-key="id"
+        label-key="name"
+        children-key="childs"
+        v-model:expanded="expanded"
+        @update:expanded="onNodeExpanded($event)"
+        :default-expand-all="true"
+    >
+        <template #default-header="{ node }">
+            <div
+                :id="node.id"
+                class="qtr row justify-between full-width q-pr-md cursor-pointer"
+            >
+                <span v-if="!node.id">{{ node.name }}</span>
+                <slot name="checkbox" :node="node" />
+            </div>
+        </template>
+    </QTree>
+</template>

src/pages/Zone/ZoneList.vue

@@ -6,8 +6,6 @@ import { toCurrency } from 'src/filters';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import ZoneFilterPanel from './ZoneFilterPanel.vue';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toTimeFormat } from 'src/filters/date';
@@ -71,35 +69,6 @@ const columns = computed(() => [
     },
 ]);
 
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return {
-                name: { like: `%${value}%` },
-            };
-        case 'code':
-            return {
-                code: { like: `%${value}%` },
-            };
-        case 'agencyModeFk':
-            return {
-                agencyModeFk: value,
-            };
-        case 'search':
-            if (value) {
-                if (!isNaN(value)) {
-                    return { id: value };
-                } else {
-                    return {
-                        name: {
-                            like: `%${value}%`,
-                        },
-                    };
-                }
-            }
-    }
-};
-
 async function clone(id) {
     const { data } = await axios.post(`Zones/${id}/clone`);
     notify(t('globals.dataSaved'), 'positive');
@@ -116,25 +85,6 @@ onMounted(() => (stateStore.rightDrawer = true));
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="ZoneList"
-                url="Zones"
-                :filter="{
-                    include: { relation: 'agencyMode', scope: { fields: ['name'] } },
-                }"
-                :expr-builder="exprBuilder"
-                :label="t('list.searchZone')"
-                :info="t('list.searchInfo')"
-            />
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
-        </QScrollArea>
-    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Zone/ZoneMain.vue

@@ -1,11 +1,72 @@
 <script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'src/components/LeftMenu.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import ZoneFilterPanel from './ZoneFilterPanel.vue';
 
+const { t } = useI18n();
 const stateStore = useStateStore();
+const route = useRoute();
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'agencyModeFk':
+            return {
+                agencyModeFk: value,
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        name: {
+                            like: `%${value}%`,
+                        },
+                    };
+                }
+            }
+    }
+};
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="ZoneList"
+                url="Zones"
+                :filter="{
+                    include: { relation: 'agencyMode', scope: { fields: ['name'] } },
+                }"
+                :expr-builder="exprBuilder"
+                :label="t('list.searchZone')"
+                :info="t('list.searchInfo')"
+                custom-route-redirect-name="ZoneSummary"
+            />
+        </Teleport>
+    </template>
+    <QDrawer
+        v-if="route.name === 'ZoneList'"
+        v-model="stateStore.rightDrawer"
+        side="right"
+        :width="256"
+        show-if-above
+    >
+        <QScrollArea class="fit text-grey-8">
+            <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
+        </QScrollArea>
+    </QDrawer>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
             <LeftMenu />

src/pages/Zone/ZoneUpcoming.vue

@@ -1,53 +1,85 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
-import ZoneFilterPanel from 'components/InvoiceOutNegativeFilter.vue';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
 import { useI18n } from 'vue-i18n';
 
+import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
+import FetchData from 'components/FetchData.vue';
+
+import { toDateFormat } from 'src/filters/date.js';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+
 const { t } = useI18n();
-const arrayData = ref(null);
+const weekdayStore = useWeekdayStore();
-const rows = computed(() => arrayData.value.store.data);
+
+const details = ref([]);
 
 const columns = computed(() => [
     {
-        label: t('Province'),
+        label: t('upcomingDeliveries.province'),
-        //field: '',
+        name: 'province',
-        //name: '',
+        field: 'name',
         align: 'left',
     },
     {
-        label: t('Closing'),
+        label: t('upcomingDeliveries.closing'),
-        //field: '',
+        name: 'closing',
-        //name: '',
+        field: 'hour',
         align: 'left',
     },
     {
-        label: t('Id'),
+        label: t('upcomingDeliveries.id'),
-        //field: '',
+        name: 'id',
-        //name: '',
+        field: 'zoneFk',
         align: 'left',
     },
 ]);
 
-function getWeekDay(jsonDate) {
+const getWeekDayName = (date) => {
-    const weekDay = new Date(jsonDate).getDay();
+    const weekDay = new Date(date).getDay();
+    return t(`weekdays.${weekdayStore.weekdays[weekDay].code}`);
+};
 
-    return this.days[weekDay].locale;
+const getHeaderTitle = (date) => {
-}
+    return `${getWeekDayName(date)} - ${toDateFormat(date)}`;
+};
+
+onMounted(() => weekdayStore.initStore());
 </script>
 
 <template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+    <FetchData
-        <QScrollArea class="fit text-grey-8">
+        url="Zones/getUpcomingDeliveries"
-            <ZoneFilterPanel data-key="ZoneUpcoming" />
+        @on-fetch="(data) => (details = data)"
-        </QScrollArea>
+        auto-load
-    </QDrawer>
+    />
     <VnSubToolbar />
     <QPage class="column items-center q-pa-md">
-        <span>
+        <QCard class="full-width q-pa-md">
-            {{ t(`${getWeekDay(/*detail.shipped*/)}`) }} -
+            <div
-            {{ t /*'detail.shipped'*/() }}
+                v-for="(detail, index) in details"
-        </span>
+                :key="index"
-        <QTable :columns="columns" :rows="rows" class="full-width q-mt-md"> </QTable>
+                class="full-width flex q-mb-lg"
+            >
+                <span class="header">
+                    {{ getHeaderTitle(detail.shipped) }}
+                </span>
+                <QTable flat :columns="columns" :rows="detail.lines" class="full-width" />
+            </div>
+        </QCard>
     </QPage>
 </template>
+
+<style scoped lang="scss">
+.header {
+    min-width: 100% !important;
+    display: flex;
+    align-items: center;
+    padding-left: 8px;
+    height: 35px;
+    border-bottom: 1px solid $primary;
+    background-color: var(--vn-page-color);
+    font-size: 19px;
+    font-weight: bold;
+    text-transform: uppercase;
+}
+</style>

src/pages/Zone/locale/en.yml

@@ -5,7 +5,7 @@ zone:
         zoneCreate: Create zone
         locations: Locations
         deliveryDays: Delivery days
-        upcomingList: Upcoming deliveries
+        upcomingDeliveries: Upcoming deliveries
         warehouses: Warehouses
 list:
     clone: Clone
@@ -42,6 +42,8 @@ summary:
 filterPanel:
     name: Name
     agencyModeFk: Agency
+zoneLocations:
+    locations: Locations
 deliveryPanel:
     pickup: Pick up
     delivery: Delivery
@@ -64,3 +66,7 @@ warehouses:
     deleteSubtitle: Are you sure you want to continue?
     warehouse: Warehouse
     add: Add
+upcomingDeliveries:
+    province: Province
+    closing: Closing
+    id: Id

src/pages/Zone/locale/es.yml

@@ -5,7 +5,7 @@ zone:
         zoneCreate: Nueva zona
         locations: Localizaciones
         deliveryDays: Días de entrega
-        upcomingList: Próximos repartos
+        upcomingDeliveries: Próximos repartos
         warehouses: Almacenes
 list:
     clone: Clonar
@@ -42,6 +42,8 @@ summary:
 filterPanel:
     name: Nombre
     agencyModeFk: Agencia
+zoneLocations:
+    locations: Localizaciones
 deliveryPanel:
     pickup: Recogida
     delivery: Entrega
@@ -66,3 +68,7 @@ warehouses:
     deleteSubtitle: ¿Seguro que quieres continuar?
     warehouse: Almacén
     add: Añadir
+upcomingDeliveries:
+    province: Provincia
+    closing: Cierre
+    id: Id

src/router/modules/invoiceIn.js

@@ -37,6 +37,15 @@ export default {
                     },
                     component: () => import('src/pages/InvoiceIn/InvoiceInList.vue'),
                 },
+                {
+                    path: 'create',
+                    name: 'InvoiceInCreare',
+                    meta: {
+                        title: 'invoiceInCreate',
+                        icon: 'create',
+                    },
+                    component: () => import('src/pages/InvoiceIn/InvoiceInCreate.vue'),
+                },
             ],
         },
         {

src/router/modules/zone.js

@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ZoneMain' },
     menus: {
-        main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingList'],
+        main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingDeliveries'],
         card: ['ZoneBasicData', 'ZoneWarehouses', 'ZoneHistory', 'ZoneLocations'],
     },
     children: [
@@ -57,6 +57,24 @@ export default {
                     },
                     component: () => import('src/pages/Zone/ZoneCreate.vue'),
                 },
+                // {
+                //     path: 'counter',
+                //     name: 'ZoneCounter',
+                //     meta: {
+                //         title: 'zoneCounter',
+                //         icon: 'add_circle',
+                //     },
+                //     component: () => import('src/pages/Zone/ZoneCounter.vue'),
+                // },
+                {
+                    name: 'ZoneUpcomingDeliveries',
+                    path: 'upcoming-deliveries',
+                    meta: {
+                        title: 'upcomingDeliveries',
+                        icon: 'vn:calendar',
+                    },
+                    component: () => import('src/pages/Zone/ZoneUpcoming.vue'),
+                },
             ],
         },
         {
@@ -88,7 +106,7 @@ export default {
                     path: 'location',
                     meta: {
                         title: 'locations',
-                        icon: 'vn:greuge',
+                        icon: 'my_location',
                     },
                     component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
                 },

test/cypress/integration/VnLocation.spec.js

@@ -39,7 +39,7 @@ describe('VnLocation', () => {
         });
         it('Create postCode', function () {
             cy.get(
-                ':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+                ':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon'
             ).click();
             cy.get('.q-card > h1').should('have.text', 'New postcode');
             cy.get(dialogInputs).eq(0).clear('12');

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

@@ -21,8 +21,7 @@ describe('ClaimPhoto', () => {
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
 
-    /* it.skip('should open first image dialog change to second and close', () => {
+    it('should open first image dialog change to second and close', () => {
-        skiped fix on https://redmine.verdnatura.es/issues/7113
         cy.get(
             ':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
         ).click();
@@ -38,19 +37,23 @@ describe('ClaimPhoto', () => {
         cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
             'not.be.visible'
         );
-    }); */
+    });
 
     it('should remove third and fourth file', () => {
         cy.get(
             '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+        cy.get(
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+        ).click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
 
         cy.get(
             '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+        cy.get(
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+        ).click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
     });
 });

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

@@ -2,8 +2,7 @@
 describe('InvoiceInBasicData', () => {
     const formInputs = '.q-form > .q-card input';
     const firstFormSelect = '.q-card > .vn-row:nth-child(1) > .q-select';
-    const appendBtns = '.q-form label button';
+    const documentBtns = '.q-form .q-field button';
-    const dialogAppendBtns = '.q-dialog label button';
     const dialogInputs = '.q-dialog input';
     const dialogActionBtns = '.q-card__actions button';
 
@@ -15,8 +14,7 @@ describe('InvoiceInBasicData', () => {
     it('should edit the provideer and supplier ref', () => {
         cy.selectOption(firstFormSelect, 'Bros');
         cy.get('[title="Reset"]').click();
-        cy.get(appendBtns).eq(0).click();
+        cy.get(formInputs).eq(1).type('{selectall}4739');
-        cy.get(formInputs).eq(1).type(4739);
         cy.saveCard();
 
         cy.get(`${firstFormSelect} input`).invoke('val').should('eq', 'Plants nick');
@@ -27,22 +25,20 @@ describe('InvoiceInBasicData', () => {
         const firtsInput = 'Ticket:65';
         const secondInput = "I don't know what posting here!";
 
-        cy.get(appendBtns).eq(3).click();
+        cy.get(documentBtns).eq(1).click();
-        cy.get(dialogAppendBtns).eq(0).click();
+        cy.get(dialogInputs).eq(0).type(`{selectall}${firtsInput}`);
-        cy.get(dialogInputs).eq(0).type(firtsInput);
+        cy.get('textarea').type(`{selectall}${secondInput}`);
-        cy.get(dialogAppendBtns).eq(1).click();
-        cy.get('textarea').type(secondInput);
         cy.get(dialogActionBtns).eq(1).click();
 
-        cy.get(appendBtns).eq(3).click();
+        cy.get(documentBtns).eq(1).click();
-
         cy.get(dialogInputs).eq(0).invoke('val').should('eq', firtsInput);
         cy.get('textarea').invoke('val').should('eq', secondInput);
     });
 
     it('should throw an error creating a new dms if a file is not attached', () => {
-        cy.get(appendBtns).eq(2).click();
+        cy.get(formInputs).eq(5).click();
-        cy.get(appendBtns).eq(1).click();
+        cy.get(formInputs).eq(5).type('{selectall}{backspace}');
+        cy.get(documentBtns).eq(0).click();
         cy.get(dialogActionBtns).eq(1).click();
         cy.get('.q-notification__message').should(
             'have.text',

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

@@ -0,0 +1,24 @@
+describe('InvoiceInDescriptor', () => {
+    const dialogBtns = '.q-card__actions button';
+    const firstDescritorOpt = '.q-menu > .q-list > :nth-child(1) > .q-item__section';
+    const isBookedField =
+        '.q-card:nth-child(3) .vn-label-value:nth-child(5) > .value > span';
+
+    it('should booking and unbooking the invoice properly', () => {
+        cy.login('developer');
+        cy.visit(`/#/invoice-in/1/summary?limit=10`);
+
+        cy.openLeftMenu();
+        cy.openActionsDescriptor();
+        cy.get(firstDescritorOpt).click();
+        cy.get(dialogBtns).eq(1).click();
+        cy.get('.fullscreen').first().click();
+        cy.get(isBookedField).should('have.attr', 'title', 'true');
+
+        cy.openLeftMenu();
+        cy.openActionsDescriptor();
+        cy.get(firstDescritorOpt).click();
+        cy.get(dialogBtns).eq(1).click();
+        cy.get(isBookedField).should('have.attr', 'title', 'false');
+    });
+});

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

@@ -18,7 +18,7 @@ describe('InvoiceInVat', () => {
         cy.saveCard();
         cy.visit(`/#/invoice-in/1/vat`);
 
-        cy.getValue(firstLineVat).should('equal', 'H.P. IVA 21% CEE');
+        cy.getValue(firstLineVat).should('equal', '8');
     });
 
     it('should add a new row', () => {

test/cypress/integration/vnLog.spec.js

@@ -9,15 +9,15 @@ describe('VnLog', () => {
         cy.visit(`/#/claim/${1}/log`);
         cy.openRightMenu();
     });
-
+    // Se tiene que cambiar el Accept-Language a 'en', ya hay una tarea para eso #7189.
-    it('should filter by insert actions', () => {
+    xit('should filter by insert actions', () => {
         cy.checkOption(':nth-child(7) > .q-checkbox');
         cy.get('.q-page').click();
         cy.validateContent(chips[0], 'Document');
         cy.validateContent(chips[1], 'Beginning');
     });
 
-    it('should filter by entity', () => {
+    xit('should filter by entity', () => {
         cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim');
         cy.get('.q-page').click();
         cy.validateContent(chips[0], 'Claim');

test/cypress/integration/worker/workerList.spec.js

@@ -20,6 +20,6 @@ describe('WorkerList', () => {
             .eq(0)
             .invoke('text')
             .should('include', 'Basic data');
-        cy.get('.summary .header-link').eq(1).should('have.text', 'User data ');
+        cy.get('.summary .header-link').eq(2).should('have.text', 'User data ');
     });
 });

test/cypress/integration/worker/workerLocker.spec.js

@@ -1,6 +1,6 @@
-describe('WorkerList', () => {
+describe('WorkerLocker', () => {
     const workerId = 1109;
-    const lockerCode = '201A';
+    const lockerCode = '2F';
     const input = '.q-card input';
     const firstOpt = '[role="listbox"] .q-item:nth-child(1)';
     beforeEach(() => {

test/cypress/integration/worker/workerPda.spec.js

@@ -15,7 +15,7 @@ describe('WorkerPda', () => {
     });
 
     it('delete pda', () => {
-        cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
+        cy.get('.btn-delete').click();
         cy.get(
             '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
         ).click();

test/cypress/support/commands.js

@@ -92,8 +92,13 @@ Cypress.Commands.add('checkOption', (selector) => {
 
 // Global buttons
 Cypress.Commands.add('saveCard', () => {
+    const dropdownArrow = '.q-btn-dropdown__arrow-container > .q-btn__content > .q-icon';
+    cy.get('#st-actions').then(($el) => {
+        if ($el.find(dropdownArrow).length) cy.get(dropdownArrow).click();
+    });
     cy.get('[title="Save"]').click();
 });
+
 Cypress.Commands.add('resetCard', () => {
     cy.get('[title="Reset"]').click();
 });

test/vitest/__tests__/pages/InvoiceIn/InvoiceInBasicData.spec.js

@@ -1,34 +0,0 @@
-import { vi, describe, expect, it, beforeAll } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import InvoiceInBasicData from 'src/pages/InvoiceIn/Card/InvoiceInBasicData.vue';
-
-describe('InvoiceInBasicData', () => {
-    let vm;
-
-    beforeAll(() => {
-        vm = createWrapper(InvoiceInBasicData, {
-            global: {
-                stubs: [],
-                mocks: {
-                    fetch: vi.fn(),
-                },
-            },
-        }).vm;
-    });
-
-    describe('upsert()', () => {
-        it('should throw an error when data is empty', async () => {
-            vi.spyOn(axios, 'post').mockResolvedValue({ data: [] });
-            vi.spyOn(vm.quasar, 'notify');
-
-            await vm.upsert();
-
-            expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    message: `The company can't be empty`,
-                    type: 'negative',
-                })
-            );
-        });
-    });
-});

test/vitest/__tests__/pages/InvoiceIn/InvoiceInIntrastat.spec.js

@@ -19,13 +19,13 @@ describe('InvoiceInIntrastat', () => {
 
     describe('getTotal()', () => {
         it('should correctly handle the sum', () => {
-            vm.invoceInIntrastat = [
+            const invoceInIntrastat = [
                 { amount: 10, stems: 162 },
                 { amount: 20, stems: 21 },
             ];
 
-            const totalAmount = vm.getTotal('amount');
+            const totalAmount = vm.getTotal(invoceInIntrastat, 'amount');
-            const totalStems = vm.getTotal('stems');
+            const totalStems = vm.getTotal(invoceInIntrastat, 'stems');
 
             expect(totalAmount).toBe(10 + 20);
             expect(totalStems).toBe(162 + 21);

test/vitest/__tests__/pages/InvoiceIn/InvoiceInVat.spec.js

@@ -1,5 +1,5 @@
 import { vi, describe, expect, it, beforeAll } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
 import InvoiceInVat from 'src/pages/InvoiceIn/Card/InvoiceInVat.vue';
 
 describe('InvoiceInVat', () => {
@@ -16,41 +16,6 @@ describe('InvoiceInVat', () => {
         }).vm;
     });
 
-    describe('addExpense()', () => {
-        beforeAll(() => {
-            vi.spyOn(axios, 'post').mockResolvedValue({ data: [] });
-            vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
-            vi.spyOn(vm.quasar, 'notify');
-        });
-
-        it('should throw an error when the code property is undefined', async () => {
-            await vm.addExpense();
-
-            expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    message: `The code can't be empty`,
-                    type: 'negative',
-                })
-            );
-        });
-
-        it('should correctly handle expense addition', async () => {
-            vm.newExpense = {
-                code: 123,
-                isWithheld: false,
-                description: 'Descripción del gasto',
-            };
-
-            await vm.addExpense();
-            expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    message: 'Data saved',
-                    type: 'positive',
-                })
-            );
-        });
-    });
-
     describe('taxRate()', () => {
         it('should correctly compute the tax rate', () => {
             const invoiceInTax = { taxableBase: 100, taxTypeSageFk: 1 };

test/vitest/helper.js

@@ -24,6 +24,7 @@ vi.mock('vue-router', () => ({
                 params: {
                     id: 1,
                 },
+                meta: { moduleName: 'mockName' },
             },
         },
     }),
@@ -31,6 +32,7 @@ vi.mock('vue-router', () => ({
         matched: [],
         query: {},
         params: {},
+        meta: { moduleName: 'mockName' },
     }),
 }));