Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2420.01]
 
+### Added
+
+-   (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto
+
 ## [2418.01]
 
 ## [2416.01] - 2024-04-18
@@ -14,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   (Worker) => Se crea la sección Taquilla
+-   (General) => Se mantiene el filtro lateral en cualquier parte de la seccíon.
 
 ### Fixed
 

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.22.0",
+    "version": "24.24.3",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

src/components/CreateBankEntityForm.vue

@@ -8,12 +8,7 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
-const props = defineProps({
-    showEntityField: {
-        type: Boolean,
-        default: true,
-    },
-});
+defineProps({ showEntityField: { type: Boolean, default: true } });
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
@@ -26,7 +21,7 @@ const bankEntityFormData = reactive({
 });
 
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
+    fields: ['id', 'name', 'code'],
 };
 
 const countriesOptions = ref([]);
@@ -79,7 +74,7 @@ onMounted(async () => {
                         v-model="data.countryFk"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="country"
+                        option-label="name"
                         hide-selected
                         :required="true"
                         :rules="validate('bankEntity.countryFk')"

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

@@ -134,7 +134,7 @@ const onProvinceCreated = async ({ name }, formData) => {
                     :label="t('Country')"
                     :options="countriesOptions"
                     hide-selected
-                    option-label="country"
+                    option-label="name"
                     option-value="id"
                     v-model="data.countryFk"
                     :rules="validate('postcode.countryFk')"

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);
-
-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 arrayData = useArrayData($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,
-        (val) => {
-            hasChanges.value = !isResetting.value && val;
-            isResetting.value = false;
-        },
-        { deep: true }
+        () => arrayData.store.data,
+        (val) => updateAndEmit(val, 'onFetch')
     );
-};
+
+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);
-        originalData.value = data && JSON.parse(JSON.stringify(data));
-
-        emit('onFetch', state.get($props.model));
+        updateAndEmit(data, 'onFetch');
     } catch (error) {
         state.set($props.model, {});
         originalData.value = {};
@@ -173,38 +180,39 @@ async function fetch() {
 }
 
 async function save() {
-    if ($props.observeFormChanges && !hasChanges.value) {
-        notify('globals.noChanges', 'negative');
-        return;
-    }
-    isLoading.value = true;
+    if ($props.observeFormChanges && !hasChanges.value)
+        return notify('globals.noChanges', 'negative');
 
+    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
-            response = await axios[$props.urlCreate ? 'post' : 'patch'](
-                $props.urlCreate || $props.urlUpdate || $props.url,
-                body
-            );
+        else response = await axios[method](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);
-    originalData.value = JSON.parse(JSON.stringify(originalData.value));
-
-    emit('onFetch', state.get($props.model));
+    updateAndEmit(originalData.value, 'onFetch');
     if ($props.observeFormChanges) {
         hasChanges.value = false;
         isResetting.value = true;
@@ -226,17 +234,15 @@ function filter(value, update, filterOptions) {
     );
 }
 
-watch(formUrl, async () => {
-    originalData.value = null;
-    reset();
-    fetch();
-});
+function updateAndEmit(val, evt) {
+    state.set($props.model, val);
+    originalData.value = val && JSON.parse(JSON.stringify(val));
+    if (!$props.url) arrayData.store.data = val;
 
-defineExpose({
-    save,
-    isLoading,
-    hasChanges,
-});
+    emit(evt, state.get($props.model));
+}
+
+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)"
-                    :color="defaultButtons.save.color"
-                    :icon="defaultButtons.save.icon"
+                    v-else
+                    :label="tMobile('globals.save')"
+                    color="primary"
+                    icon="save"
                     @click="save"
                     :disable="!hasChanges"
                     :title="t(defaultButtons.save.label)"

src/components/FormModelPopup.vue

@@ -6,7 +6,7 @@ import FormModel from 'components/FormModel.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',

src/components/FormPopup.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['onSubmit']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',

src/components/UserPanel.vue

@@ -178,6 +178,8 @@ function copyUserToken() {
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
+                    input-debounce="0"
+                    hide-selected
                 />
                 <VnSelect
                     :label="t('components.userPanel.localBank')"
@@ -185,6 +187,8 @@ function copyUserToken() {
                     :options="accountBankData"
                     option-label="bank"
                     option-value="id"
+                    input-debounce="0"
+                    hide-selected
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -201,10 +205,11 @@ function copyUserToken() {
                 <VnSelect
                     :label="t('components.userPanel.localCompany')"
                     hide-selected
-                    v-model="user.companyFk"
+                    v-model="user.localCompanyFk"
                     :options="companiesData"
                     option-label="code"
                     option-value="id"
+                    input-debounce="0"
                 />
                 <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
@@ -213,6 +218,7 @@ function copyUserToken() {
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
+                    input-debounce="0"
                 />
             </VnRow>
             <VnRow>
@@ -224,6 +230,8 @@ function copyUserToken() {
                     option-label="code"
                     option-value="id"
                     style="flex: 0"
+                    dense
+                    input-debounce="0"
                 />
             </VnRow>
         </div>

src/components/common/RightMenu.vue

@@ -0,0 +1,55 @@
+<script setup>
+import { ref, onMounted, useSlots } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+
+const slots = useSlots();
+const hasContent = ref(false);
+const rightPanel = ref(null);
+
+onMounted(() => {
+    rightPanel.value = document.querySelector('#right-panel');
+    if (rightPanel.value.childNodes.length) hasContent.value = true;
+
+    // Check if there's content to display
+    const observer = new MutationObserver(() => {
+        hasContent.value = rightPanel.value.childNodes.length;
+    });
+
+    if (rightPanel.value)
+        observer.observe(rightPanel.value, {
+            subtree: true,
+            childList: true,
+            attributes: true,
+        });
+
+    if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
+});
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+</script>
+<template>
+    <Teleport to="#actions-append">
+        <div class="row q-gutter-x-sm">
+            <QBtn
+                v-if="hasContent || $slots['right-panel']"
+                flat
+                @click="stateStore.toggleRightDrawer()"
+                round
+                dense
+                icon="menu"
+            >
+                <QTooltip bottom anchor="bottom right">
+                    {{ t('globals.collapseMenu') }}
+                </QTooltip>
+            </QBtn>
+        </div>
+    </Teleport>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <div id="right-panel"></div>
+            <slot v-if="!hasContent" name="right-panel" />
+        </QScrollArea>
+    </QDrawer>
+</template>

src/components/common/SendEmailDialog.vue

@@ -29,10 +29,12 @@ async function confirm() {
     const response = { address: address.value };
     if (props.promise) {
         isLoading.value = true;
-        const { address: _address, ...restData } = props.data;
 
         try {
-            Object.assign(response, restData);
+            const dataCopy = JSON.parse(JSON.stringify({ ...props.data }));
+            delete dataCopy.address;
+
+            Object.assign(response, dataCopy);
             await props.promise(response);
         } finally {
             isLoading.value = false;

src/components/common/VnCard.vue

@@ -1,13 +1,13 @@
 <script setup>
 import { onBeforeMount, computed, watchEffect } from 'vue';
 import { useRoute, onBeforeRouteUpdate } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import LeftMenu from 'components/LeftMenu.vue';
+import RightMenu from 'components/common/RightMenu.vue';
 
 const props = defineProps({
     dataKey: { type: String, required: true },
@@ -15,13 +15,15 @@ const props = defineProps({
     customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
-    searchbarDataKey: { type: String, default: undefined },
-    searchbarUrl: { type: String, default: undefined },
+    filterPanel: { type: Object, default: undefined },
+    searchDataKey: { type: String, default: undefined },
+    searchUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
+    searchCustomRouteRedirect: { type: String, default: undefined },
+    searchRedirect: { type: Boolean, default: true },
 });
 
-const { t } = useI18n();
 const stateStore = useStateStore();
 const route = useRoute();
 const url = computed(() => {
@@ -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 });
         }
     });
@@ -54,24 +56,33 @@ watchEffect(() => {
 });
 </script>
 <template>
-    <Teleport
-        to="#searchbar"
-        v-if="stateStore.isHeaderMounted() && props.searchbarDataKey"
-    >
-        <VnSearchbar
-            :data-key="props.searchbarDataKey"
-            :url="props.searchbarUrl"
-            :label="t(props.searchbarLabel)"
-            :info="t(props.searchbarInfo)"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <component :is="descriptor" />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar" v-if="props.searchDataKey">
+            <slot name="searchbar">
+                <VnSearchbar
+                    :data-key="props.searchDataKey"
+                    :url="props.searchUrl"
+                    :label="props.searchbarLabel"
+                    :info="props.searchbarInfo"
+                    :custom-route-redirect-name="searchCustomRouteRedirect"
+                    :redirect="searchRedirect"
+                />
+            </slot>
+        </Teleport>
+        <slot v-else name="searchbar" />
+        <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+            <QScrollArea class="fit">
+                <component :is="descriptor" />
+                <QSeparator />
+                <LeftMenu source="card" />
+            </QScrollArea>
+        </QDrawer>
+        <RightMenu>
+            <template #right-panel v-if="props.filterPanel">
+                <component :is="props.filterPanel" :data-key="props.searchDataKey" />
+            </template>
+        </RightMenu>
+    </template>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />

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

@@ -35,7 +35,7 @@ const $props = defineProps({
     downloadModel: {
         type: String,
         required: false,
-        default: null,
+        default: undefined,
     },
     defaultDmsCode: {
         type: String,

src/components/common/VnInput.vue

@@ -37,14 +37,6 @@ const styleAttrs = computed(() => {
         : {};
 });
 
-const onEnterPress = () => {
-    emit('keyup.enter');
-};
-
-const handleValue = (val = null) => {
-    value.value = val;
-};
-
 const focus = () => {
     vnInputRef.value.focus();
 };
@@ -73,7 +65,7 @@ const inputRules = [
             v-bind="{ ...$attrs, ...styleAttrs }"
             :type="$attrs.type"
             :class="{ required: $attrs.required }"
-            @keyup.enter="onEnterPress()"
+            @keyup.enter="emit('keyup.enter')"
             :clearable="false"
             :rules="inputRules"
             :lazy-rules="true"
@@ -82,14 +74,14 @@ const inputRules = [
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
             </template>
-
+            
             <template #append>
-                <slot name="append" v-if="$slots.append" />
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value"
-                    @click="handleValue(null)"
+                    v-if="$slots.append && hover && value && !$attrs.disabled"
+                    @click="value = null"
                 ></QIcon>
             </template>
         </QInput>

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

@@ -22,6 +22,10 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    optionFilter: {
+        type: String,
+        default: null,
+    },
     url: {
         type: String,
         default: '',
@@ -59,7 +63,7 @@ const $props = defineProps({
 const { t } = useI18n();
 const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
 
-const { optionLabel, optionValue, options, modelValue } = toRefs($props);
+const { optionLabel, optionValue, optionFilter, options, modelValue } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
@@ -109,9 +113,9 @@ async function fetchFilter(val) {
     const { fields, sortBy, limit } = $props;
     let key = optionLabel.value;
 
-    if (new RegExp(/\d/g).test(val)) key = optionValue.value;
+    if (new RegExp(/\d/g).test(val)) key = optionFilter.value ?? optionValue.value;
 
-    const where = { [key]: { like: `%${val}%` } };
+    const where = { ...{ [key]: { like: `%${val}%` } }, ...$props.where };
     return dataRef.value.fetch({ fields, where, order: sortBy, limit });
 }
 

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'">
-                {{ $props.text }}
-                <QIcon v-if="url" :name="$props.icon" />
+            <a :href="url" :class="url ? 'link' : 'color-vn-text'">
+                {{ text }}
+                <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, {
-    url: $props.url,
-    filter: $props.filter,
-    skip: 0,
-});
-const { store } = arrayData;
-const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+let arrayData;
+let store;
+let entity;
 const isLoading = ref(false);
 
-defineExpose({
-    getData,
-});
+defineExpose({ getData });
+
 onBeforeMount(async () => {
-    await getData();
-    watch($props, async () => await getData());
+    arrayData = useArrayData($props.dataKey, {
+        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(
-        (route) => route.name === `${route.meta.moduleName}Summary`
-    );
-    return !isSummary.value && route.meta.moduleName && routeExists;
+    const exist = existSummary(route.matched);
+    return !isSummary.value && route.meta.moduleName && exist;
 });
+
+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>
@@ -142,6 +151,9 @@ const showRedirectToSummaryIcon = computed(() => {
             box-shadow: none;
 
             .vn-label-value {
+                &.negative > .value span {
+                    color: $alert;
+                }
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;

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="$props.item.tag5 + ': ' + $props.item.value5"
+                :title="`${key}: ${val}`"
+                :class="{ empty: !val }"
             >
-                {{ $props.item.value5 }}
-            </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 }}
+                {{ val }}
             </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 {
@@ -108,11 +106,10 @@ const containerClasses = computed(() => {
         font-size: 13px;
 
         &:hover {
-            background-color: var(--vn-accent-color);
+            background-color: var(--vn-label-color);
             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/VnFilterPanel.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
-
+import useRedirect from 'src/composables/useRedirect';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
@@ -56,6 +56,7 @@ const arrayData = useArrayData(props.dataKey, {
 const route = useRoute();
 const store = arrayData.store;
 const userParams = ref({});
+const { navigate } = useRedirect();
 
 onMounted(() => {
     if (props.params) userParams.value = JSON.parse(JSON.stringify(props.params));
@@ -92,6 +93,7 @@ async function search() {
 
     isLoading.value = false;
     emit('search');
+    navigate(store.data, {});
 }
 
 async function reload() {
@@ -102,6 +104,7 @@ async function reload() {
     if (!props.showAll && !params.length) store.data = [];
     isLoading.value = false;
     emit('refresh');
+    navigate(store.data, {});
 }
 
 async function clearFilters() {

src/components/ui/VnLinkPhone.vue

@@ -1,21 +1,16 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-const props = defineProps({
-    phoneNumber: { type: [String, Number], default: null },
-});
-const { t } = useI18n();
+defineProps({ phoneNumber: { type: [String, Number], default: null } });
 </script>
 <template>
     <QBtn
-        v-if="props.phoneNumber"
+        v-if="phoneNumber"
         flat
         round
         icon="phone"
         size="sm"
         color="primary"
         padding="none"
-        :href="`sip:${props.phoneNumber}`"
+        :href="`sip:${phoneNumber}`"
         @click.stop
     />
 </template>
-<style scoped></style>

src/components/ui/VnPaginate.vue

@@ -42,6 +42,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    keepOpts: {
+        type: Array,
+        default: () => [],
+    },
     offset: {
         type: Number,
         default: 0,
@@ -76,6 +80,7 @@ const arrayData = useArrayData(props.dataKey, {
     order: props.order,
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
+    keepOpts: props.keepOpts,
 });
 const store = arrayData.store;
 

src/components/ui/VnSearchbar.vue

@@ -1,11 +1,13 @@
 <script setup>
-import { onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
+import { onMounted, ref, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
+import useRedirect from 'src/composables/useRedirect';
+import { useI18n } from 'vue-i18n';
 
 const quasar = useQuasar();
+const { t } = useI18n();
 
 const props = defineProps({
     dataKey: {
@@ -65,10 +67,18 @@ const props = defineProps({
     },
 });
 
-const router = useRouter();
-const arrayData = useArrayData(props.dataKey, { ...props });
-const { store } = arrayData;
+let arrayData = useArrayData(props.dataKey, { ...props });
+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;
@@ -91,27 +101,10 @@ async function search() {
 
     if (!props.redirect) return;
 
-    if (props.customRouteRedirectName)
-        return router.push({
-            name: props.customRouteRedirectName,
-            params: { id: searchText.value },
-        });
-
-    const { matched: matches } = router.currentRoute.value;
-    const { path } = matches.at(-1);
-    const [, moduleName] = path.split('/');
-
-    if (!store.data.length || store.data.length > 1)
-        return router.push({ path: `/${moduleName}/list` });
-
-    const targetId = store.data[0].id;
-    let targetUrl;
-
-    if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
-    if (path.endsWith('-list')) targetUrl = path.replace('-list', `/${targetId}/summary`);
-    else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
-
-    await router.push({ path: targetUrl });
+    navigate(store.data, {
+        customRouteRedirectName: props.customRouteRedirectName,
+        searchText: searchText.value,
+    });
 }
 </script>
 
@@ -120,7 +113,7 @@ async function search() {
         <VnInput
             id="searchbar"
             v-model="searchText"
-            :placeholder="props.label"
+            :placeholder="t(props.label)"
             dense
             standout
             autofocus
@@ -139,7 +132,7 @@ async function search() {
                     name="info"
                     class="cursor-info"
                 >
-                    <QTooltip>{{ props.info }}</QTooltip>
+                    <QTooltip>{{ t(props.info) }}</QTooltip>
                 </QIcon>
             </template>
         </VnInput>

src/composables/useArrayData.js

@@ -47,7 +47,10 @@ export function useArrayData(key, userOptions) {
                 if (isEmpty || !allowedOptions.includes(option)) continue;
 
                 if (Object.prototype.hasOwnProperty.call(store, option)) {
-                    store[option] = userOptions[option];
+                    const defaultOpts = userOptions[option];
+                    store[option] = userOptions.keepOpts?.includes(option)
+                        ? Object.assign(defaultOpts, store[option])
+                        : defaultOpts;
                 }
             }
         }
@@ -127,7 +130,8 @@ export function useArrayData(key, userOptions) {
         store.filter = {};
         if (params) store.userParams = Object.assign({}, params);
 
-        await fetch({ append: false });
+        const response = await fetch({ append: false });
+        return response;
     }
 
     async function addFilter({ filter, params }) {

src/composables/useRedirect.js

@@ -0,0 +1,25 @@
+import { useRouter } from 'vue-router';
+
+export default function useRedirect() {
+    const router = useRouter();
+
+    const navigate = (data, { customRouteRedirectName, searchText }) => {
+        if (customRouteRedirectName)
+            return router.push({
+                name: customRouteRedirectName,
+                params: { id: searchText },
+            });
+
+        const { matched: matches } = router.currentRoute.value;
+        const { path } = matches.at(-1);
+
+        const to =
+            data.length === 1
+                ? path.replace(/\/(list|:id)|-list/, `/${data[0].id}`)
+                : path.replace(/:id.*/, '');
+
+        router.push({ path: to });
+    };
+
+    return { navigate };
+}

src/composables/useState.js

@@ -20,28 +20,12 @@ const headerMounted = ref(false);
 export function useState() {
     function getUser() {
         return computed(() => {
-            return {
-                id: user.value.id,
-                name: user.value.name,
-                nickname: user.value.nickname,
-                lang: user.value.lang,
-                darkMode: user.value.darkMode,
-                companyFk: user.value.companyFk,
-                warehouseFk: user.value.warehouseFk,
-            };
+            return user.value;
         });
     }
 
     function setUser(data) {
-        user.value = {
-            id: data.id,
-            name: data.name,
-            nickname: data.nickname,
-            lang: data.lang,
-            darkMode: data.darkMode,
-            companyFk: data.companyFk,
-            warehouseFk: data.warehouseFk,
-        };
+        user.value = data;
     }
 
     function getRoles() {

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?2omjsr#iefix') format('embedded-opentype'),
-        url('fonts/icon.ttf?2omjsr') format('truetype'),
-        url('fonts/icon.woff?2omjsr') format('woff'),
-        url('fonts/icon.svg?2omjsr#icon') format('svg');
+    src: url('fonts/icon.eot?1om04h');
+    src: url('fonts/icon.eot?1om04h#iefix') format('embedded-opentype'),
+        url('fonts/icon.ttf?1om04h') format('truetype'),
+        url('fonts/icon.woff?1om04h') format('woff'),
+        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';
-}
-.icon-Client_unpaid:before {
-    content: '\e925';
+    content: '\e98c';
 }
 .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';
-}
-.icon-agency:before {
-    content: '\e92a';
+    content: '\e908';
 }
 .icon-agency:before {
     content: '\e92a';
 }
 .icon-agency-term:before {
-    content: '\e92b';
-}
-.icon-albaran:before {
-    content: '\e92c';
+    content: '\e909';
 }
 .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 {
-    content: '\e93b';
-}
-.icon-transaction:before {
-    content: '\e93b';
-}
-.icon-treatments:before {
+.icon-calc_volum .path3:before {
     content: '\e91c';
+    margin-left: -1em;
+    color: rgb(0, 0, 0);
 }
-.icon-trolley:before {
-    content: '\e91a';
-}
-.icon-troncales:before {
-    content: '\e91b';
-}
-.icon-unavailable:before {
+.icon-calc_volum .path4: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/filters/dateRange.js

@@ -1,7 +1,7 @@
 export default function dateRange(value) {
     const minHour = new Date(value);
     minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date(value);
+    const maxHour = new Date();
     maxHour.setHours(23, 59, 59, 59);
 
     return [minHour, maxHour];

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
@@ -32,6 +33,7 @@ globals:
     confirm: Confirm
     assign: Assign
     back: Back
+    downloadPdf: Download PDF
     yes: 'Yes'
     no: 'No'
     noChanges: No changes to save
@@ -104,6 +106,7 @@ globals:
     now: Now
     name: Name
     new: New
+    comment: Comment
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -271,6 +274,7 @@ customer:
         tableVisibleColumns:
             id: Identifier
             name: Name
+            socialName: Social name
             fi: Tax number
             salesPersonFk: Salesperson
             credit: Credit
@@ -828,6 +832,7 @@ worker:
         calendar: Calendar
         timeControl: Time control
         locker: Locker
+
     list:
         name: Name
         email: Email
@@ -859,6 +864,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
+        fiDueDate: Fecha de caducidad del DNI
+        sex: Sexo
+        seniority: Antigüedad
+        fi: DNI/NIE/NIF
+        birth: Fecha de nacimiento
+        isFreelance: Autónomo
+        isSsDiscounted: Bonificación SS
+        hasMachineryAuthorized: Autorizado para llevar maquinaria
+        isDisable: Trabajador desactivado
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -1236,16 +1250,10 @@ item/itemType:
         itemType: Item type
         basicData: Basic data
         summary: Summary
-zone:
-    pageTitles:
-        zones: Zone
-        zonesList: Zones
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
 monitor:
     pageTitles:
-        monitors: Monitores
-        list: Listado
+        monitors: Monitors
+        list: List
 components:
     topbar: {}
     itemsFilterPanel:

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
@@ -59,6 +60,7 @@ globals:
     amount: Importe
     packages: Bultos
     download: Descargar
+    downloadPdf: Descargar PDF
     selectRows: 'Seleccionar las { numberRows } filas(s)'
     allRows: 'Todo { numberRows } filas(s)'
     markAll: Marcar todo
@@ -104,6 +106,7 @@ globals:
     now: Ahora
     name: Nombre
     new: Nuevo
+    comment: Comentario
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -269,6 +272,7 @@ customer:
         tableVisibleColumns:
             id: Identificador
             name: Nombre
+            socialName: Razón social
             fi: NIF / CIF
             salesPersonFk: Comercial
             credit: Crédito

src/pages/Agency/Card/AgencyCard.vue

@@ -1,34 +1,14 @@
 <script setup>
-import { onMounted, watch } from 'vue';
-import { useRoute } from 'vue-router';
-import { useArrayData } from 'src/composables/useArrayData';
-
 import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
-
-const route = useRoute();
-const arrayData = useArrayData('Agency', {
-    url: `Agencies/${route.params.id}`,
-});
-const { store } = arrayData;
-onMounted(async () => await arrayData.fetch({ append: false }));
-watch(
-    () => route.params.id,
-    async (newId) => {
-        if (newId) {
-            store.url = `Agencies/${newId}`;
-            await arrayData.fetch({ append: false });
-        }
-    }
-);
 </script>
 <template>
     <VnCard
         data-key="Agency"
         base-url="Agencies"
         :descriptor="AgencyDescriptor"
-        searchbar-data-key="AgencyList"
-        searchbar-url="Agencies"
+        search-data-key="AgencyList"
+        search-url="Agencies"
         searchbar-label="agency.searchBar.label"
         searchbar-info="agency.searchBar.info"
     />

src/pages/Agency/Card/AgencyDescriptor.vue

@@ -15,8 +15,8 @@ const props = defineProps({
 });
 
 const { t } = useI18n();
-const { params } = useRoute();
-const entityId = computed(() => props.id || params.id);
+const route = useRoute();
+const entityId = computed(() => props.id || route.params.id);
 const { store } = useArrayData('Parking');
 const card = computed(() => store.data);
 </script>

src/pages/Agency/Card/AgencySummary.vue

@@ -3,26 +3,13 @@ import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'src/components/FetchData.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-const { params } = useRoute();
+const $props = defineProps({ id: { type: Number, default: 0 } });
 const { t } = useI18n();
-const entityId = computed(() => $props.id || params.id);
-
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
+const entityId = computed(() => $props.id || useRoute().params.id);
 </script>
 
 <template>

src/pages/Claim/Card/ClaimAction.vue

@@ -201,30 +201,7 @@ async function post(query, params) {
         auto-load
         @on-fetch="(data) => (destinationTypes = data)"
     />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="300"
-        show-if-above
-        v-if="claim"
-    >
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted() && claim">
         <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
             {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
         </QCard>
@@ -274,7 +251,7 @@ async function post(query, params) {
                 v-model="multiplicatorValue"
             />
         </QCard>
-    </QDrawer>
+    </Teleport>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
     <CrudModel
         v-if="claim"

src/pages/Claim/Card/ClaimCard.vue

@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
+import ClaimFilter from '../ClaimFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Claim"
         base-url="Claims"
         :descriptor="ClaimDescriptor"
-        searchbar-data-key="ClaimList"
-        searchbar-url="Claims/filter"
+        :filter-panel="ClaimFilter"
+        search-data-key="ClaimList"
+        search-url="Claims/filter"
         searchbar-label="Search claim"
         searchbar-info="You can search by claim id or customer name"
     />

src/pages/Claim/ClaimList.vue

@@ -12,7 +12,6 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { getUrl } from 'src/composables/getUrl';
 
 const stateStore = useStateStore();
 const router = useRouter();

src/pages/Customer/Card/CustomerAddress.vue

@@ -202,9 +202,9 @@ const toCustomerAddressEdit = (addressId) => {
 
                     <div v-if="item.observations.length">
                         <div
-                            :key="index"
+                            :key="obIndex"
                             class="flex q-mb-sm"
-                            v-for="(observation, index) in item.observations"
+                            v-for="(observation, obIndex) in item.observations"
                         >
                             <div class="text-weight-bold q-mr-sm">
                                 {{ observation.observationType.description }}:

src/pages/Customer/Card/CustomerBalance.vue

@@ -11,6 +11,7 @@ import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { useValidator } from 'src/composables/useValidator';
 import { usePrintService } from 'src/composables/usePrintService';
+import { useSession } from 'src/composables/useSession';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -19,6 +20,9 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+const session = useSession();
+
+const tokenMultimedia = session.getTokenMultimedia();
 
 const { sendEmail } = usePrintService();
 const { t } = useI18n();
@@ -188,6 +192,11 @@ const saveFieldValue = async (row) => {
 const sendEmailAction = () => {
     sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`);
 };
+
+const showBalancePdf = (balance) => {
+    const url = `api/InvoiceOuts/${balance.id}/download?access_token=${tokenMultimedia}`;
+    window.open(url, '_blank');
+};
 </script>
 
 <template>
@@ -257,17 +266,28 @@ const sendEmailAction = () => {
                     <QTd align="center">
                         <QIcon
                             @click.stop="showDialog = true"
-                            class="q-ml-md"
+                            class="q-ml-md fill-icon"
                             color="primary"
                             name="outgoing_mail"
                             size="sm"
-                            style="font-variation-settings: 'FILL' 1"
                             v-if="row.isCompensation"
                         >
                             <QTooltip>
                                 {{ t('Send compensation') }}
                             </QTooltip>
                         </QIcon>
+                        <QIcon
+                            @click="showBalancePdf(row)"
+                            class="q-ml-md fill-icon"
+                            color="primary"
+                            name="cloud_download"
+                            size="sm"
+                            v-if="row.hasPdf"
+                        >
+                            <QTooltip>
+                                {{ t('globals.downloadPdf') }}
+                            </QTooltip>
+                        </QIcon>
 
                         <QDialog v-model="showDialog">
                             <QCard class="q-pa-sm">

src/pages/Customer/Card/CustomerCard.vue

@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
+import CustomerFilter from '../CustomerFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
-        searchbar-data-key="CustomerList"
-        searchbar-url="Clients/filter"
+        :filter-panel="CustomerFilter"
+        search-data-key="CustomerList"
+        search-url="Clients/filter"
         searchbar-label="Search customer"
         searchbar-info="You can search by customer id or name"
     />

src/pages/Customer/Card/CustomerCreditContracts.vue

@@ -105,7 +105,7 @@ const updateData = () => {
                                             color="primary"
                                             name="lock"
                                             size="md"
-                                            style="font-variation-settings: 'FILL' 1"
+                                            class="fill-icon"
                                         >
                                             <QTooltip>{{ t('Close contract') }}</QTooltip>
                                         </QIcon>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -102,22 +102,24 @@ function handleLocation(data, location) {
                 </VnLocation>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox :label="t('Active')" v-model="data.isActive" />
                 <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
-                <QCheckbox :label="t('Vies')" v-model="data.isVies" />
-                <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                    <QTooltip>
-                        {{ t('whenActivatingIt') }}
-                    </QTooltip>
-                </QIcon>
+                <div>
+                    <QCheckbox :label="t('Vies')" v-model="data.isVies" />
+                    <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                        <QTooltip>
+                            {{ t('whenActivatingIt') }}
+                        </QTooltip>
+                    </QIcon>
+                </div>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox :label="t('Notify by email')" v-model="data.isToBeMailed" />
                 <QCheckbox
                     :label="t('Invoice by address')"
@@ -125,17 +127,22 @@ function handleLocation(data, location) {
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
-                <QCheckbox :label="t('Is equalizated')" v-model="data.isEqualizated" />
-                <QIcon class="cursor-info q-ml-sm" name="info" size="sm">
-                    <QTooltip>
-                        {{ t('inOrderToInvoice') }}
-                    </QTooltip>
-                </QIcon>
+            <VnRow>
+                <div>
+                    <QCheckbox
+                        :label="t('Is equalizated')"
+                        v-model="data.isEqualizated"
+                    />
+                    <QIcon class="cursor-info q-ml-sm" name="info" size="sm">
+                        <QTooltip>
+                            {{ t('inOrderToInvoice') }}
+                        </QTooltip>
+                    </QIcon>
+                </div>
                 <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox
                     :label="t('Incoterms authorization')"
                     v-model="data.hasIncoterms"

src/pages/Customer/Card/CustomerGreuges.vue

@@ -1,20 +1,17 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
-
+import { useRoute } from 'vue-router';
 import { QBtn } from 'quasar';
-
+import { useStateStore } from 'src/stores/useStateStore';
 import { toCurrency } from 'src/filters';
 import { toDateTimeFormat } from 'src/filters/date';
-
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
-
+const stateStore = computed(() => useStateStore());
 const rows = ref([]);
 const totalAmount = ref(0);
 
@@ -105,28 +102,40 @@ const columns = computed(() => [
 
 const setRows = (data) => {
     rows.value = data;
-    totalAmount.value = data.reduce((accumulator, currentValue) => {
-        return accumulator + currentValue.amount;
-    }, 0);
-};
-
-const toCustomerGreugeCreate = () => {
-    router.push({ name: 'CustomerGreugeCreate' });
+    totalAmount.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
 </script>
 
 <template>
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
-
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
+        <QCard class="full-width q-pa-sm">
+            <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount">
+                <span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
+                {{ toCurrency(totalAmount) }}
+            </h6>
+            <QSkeleton v-else type="QInput" square />
+        </QCard>
+    </QDrawer>
     <div class="full-width flex justify-center">
         <QPage class="card-width q-pa-lg">
-            <QCard class="full-width q-pa-sm" v-if="totalAmount">
-                <h6 class="flex justify-end q-my-lg q-pr-lg">
-                    <span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
-                    {{ toCurrency(totalAmount) }}
-                </h6>
-            </QCard>
-
             <QCard class="q-pa-sm q-mt-md">
                 <QTable
                     :columns="columns"
@@ -164,7 +173,7 @@ const toCustomerGreugeCreate = () => {
     </div>
 
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerGreugeCreate()" color="primary" fab icon="add" />
+        <QBtn color="primary" fab icon="add" :to="{ name: 'CustomerGreugeCreate' }" />
         <QTooltip>
             {{ t('New greuge') }}
         </QTooltip>

src/pages/Customer/Card/CustomerWebAccess.vue

@@ -11,7 +11,6 @@ import useNotify from 'src/composables/useNotify';
 import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 

src/pages/Customer/Card/CustomerWebPayment.vue

@@ -7,7 +7,6 @@ import axios from 'axios';
 
 import { toCurrency, toDateHourMinSec } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
 import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
 import CustomerCheckIconTooltip from '../components/CustomerCheckIconTooltip.vue';
 

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -3,10 +3,10 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import { QBtn, QCheckbox, useQuasar } from 'quasar';
+import { useStateStore } from 'stores/useStateStore';
 
-import { toCurrency, toDate } from 'filters/index';
-
-import FetchData from 'components/FetchData.vue';
+import { toCurrency, toDate, dateRange } from 'filters/index';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -14,18 +14,20 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
+import axios from 'axios';
+const stateStore = useStateStore();
 
 const { t } = useI18n();
 const quasar = useQuasar();
+const dataRef = ref(null);
 
 const balanceDueTotal = ref(0);
 const selected = ref([]);
-const rows = ref([]);
 
 const tableColumnComponents = {
     client: {
         component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
         event: () => {},
     },
     isWorker: {
@@ -38,7 +40,12 @@ const tableColumnComponents = {
     },
     salesPerson: {
         component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
+        event: () => {},
+    },
+    department: {
+        component: 'span',
+        props: () => {},
         event: () => {},
     },
     country: {
@@ -58,7 +65,7 @@ const tableColumnComponents = {
     },
     author: {
         component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
         event: () => {},
     },
     lastObservation: {
@@ -81,6 +88,16 @@ const tableColumnComponents = {
         props: () => {},
         event: () => {},
     },
+    finished: {
+        component: QCheckbox,
+
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.value,
+            class: 'disabled-checkbox',
+        }),
+        event: () => {},
+    },
 };
 
 const columns = computed(() => [
@@ -104,6 +121,13 @@ const columns = computed(() => [
         name: 'salesPerson',
         sortable: true,
     },
+    {
+        align: 'left',
+        field: 'departmentName',
+        label: t('Department'),
+        name: 'department',
+        sortable: true,
+    },
     {
         align: 'left',
         field: 'country',
@@ -165,41 +189,102 @@ const columns = computed(() => [
         name: 'from',
         sortable: true,
     },
+    {
+        align: 'left',
+        field: 'finished',
+        label: t('Has recover'),
+        name: 'finished',
+    },
 ]);
 
-const setRows = (data) => {
-    rows.value = data;
-    balanceDueTotal.value = data.reduce((accumulator, currentValue) => {
-        return accumulator + (currentValue['amount'] || 0);
-    }, 0);
-};
-
 const viewAddObservation = (rowsSelected) => {
     quasar.dialog({
         component: CustomerDefaulterAddObservation,
         componentProps: {
             clients: rowsSelected,
-            promise: refreshData,
+            promise: async () => await dataRef.value.fetch(),
         },
     });
 };
 
-const refreshData = () => {
-    setRows();
+const departments = ref(new Map());
+
+const onFetch = async (data) => {
+    const salesPersonFks = data.map((item) => item.salesPersonFk);
+    const departmentNames = salesPersonFks.map(async (salesPersonFk) => {
+        try {
+            const { data: workerDepartment } = await axios.get(
+                `WorkerDepartments/${salesPersonFk}`
+            );
+            const { data: department } = await axios.get(
+                `Departments/${workerDepartment.departmentFk}`
+            );
+            departments.value.set(salesPersonFk, department.name);
+        } catch (error) {
+            console.error('Err: ', error);
+        }
+    });
+    const recoveryData = await axios.get('Recoveries');
+
+    const recoveries = recoveryData.data.map(({ clientFk, finished }) => ({
+        clientFk,
+        finished,
+    }));
+
+    await Promise.all(departmentNames);
+
+    data.forEach((item) => {
+        item.departmentName = departments.value.get(item.salesPersonFk);
+        item.isWorker = item.businessTypeFk === 'worker';
+        const recovery = recoveries.find(({ clientFk }) => clientFk === item.clientFk);
+        item.finished = recovery?.finished === null;
+    });
+
+    for (const element of data) element.isWorker = element.businessTypeFk === 'worker';
+
+    balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
 
-const onFetch = (data) => {
-    for (const element of data) {
-        element.isWorker = element.businessTypeFk === 'worker';
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'clientFk':
+            return { [`d.${param}`]: value?.id };
+        case 'creditInsurance':
+        case 'amount':
+        case 'workerFk':
+        case 'departmentFk':
+        case 'countryFk':
+        case 'payMethod':
+        case 'salesPersonFk':
+            return { [`d.${param}`]: value };
+        case 'date':
+            return { 'd.created': { between: dateRange(value) } };
+        case 'defaulterSinced':
+            return { 'd.defaulterSinced': { between: dateRange(value) } };
     }
-    rows.value = data;
-};
+}
 </script>
 
 <template>
-    <FetchData :filter="filter" @on-fetch="onFetch" auto-load url="Defaulters/filter" />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
 
-    <QDrawer side="right" :width="256" show-if-above>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerNotificationsFilter data-key="CustomerDefaulter" />
         </QScrollArea>
@@ -214,69 +299,107 @@ const onFetch = (data) => {
                     icon="vn:notes"
                     :disabled="!selected.length"
                     @click.stop="viewAddObservation(selected)"
-                />
+                >
+                    <QTooltip>{{ t('Add observation') }}</QTooltip>
+                </QBtn>
             </div>
         </template>
     </VnSubToolbar>
-
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="clientFk"
-            selection="multiple"
-            v-model:selected="selected"
+        <VnPaginate
+            ref="dataRef"
+            @on-fetch="onFetch"
+            data-key="CustomerDefaulter"
+            :filter="filter"
+            :expr-builder="exprBuilder"
+            auto-load
+            url="Defaulters/filter"
         >
-            <template #header="props">
-                <QTr :props="props" class="bg">
-                    <QTh>
-                        <QCheckbox v-model="props.selected" />
-                    </QTh>
-                    <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                        {{ t(col.label) }}
-                        <QTooltip v-if="col.tooltip">{{ col.tooltip }}</QTooltip>
-                    </QTh>
-                </QTr>
-            </template>
+            <template #body="{ rows }">
+                <div class="q-pa-md">
+                    <QTable
+                        :columns="columns"
+                        :rows="rows"
+                        class="full-width"
+                        row-key="clientFk"
+                        selection="multiple"
+                        v-model:selected="selected"
+                    >
+                        <template #header="props">
+                            <QTr :props="props" class="bg" style="min-height: 200px">
+                                <QTh>
+                                    <QCheckbox v-model="props.selected" />
+                                </QTh>
+                                <QTh
+                                    v-for="col in props.cols"
+                                    :key="col.name"
+                                    :props="props"
+                                >
+                                    {{ t(col.label) }}
+                                    <QTooltip v-if="col.tooltip">{{
+                                        col.tooltip
+                                    }}</QTooltip>
+                                </QTh>
+                            </QTr>
+                        </template>
 
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                        >
-                            <template v-if="props.col.name !== 'isWorker'">
-                                <div v-if="props.col.name === 'lastObservation'">
-                                    <VnInput
-                                        type="textarea"
-                                        v-model="props.value"
-                                        autogrow
-                                    />
-                                </div>
-                                <div v-else>{{ props.value }}</div>
-                            </template>
+                        <template #body-cell="props">
+                            <QTd :props="props">
+                                <QTr :props="props" class="cursor-pointer">
+                                    <component
+                                        :is="
+                                            tableColumnComponents[props.col.name]
+                                                .component
+                                        "
+                                        class="col-content"
+                                        v-bind="
+                                            tableColumnComponents[props.col.name].props(
+                                                props
+                                            )
+                                        "
+                                        @click="
+                                            tableColumnComponents[props.col.name].event(
+                                                props
+                                            )
+                                        "
+                                    >
+                                        <template v-if="typeof props.value !== 'boolean'">
+                                            <div
+                                                v-if="
+                                                    props.col.name === 'lastObservation'
+                                                "
+                                            >
+                                                <VnInput
+                                                    type="textarea"
+                                                    v-model="props.value"
+                                                    readonly
+                                                    dense
+                                                    rows="2"
+                                                />
+                                            </div>
+                                            <div v-else>{{ props.value }}</div>
+                                        </template>
 
-                            <WorkerDescriptorProxy
-                                :id="props.row.salesPersonFk"
-                                v-if="props.col.name === 'salesPerson'"
-                            />
-                            <WorkerDescriptorProxy
-                                :id="props.row.workerFk"
-                                v-if="props.col.name === 'author'"
-                            />
-                            <CustomerDescriptorProxy
-                                :id="props.row.clientFk"
-                                v-if="props.col.name === 'client'"
-                            />
-                        </component>
-                    </QTr>
-                </QTd>
+                                        <WorkerDescriptorProxy
+                                            :id="props.row.salesPersonFk"
+                                            v-if="props.col.name === 'salesPerson'"
+                                        />
+                                        <WorkerDescriptorProxy
+                                            :id="props.row.workerFk"
+                                            v-if="props.col.name === 'author'"
+                                        />
+                                        <CustomerDescriptorProxy
+                                            :id="props.row.clientFk"
+                                            v-if="props.col.name === 'client'"
+                                        />
+                                    </component>
+                                </QTr>
+                            </QTd>
+                        </template>
+                    </QTable>
+                </div>
             </template>
-        </QTable>
+        </VnPaginate>
     </QPage>
 </template>
 
@@ -289,9 +412,11 @@ const onFetch = (data) => {
 
 <i18n>
 es:
+    Add observation:  Añadir observación
     Client: Cliente
     Is worker: Es trabajador
     Salesperson: Comercial
+    Department: Departamento
     Country: País
     P. Method: F. Pago
     Pay method: Forma de pago

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -45,11 +45,10 @@ const authors = ref();
             </div>
         </template>
 
-        <template #body="{ params }">
-            <QItem class="q-mb-sm q-mt-sm">
+        <template #body="{ params, searchFn }">
+            <QItem class="q-mb-sm">
                 <QItemSection v-if="clients">
                     <VnSelect
-                        :input-debounce="0"
                         :label="t('Client')"
                         :options="clients"
                         dense
@@ -57,11 +56,13 @@ const authors = ref();
                         hide-selected
                         map-options
                         option-label="name"
-                        option-value="clientTypeFk"
+                        option-value="id"
                         outlined
                         rounded
                         use-input
                         v-model="params.clientFk"
+                        @update:model-value="searchFn()"
+                        auto-load
                     />
                 </QItemSection>
                 <QItemSection v-else>
@@ -85,6 +86,7 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.salesPersonFk"
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection v-else>
@@ -108,6 +110,7 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.countryFk"
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection v-else>
@@ -153,6 +156,7 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.workerFk"
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection v-else>
@@ -162,7 +166,7 @@ const authors = ref();
 
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput
+                    <VnInputDate
                         :label="t('L. O. Date')"
                         clearable
                         is-outlined

src/pages/Customer/ExtendedList/CustomerExtendedList.vue

@@ -10,7 +10,7 @@ import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
 import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
@@ -37,8 +37,6 @@ onMounted(() => {
     allColumnNames.value = filteredColumns.map((col) => col.name);
 });
 
-const rows = computed(() => arrayData.value.store.data);
-
 const selectedCustomerId = ref(0);
 const selectedSalesPersonId = ref(0);
 const allColumnNames = ref([]);
@@ -70,6 +68,11 @@ const tableColumnComponents = {
         props: () => {},
         event: () => {},
     },
+    socialName: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
     fi: {
         component: 'span',
         props: () => {},
@@ -283,6 +286,12 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.name'),
         name: 'name',
     },
+    {
+        align: 'left',
+        field: 'socialName',
+        label: t('customer.extendedList.tableVisibleColumns.socialName'),
+        name: 'socialName',
+    },
     {
         align: 'left',
         field: 'fi',
@@ -485,6 +494,23 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport></template
+    >
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerExtendedListFilter
@@ -495,7 +521,7 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
         </QScrollArea>
     </QDrawer>
     <VnSubToolbar>
-        <template #st-actions>
+        <template #st-data>
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="clientsDetail"
@@ -508,58 +534,97 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
     </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-            :visible-columns="visibleColumns"
-            @row-click="(evt, row, id) => navigateToTravelId(row.id)"
+        <VnPaginate
+            data-key="CustomerExtendedList"
+            url="Clients/extendedListFilter"
+            auto-load
         >
-            <template #body-cell="{ col, value }">
-                <QTd @click="stopEventPropagation($event, col)">
-                    {{ value }}
-                </QTd>
-            </template>
-            <template #body-cell-id="props">
-                <QTd @click="stopEventPropagation($event, props.col)">
-                    <component
-                        :is="tableColumnComponents[props.col.name].component"
-                        class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
+            <template #body="{ rows }">
+                <div class="q-pa-md">
+                    <QTable
+                        :columns="columns"
+                        :rows="rows"
+                        class="full-width q-mt-md"
+                        row-key="id"
+                        :visible-columns="visibleColumns"
+                        @row-click="(evt, row, id) => navigateToTravelId(row.id)"
                     >
-                        <CustomerDescriptorProxy :id="props.row.id" />
-                        {{ props.row.id }}
-                    </component>
-                </QTd>
+                        <template #body-cell="{ col, value }">
+                            <QTd @click="stopEventPropagation($event, col)">
+                                {{ value }}
+                            </QTd>
+                        </template>
+                        <template #body-cell-customerStatus="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    class="col-content"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                >
+                                </component>
+                            </QTd>
+                        </template>
+                        <template #body-cell-id="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    class="col-content"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                >
+                                    <CustomerDescriptorProxy :id="props.row.id" />
+                                    {{ props.row.id }}
+                                </component>
+                            </QTd>
+                        </template>
+                        <template #body-cell-salesPersonFk="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    v-if="props.row.salesPerson"
+                                    class="col-content"
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                >
+                                    <WorkerDescriptorProxy
+                                        :id="props.row.salesPersonFk"
+                                    />
+                                    {{ props.row.salesPerson }}
+                                </component>
+                                <span class="col-content" v-else>-</span>
+                            </QTd>
+                        </template>
+                        <template #body-cell-actions="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    class="col-content"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                />
+                            </QTd>
+                        </template>
+                    </QTable>
+                </div>
             </template>
-            <template #body-cell-salesPersonFk="props">
-                <QTd @click="stopEventPropagation($event, props.col)">
-                    <component
-                        v-if="props.row.salesPerson"
-                        class="col-content"
-                        :is="tableColumnComponents[props.col.name].component"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
-                    >
-                        <WorkerDescriptorProxy :id="props.row.salesPersonFk" />
-                        {{ props.row.salesPerson }}
-                    </component>
-                    <span class="col-content" v-else>-</span>
-                </QTd>
-            </template>
-            <template #body-cell-actions="props">
-                <QTd @click="stopEventPropagation($event, props.col)">
-                    <component
-                        :is="tableColumnComponents[props.col.name].component"
-                        class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
-                    />
-                </QTd>
-            </template>
-        </QTable>
+        </VnPaginate>
     </QPage>
 </template>
 

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -1,17 +1,16 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import { QBtn } from 'quasar';
-
-import FetchData from 'components/FetchData.vue';
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
 
+const stateStore = useStateStore();
 const { t } = useI18n();
-
-const rows = ref([]);
 const selected = ref([]);
 const selectedCustomerId = ref(0);
 
@@ -82,46 +81,82 @@ const selectCustomerId = (id) => {
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
-        url="Clients"
-    />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
 
-    <QDrawer side="right" :width="256" show-if-above>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerNotificationsFilter data-key="CustomerNotifications" />
         </QScrollArea>
     </QDrawer>
-
-    <VnSubToolbar />
-
+    <VnSubToolbar class="justify-end">
+        <template #st-data>
+            <CustomerNotificationsCampaignConsumption
+                :selected-rows="selected.length > 0"
+                :clients="selected"
+                :promise="refreshData"
+            />
+        </template>
+    </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-            selection="multiple"
-            v-model:selected="selected"
-        >
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                        >
-                            {{ props.value }}
-                            <CustomerDescriptorProxy :id="selectedCustomerId" />
-                        </component>
-                    </QTr>
-                </QTd>
+        <VnPaginate data-key="CustomerNotifications" url="Clients" auto-load>
+            <template #body="{ rows }">
+                <div class="q-pa-md">
+                    <QTable
+                        :columns="columns"
+                        :rows="rows"
+                        class="full-width q-mt-md"
+                        row-key="id"
+                        selection="multiple"
+                        v-model:selected="selected"
+                    >
+                        <template #body-cell="props">
+                            <QTd :props="props">
+                                <QTr :props="props" class="cursor-pointer">
+                                    <component
+                                        :is="
+                                            tableColumnComponents[props.col.name]
+                                                .component
+                                        "
+                                        class="col-content"
+                                        v-bind="
+                                            tableColumnComponents[props.col.name].props(
+                                                props
+                                            )
+                                        "
+                                        @click="
+                                            tableColumnComponents[props.col.name].event(
+                                                props
+                                            )
+                                        "
+                                    >
+                                        {{ props.value }}
+                                        <CustomerDescriptorProxy
+                                            :id="selectedCustomerId"
+                                        />
+                                    </component>
+                                </QTr>
+                            </QTd>
+                        </template>
+                    </QTable>
+                </div>
             </template>
-        </QTable>
+        </VnPaginate>
     </QPage>
 </template>
 
@@ -140,4 +175,5 @@ es:
     Phone: Teléfono
     City: Población
     Email: Email
+    Campaign consumption: Consumo campaña
 </i18n>

src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue

@@ -0,0 +1,152 @@
+<script setup>
+import { ref, toRefs } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify';
+import { useValidator } from 'src/composables/useValidator';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import FetchData from 'src/components/FetchData.vue';
+import { watch } from 'vue';
+import { onMounted } from 'vue';
+const $props = defineProps({
+    clients: {
+        type: Array,
+        required: true,
+    },
+    promise: {
+        type: Function,
+        required: true,
+    },
+    selectedRows: {
+        type: Boolean,
+    },
+});
+
+const { selectedRows } = toRefs($props);
+const { notify } = useNotify();
+const { t } = useI18n();
+const validationsStore = useValidator();
+const campaignParams = ref(null);
+const campaignsOptions = ref(null);
+const moreFields = ref([]);
+const popupProxyRef = ref(null);
+const upcomingOptions = ref(null);
+const campaignChange = ({ name }) => {
+    const campaign = campaignsOptions.value.find((c) => c.code === name);
+    handleDates(campaign);
+};
+const handleDates = (campaign) => {
+    const from = new Date(campaign.dated);
+    from.setDate(from.getDate() - campaign.scopeDays);
+    campaignParams.value = {
+        code: campaign.code,
+        from: from,
+        to: campaign.dated,
+    };
+};
+watch(selectedRows, () => {
+    handleDates(upcomingOptions.value);
+});
+const onSubmit = async () => {
+    try {
+        const data = {
+            clients: $props.clients.map((item) => item.id),
+            from: campaignParams.value.from,
+            to: campaignParams.value.to,
+        };
+        const params = JSON.stringify(data);
+        await axios.post('ClientConsumptionQueues', { params });
+
+        notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
+    } catch (error) {
+        notify(error.message, 'negative');
+    }
+};
+
+onMounted(async () => {
+    const { models } = validationsStore;
+    const properties = models.Item?.properties || {};
+    const _moreFields = ['valentinesDay', 'mothersDay', 'allSaints'];
+
+    _moreFields.forEach((field) => {
+        let prop = properties[field];
+        const label = t(`params.${field}`);
+        moreFields.value.push({
+            name: field,
+            label,
+            type: prop ? prop.type : null,
+        });
+    });
+});
+</script>
+
+<template>
+    <FetchData
+        url="Campaigns/latest"
+        @on-fetch="(data) => (campaignsOptions = data)"
+        :filter="{ fields: ['id', 'code', 'dated'], order: 'code ASC', limit: 30 }"
+        auto-load
+    />
+    <FetchData
+        url="Campaigns/upcoming"
+        @on-fetch="(data) => (upcomingOptions = data)"
+        auto-load
+    />
+    <QBtn color="primary" icon="show_chart" :disable="!selectedRows">
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :options="moreFields"
+                        option-value="code"
+                        option-label="label"
+                        v-model="campaignParams.code"
+                        :label="t('Campaign')"
+                        @update:model-value="campaignChange"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInputDate v-model="campaignParams.from" :label="t('From')" />
+                    <VnInputDate v-model="campaignParams.to" :label="t('To')" />
+                </VnRow>
+                <div class="q-mt-lg row justify-end">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        color="primary"
+                        flat
+                        class="q-mr-md"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :label="t('globals.save')"
+                        type="submit"
+                        color="primary"
+                        @click="onSubmit()"
+                    />
+                </div>
+            </QCard>
+        </QPopupProxy>
+        <QTooltip>{{ t('Campaign consumption') }}</QTooltip>
+    </QBtn>
+</template>
+
+<i18n>
+    en:
+        params:
+            valentinesDay: Valentine's Day
+            mothersDay: Mother's Day
+            allSaints: All Saints' Day
+    es:
+        params:
+            valentinesDay: Día de San Valentín
+            mothersDay: Día de la Madre
+            allSaints: Día de Todos los Santos
+        Campaign consumption: Consumo campaña
+        Campaign: Campaña
+        From: Desde
+        To: Hasta
+</i18n>

src/pages/Customer/Payments/CustomerPayments.vue

@@ -110,13 +110,7 @@ function stateColor(row) {
             </div>
         </Teleport>
     </template>
-    <QDrawer
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        show-if-above
-        :breakpoint="1600"
-    >
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerPaymentsFilter data-key="CustomerTransactions" />
         </QScrollArea>

src/pages/Customer/components/CustomerAddressCreate.vue

@@ -11,7 +11,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -11,7 +11,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();

src/pages/Customer/components/CustomerNewCustomsAgent.vue

@@ -1,5 +1,4 @@
 <script setup>
-import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnRow from 'components/ui/VnRow.vue';

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-
+import { useVnConfirm } from 'composables/useVnConfirm';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import useCardDescription from 'src/composables/useCardDescription';
@@ -43,30 +43,17 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.name, entity.id);
 };
 
-const removeDepartment = () => {
-    quasar
-        .dialog({
-            title: 'Are you sure you want to delete it?',
-            message: 'Delete department',
-            ok: {
-                push: true,
-                color: 'primary',
-            },
-            cancel: true,
-        })
-        .onOk(async () => {
-            try {
-                await axios.post(
-                    `/Departments/${entityId.value}/removeChild`,
-                    entityId.value
-                );
-                router.push({ name: 'WorkerDepartment' });
-                notify('department.departmentRemoved', 'positive');
-            } catch (err) {
-                console.error('Error removing department');
-            }
-        });
+const removeDepartment = async () => {
+    try {
+        await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
+        router.push({ name: 'WorkerDepartment' });
+        notify('department.departmentRemoved', 'positive');
+    } catch (err) {
+        console.error('Error removing department');
+    }
 };
+
+const { openConfirmationModal } = useVnConfirm();
 </script>
 <template>
     <CardDescriptor
@@ -84,7 +71,17 @@ const removeDepartment = () => {
         "
     >
         <template #menu="{}">
-            <QItem v-ripple clickable @click="removeDepartment()">
+            <QItem
+                v-ripple
+                clickable
+                @click="
+                    openConfirmationModal(
+                        t('Are you sure you want to delete it?'),
+                        t('Delete department'),
+                        removeDepartment
+                    )
+                "
+            >
                 <QItemSection>{{ t('Delete') }}</QItemSection>
             </QItem>
         </template>

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

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

src/pages/Entry/Card/EntrySummary.vue

@@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
@@ -339,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

@@ -12,6 +12,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate, toCurrency } from 'src/filters';
@@ -636,18 +637,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (intrastatOptions = data)"
     />
-    <QToolbar class="justify-end">
-        <div id="st-data">
+    <VnSubToolbar>
+        <template #st-data>
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="latestBuys"
                 labels-traductions-path="entry.latestBuys"
                 @on-config-saved="visibleColumns = ['picture', ...$event]"
             />
-        </div>
+        </template>
         <QSpace />
         <div id="st-actions"></div>
-    </QToolbar>
+    </VnSubToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <EntryLatestBuysFilter data-key="EntryLatestBuys" />
@@ -706,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

@@ -3,25 +3,27 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
+import axios from 'axios';
 import { useArrayData } from 'src/composables/useArrayData';
 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 axios from 'axios';
+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(() => arrayData.store.data);
+const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
 const userConfig = ref(null);
+const invoiceId = computed(() => +route.params.id);
 
+const expenses = ref([]);
 const currencies = ref([]);
 const currenciesRef = ref();
 const companies = ref([]);
@@ -32,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 {
@@ -174,14 +173,20 @@ 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"
-        :url="`InvoiceIns/${route.params.id}`"
-        model="invoiceIn"
-        :auto-load="true"
+        model="InvoiceIn"
+        :go-to="`/invoice-in/${invoiceId}/vat`"
+        auto-load
+        :url-update="`InvoiceIns/${invoiceId}/updateInvoiceIn`"
     >
         <template #form="{ data }">
-            <div class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('supplierFk')"
                     v-model="data.supplierFk"
@@ -202,77 +207,37 @@ async function upsert() {
                         </QItem>
                     </template>
                 </VnSelect>
-                <QInput
+                <VnInput
                     clearable
                     clear-icon="close"
                     :label="t('Supplier ref')"
                     v-model="data.supplierRef"
                 />
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <QInput
-                    :label="t('Expedition date')"
-                    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
+            </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('Expedition date')" v-model="data.issued" />
+                <VnInputDate
                     :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" :mask="dateMask">
-                                    <div class="row items-center justify-end">
-                                        <QBtn
-                                            v-close-popup
-                                            label="Close"
-                                            color="primary"
-                                            flat
-                                        />
-                                    </div>
-                                </QDate>
-                            </QPopupProxy>
-                        </QIcon>
-                    </template>
-                </QInput>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <QInput
+                />
+            </VnRow>
+            <VnRow>
+                <VnSelect
                     :label="t('Undeductible VAT')"
                     v-model="data.deductibleExpenseFk"
-                    clearable
-                    clear-icon="close"
-                />
-                <QInput
+                    :options="expenses"
+                    option-value="id"
+                    option-label="id"
+                    :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
@@ -317,69 +282,13 @@ async function upsert() {
                             <QTooltip>{{ t('Create document') }}</QTooltip>
                         </QBtn>
                     </template>
-                </QInput>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <QInput
-                    :label="t('Entry date')"
-                    v-model="data.bookEntried"
-                    clearable
-                    clear-icon="close"
-                    :mask="dateMask"
-                    :fill-mask="fillMask"
-                >
-                    <template #append>
-                        <QIcon name="event" class="cursor-pointer">
-                            <QPopupProxy
-                                cover
-                                transition-show="scale"
-                                transition-hide="scale"
-                            >
-                                <QDate v-model="data.bookEntried" :mask="dateMask">
-                                    <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('Accounted date')"
-                    v-model="data.booked"
-                    clearable
-                    clear-icon="close"
-                    :mask="dateMask"
-                    :fill-mask="fillMask"
-                >
-                    <template #append>
-                        <QIcon name="event" class="cursor-pointer">
-                            <QPopupProxy
-                                cover
-                                transition-show="scale"
-                                transition-hide="scale"
-                            >
-                                <QDate v-model="data.booked" :mask="maskDate">
-                                    <div class="row items-center justify-end">
-                                        <QBtn
-                                            v-close-popup
-                                            label="Close"
-                                            color="primary"
-                                            flat
-                                        />
-                                    </div>
-                                </QDate>
-                            </QPopupProxy>
-                        </QIcon>
-                    </template>
-                </QInput>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
+                </VnInput>
+            </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('Entry date')" v-model="data.bookEntried" />
+                <VnInputDate :label="t('Accounted date')" v-model="data.booked" />
+            </VnRow>
+            <VnRow>
                 <VnSelect
                     :label="t('Currency')"
                     v-model="data.currencyFk"
@@ -387,6 +296,7 @@ async function upsert() {
                     option-value="id"
                     option-label="code"
                 />
+
                 <VnSelect
                     v-if="companiesRef"
                     :label="t('Company')"
@@ -395,13 +305,16 @@ async function upsert() {
                     option-value="id"
                     option-label="code"
                 />
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <QCheckbox
-                    :label="t('invoiceIn.summary.booked')"
-                    v-model="data.isBooked"
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    :label="t('invoiceIn.summary.sage')"
+                    v-model="data.withholdingSageFk"
+                    :options="sageWithholdings"
+                    option-value="id"
+                    option-label="withholding"
                 />
-            </div>
+            </VnRow>
         </template>
     </FormModel>
     <QDialog ref="editDmsRef">
@@ -417,7 +330,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"
@@ -426,45 +339,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
-                        class="full-width q-pa-xs"
+                    <VnInput
+                        :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>
@@ -528,7 +441,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"
@@ -540,7 +453,7 @@ async function upsert() {
                         :options="companies"
                         option-value="id"
                         option-label="code"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                     />
                 </QItem>
                 <QItem>
@@ -551,7 +464,7 @@ async function upsert() {
                         :options="warehouses"
                         option-value="id"
                         option-label="name"
-                        :rules="[requiredFieldRule]"
+                        :required="true"
                     />
                     <VnSelect
                         class="full-width q-pa-xs"
@@ -560,11 +473,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/InvoiceInCard.vue

@@ -1,6 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
+import InvoiceInFilter from '../InvoiceInFilter.vue';
 
 const filter = {
     include: [
@@ -25,8 +26,9 @@ const filter = {
         base-url="InvoiceIns"
         :filter="filter"
         :descriptor="InvoiceInDescriptor"
-        searchbar-data-key="InvoiceInList"
-        searchbar-url="InvoiceIns/filter"
+        :filter-panel="InvoiceInFilter"
+        search-data-key="InvoiceInList"
+        search-url="InvoiceIns/filter"
         searchbar-label="Search invoice"
         searchbar-info="You can search by invoice reference"
     />

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 route = useRoute();
+const { push, currentRoute } = useRouter();
 const { t } = useI18n();
 
-const invoiceId = route.params.id;
-const arrayData = useArrayData('InvoiceIn');
+const invoiceId = +currentRoute.value.params.id;
+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 { useRoute, useRouter } from 'vue-router';
+import { ref, reactive, computed, onBeforeMount } from 'vue';
+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({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
+const $props = defineProps({ id: { type: Number, default: null } });
+
+const { push, currentRoute } = useRouter();
 
-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: {
-        title: 'Are you sure you want to book this invoice?',
-        cb: checkToBook,
-        action: toBook,
+    unbook: {
+        title: t('assertAction', { action: t('unbook') }),
+        action: toUnbook,
     },
     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: {
-        cb: showPdfInvoice,
-    },
-    sendPdf: {
-        cb: sendPdfInvoiceConfirmation,
-    },
-    correct: {
-        cb: () => correctionDialogRef.value.show(),
-    },
+    showPdf: { cb: showPdfInvoice },
+    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(
-    () => route.params.id,
-    async (newId) => {
-        invoiceInCorrection.correcting.length = 0;
-        invoiceInCorrection.corrected = null;
-        if (newId) await setInvoiceCorrection(entityId.value);
-    }
-);
+onBeforeRouteLeave(async (to, from) => {
+    invoiceInCorrection.correcting.length = 0;
+    invoiceInCorrection.corrected = null;
+    if (to.params.id !== from.params.id) 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() {
-    let directBooking = true;
+async function toUnbook() {
+    const { data } = await axios.post(`InvoiceIns/${entityId.value}/toUnbook`);
+    const { isLinked, bookEntry, accountingEntries } = data;
 
-    const totals = await getTotals();
-    const taxableBaseNotEqualDueDay = totals.totalDueDay != totals.totalTaxableBase;
-    const vatNotEqualDueDay = totals.totalDueDay != totals.totalVat;
+    const type = isLinked ? 'warning' : 'positive';
+    const message = isLinked
+        ? t('isLinked', { bookEntry, accountingEntries })
+        : t('isNotLinked', { bookEntry });
 
-    if (taxableBaseNotEqualDueDay && vatNotEqualDueDay) directBooking = 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);
+    quasar.notify({ type, message });
+    if (!isLinked) store.data.isBooked = false;
 }
 
 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"
-        :subtitle="data.subtitle"
-        @on-fetch="setData"
-        data-key="invoiceInData"
+        title="supplierRef"
     >
         <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()"
@@ -395,25 +357,24 @@ const createInvoiceInCorrection = async () => {
             >
                 <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
             </QItem>
-            <QItem
-                v-if="entity.dmsFk"
-                v-ripple
-                clickable
-                @click="downloadFile(entity.dmsFk)"
-            >
-                <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
-            </QItem>
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoiceIn.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')"
-                :value="entity.supplier?.nickname"
+                :label="t('invoiceIn.card.amount')"
+                :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"
@@ -486,7 +447,7 @@ const createInvoiceInCorrection = async () => {
                             :options="siiTypeInvoiceOuts"
                             option-value="id"
                             option-label="code"
-                            :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                     </QItemSection>
                     <QItemSection>
@@ -496,7 +457,7 @@ const createInvoiceInCorrection = async () => {
                             :options="cplusRectificationTypes"
                             option-value="id"
                             option-label="description"
-                            :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                         <VnSelect
                             :label="`${useCapitalize(t('globals.reason'))}*`"
@@ -504,7 +465,7 @@ const createInvoiceInCorrection = async () => {
                             :options="invoiceCorrectionTypes"
                             option-value="id"
                             option-label="description"
-                            :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                     </QItemSection>
                 </QItem>
@@ -544,11 +505,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
@@ -560,4 +528,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 = {
-    where: {
-        invoiceInFk: invoiceId,
-    },
-};
+const filter = { 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 filter = {
-    where: {
-        invoiceInFk: route.params.id,
-    },
-};
-
+const invoiceInId = computed(() => +route.params.id);
+const filter = { where: { invoiceInFk: invoiceInId.value } };
 const columns = computed(() => [
     {
         name: 'code',
@@ -77,20 +72,15 @@ const columns = computed(() => [
     },
 ]);
 
-function getTotal(type) {
-    if (!invoceInIntrastat.value.length) return 0.0;
-    return invoceInIntrastat.value.reduce(
-        (total, intrastat) => total + intrastat[type],
-        0.0
-    );
-}
+const getTotal = (data, key) =>
+    data.reduce((acc, cur) => acc + +String(cur[key]).replace(',', '.'), 0);
 </script>
 <template>
     <FetchData
         url="Countries"
         auto-load
         @on-fetch="(data) => (countries = data)"
-        sort-by="country"
+        sort-by="name"
     />
     <FetchData
         url="Intrastats"
@@ -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
-            :data-required="{ invoiceInFk: route.params.id }"
+            :auto-load="!currency"
+            :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 () => {
-    salixUrl.value = await getUrl('');
-    invoiceInUrl.value = salixUrl.value + `invoiceIn/${entityId.value}/`;
-});
-
-const route = useRoute();
+const props = defineProps({ id: { type: [Number, String], default: 0 } });
 const { t } = useI18n();
+const route = useRoute();
 
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-
-const entityId = computed(() => $props.id || route.params.id);
-
-const salixUrl = ref();
+const entityId = computed(() => props.id || +route.params.id);
+const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
+const currency = computed(() => invoiceIn.value?.currency?.code);
 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) {
-    return (
+onMounted(async () => {
+    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) {
-    const totals = {
-        amount: intrastat.reduce((acc, cur) => acc + cur.amount, 0),
-        net: intrastat.reduce((acc, cur) => acc + cur.net, 0),
-        stems: intrastat.reduce((acc, cur) => acc + cur.stems, 0),
-    };
+    invoiceInIntrastat.forEach((val) => {
+        intrastatTotals.value.amount += val.amount;
+        intrastatTotals.value.net += val.net;
+        intrastatTotals.value.stems += val.stems;
+    });
+};
 
-    return totals;
-}
+const taxRate = (taxableBase = 0, rate = 0) => (rate / 100) * taxableBase;
 
-function getTaxTotal(tax) {
-    return tax.reduce(
-        (acc, cur) => acc + taxRate(cur.taxableBase, cur.taxTypeSage?.rate),
-        0
-    );
-}
+const getTotalTax = (tax) =>
+    tax.reduce((acc, cur) => acc + taxRate(cur.taxableBase, cur.taxTypeSage?.rate), 0);
 
-function setData(entity) {
-    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}`;
-}
+const getLink = (param) => `#/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 }">
-            <div>{{ invoiceIn.id }} - {{ invoiceIn.supplier?.name }}</div>
+        <template #header="{ entity }">
+            <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"
-                    :disable="true"
+                    :value="invoiceIn?.isBooked"
                 />
             </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
-                            :label="t('invoiceIn.summary.taxableBase')"
-                            :value="toCurrency(invoiceIn.totals.totalTaxableBase)"
-                        />
-                        <VnLv
-                            label="Total"
-                            :value="toCurrency(invoiceIn.totals.totalVat)"
-                        />
-                        <VnLv :label="t('invoiceIn.summary.dueTotal')">
-                            <template #value>
-                                <QChip
-                                    dense
-                                    class="q-pa-xs"
-                                    :color="amountsNotMatch ? 'negative' : 'transparent'"
-                                    :title="
-                                        amountsNotMatch
-                                            ? t('invoiceIn.summary.noMatch')
-                                            : t('invoiceIn.summary.dueTotal')
-                                    "
-                                >
-                                    {{ toCurrency(invoiceIn.totals.totalDueDay) }}
-                                </QChip>
-                            </template>
-                        </VnLv>
-                    </div>
+                    <VnLv
+                        :label="t('invoiceIn.summary.taxableBase')"
+                        :value="toCurrency(entity.totals.totalTaxableBase, currency)"
+                    />
+                    <VnLv
+                        label="Total"
+                        :value="toCurrency(entity.totals.totalVat, currency)"
+                    />
+                    <VnLv :label="t('invoiceIn.summary.dueTotal')">
+                        <template #value>
+                            <QChip
+                                dense
+                                class="q-pa-xs"
+                                :color="amountsNotMatch ? 'negative' : 'transparent'"
+                                :title="
+                                    amountsNotMatch
+                                        ? t('invoiceIn.summary.noMatch')
+                                        : t('invoiceIn.summary.dueTotal')
+                                "
+                            >
+                                {{ toCurrency(entity.totals.totalDueDay, currency) }}
+                            </QChip>
+                        </template>
+                    </VnLv>
                 </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">
-                        <QTr :props="props" class="bg">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                    <template #header="vatProps">
+                        <QTr :props="vatProps" class="bg">
+                            <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
-                    class="full-width"
-                    :columns="dueDayColumns"
-                    :rows="invoiceIn.invoiceInDueDay"
-                    flat
-                >
-                    <template #header="props">
-                        <QTr :props="props" class="bg">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                <QTable :columns="dueDayColumns" :rows="entity.invoiceInDueDay" flat>
+                    <template #header="dueDayProps">
+                        <QTr :props="dueDayProps" class="bg">
+                            <QTh
+                                table-header-style="max-width:50%"
+                                v-for="col in dueDayProps.cols"
+                                :key="col.name"
+                                :props="dueDayProps"
+                            >
                                 {{ 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">
-                        <QTr :props="props" class="bg">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                    <template #header="intrastatProps">
+                        <QTr :props="intrastatProps" class="bg">
+                            <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 {
-    border: 1px solid var(--vn-text-color);
-    max-width: 18em;
+@media (min-width: $breakpoint-md) {
+    .summaryBody {
+        .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({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
+defineProps({ dataKey: { type: String, required: true } });
 const suppliers = ref([]);
-const suppliersRef = ref();
 </script>
 
 <template>
-    <FetchData
-        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">
+    <VnFilterPanel :data-key="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')"
-                        v-model="params.serial"
+                        :label="t('params.fi')"
+                        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')"
-                            v-model="params.fi"
+                            :label="t('params.serialNumber')"
+                            v-model="params.serialNumber"
                             is-outlined
                             lazy-rules
                         >
@@ -125,8 +133,8 @@ const suppliersRef = ref();
                 <QItem>
                     <QItemSection>
                         <VnInput
-                            :label="t('params.serialNumber')"
-                            v-model="params.serialNumber"
+                            :label="t('params.serial')"
+                            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
-            color="primary"
-            icon="add"
-            size="lg"
-            round
-            :href="`${url}invoice-in/create`"
-        />
+        <QBtn color="primary" icon="add" size="lg" round :href="`/#/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/InvoiceOut/Card/InvoiceOutCard.vue

@@ -1,14 +1,16 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
+import InvoiceOutFilter from '../InvoiceOutFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="InvoiceOut"
         base-url="InvoiceOuts"
         :descriptor="InvoiceOutDescriptor"
-        searchbar-data-key="InvoiceOutList"
-        searchbar-url="InvoiceOuts/filter"
+        :filter-panel="InvoiceOutFilter"
+        search-data-key="InvoiceOutList"
+        search-url="InvoiceOuts/filter"
         searchbar-label="Search invoice"
         searchbar-info="You can search by invoice reference"
     />

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -139,7 +139,7 @@ const openCreateInvoiceModal = () => {
                             icon="cloud_download"
                             :disable="selectedCards.size === 0"
                         >
-                            <QTooltip>{{ t('downloadPdf') }}</QTooltip>
+                            <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
                         </QBtn>
                         <QCheckbox
                             left-label
@@ -234,13 +234,11 @@ en:
     fileDenied: Browser denied file download...
     fileAllowed: Successful download of CSV file
     youCanSearchByInvoiceReference: You can search by invoice reference
-    downloadPdf: Download PDF
     createInvoice: Make invoice
 es:
     searchInvoice: Buscar factura emitida
     fileDenied: El navegador denegó la descarga de archivos...
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    downloadPdf: Descargar PDF
     createInvoice: Crear factura
 </i18n>

src/pages/Item/Card/ItemBasicData.vue

@@ -220,13 +220,20 @@ const onIntrastatCreated = (response, formData) => {
                     </QIcon>
                 </div>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <QInput
+            <VnRow>
+                <VnInput
                     :label="t('basicData.description')"
                     type="textarea"
                     v-model="data.description"
                     fill-input
                 />
+                <VnInput
+                    v-show="data.isPhotoRequested"
+                    type="textarea"
+                    :label="t('globals.comment')"
+                    v-model="data.photoMotivation"
+                    fill-input
+                />
             </VnRow>
         </template>
     </FormModel>

src/pages/Item/Card/ItemCard.vue

@@ -1,7 +1,17 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
+import ItemListFilter from '../ItemListFilter.vue';
 </script>
 <template>
-    <VnCard data-key="Item" base-url="Items" :descriptor="ItemDescriptor" />
+    <VnCard
+        data-key="Item"
+        base-url="Items"
+        :descriptor="ItemDescriptor"
+        :filter-panel="ItemListFilter"
+        search-data-key="ItemList"
+        search-url="Items/filter"
+        searchbar-label="searchbar.label"
+        searchbar-info="searchbar.info"
+    />
 </template>

src/pages/Item/ItemFixedPrice.vue

@@ -309,9 +309,9 @@ const addRow = () => {
     const lastItemCopy = JSON.parse(
         JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
     );
-    const { id, ...restOfItem } = lastItemCopy;
-    fixedPricesOriginalData.value.push(restOfItem);
-    fixedPrices.value.push(restOfItem);
+    delete lastItemCopy.id;
+    fixedPricesOriginalData.value.push(lastItemCopy);
+    fixedPrices.value.push(lastItemCopy);
 };
 
 const openEditTableCellDialog = () => {
@@ -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

@@ -457,6 +457,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             :limit="12"
             :expr-builder="exprBuilder"
             :user-params="params"
+            :keep-opts="['userParams']"
             :offset="50"
             auto-load
         >
@@ -520,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/ItemTypeList.vue

@@ -7,8 +7,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
 import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
+import ItemTypeSearchbar from '../ItemType/ItemTypeSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
@@ -63,13 +62,7 @@ const exprBuilder = (param, value) => {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="ItemTypeList"
-                url="ItemTypes"
-                :label="t('Search item type')"
-                :info="t('Search itemType by id, name or code')"
-                :expr-builder="exprBuilder"
-            />
+            <ItemTypeSearchbar />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
@@ -132,11 +125,3 @@ const exprBuilder = (param, value) => {
         </QTooltip>
     </QPageSticky>
 </template>
-
-<i18n>
-es:
-    New item type: Nueva familia
-    Name: Nombre
-    Search item type: Buscar familia
-    Search itemType by id, name or code: Buscar familia por id, nombre o código
-</i18n>

src/pages/Item/locale/en.yml

@@ -78,3 +78,13 @@ itemTags:
     tag: Tag
     value: Value
     relevancy: Relevancy
+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

@@ -78,3 +78,13 @@ itemTags:
     tag: Etiqueta
     value: Valor
     relevancy: Relevancia
+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/ItemType/Card/ItemTypeCard.vue

@@ -1,12 +1,20 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
-
 import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
+import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
+import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 </script>
 <template>
     <VnCard
         data-key="ItemTypeSummary"
         base-url="ItemTypes"
         :descriptor="ItemTypeDescriptor"
-    />
+        :filter-panel="ItemTypeFilter"
+        search-data-key="ItemTypeList"
+        search-url="ItemTypes"
+    >
+        <template #searchbar>
+            <ItemTypeSearchbar />
+        </template>
+    </VnCard>
 </template>

src/pages/ItemType/ItemTypeSearchbar.vue

@@ -0,0 +1,19 @@
+<script setup>
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import { useI18n } from 'vue-i18n';
+const { t } = useI18n();
+</script>
+
+<template>
+    <VnSearchbar
+        data-key="ItemTypeList"
+        url="ItemTypes"
+        :label="t('Search item type')"
+        :info="t('Search itemType by id, name or code')"
+    />
+</template>
+<i18n>
+es:
+    Search item type: Buscar familia
+    Search itemType by id, name or code: Buscar familia por id, nombre o código
+</i18n>

src/pages/Monitor/SalesOrdersTable.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -16,7 +15,6 @@ import axios from 'axios';
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 
-const router = useRouter();
 const paginateRef = ref(null);
 const workersActiveOptions = ref([]);
 const clientsOptions = ref([]);

src/pages/Monitor/SalesTicketsTable.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted, reactive, watch } from 'vue';
+import { ref, computed, onMounted, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -18,7 +18,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toDateFormat, toTimeFormat } from 'src/filters/date.js';
-import { toCurrency } from 'src/filters';
+import { toCurrency, dateRange } from 'src/filters';
 const DEFAULT_AUTO_REFRESH = 1000;
 const { t } = useI18n();
 const autoRefresh = ref(false);
@@ -32,15 +32,6 @@ const visibleColumns = ref([]);
 const allColumnNames = ref([]);
 const { viewSummary } = useSummaryDialog();
 
-const dateRange = (value) => {
-    const minHour = new Date(value);
-    minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date(value);
-    maxHour.setHours(23, 59, 59, 59);
-
-    return [minHour, maxHour];
-};
-
 function exprBuilder(param, value) {
     switch (param) {
         case 'stateFk':
@@ -54,11 +45,7 @@ function exprBuilder(param, value) {
         case 'practicalHour':
             return { 'zed.etc': value };
         case 'shippedDate':
-            return {
-                't.shipped': {
-                    between: dateRange(value),
-                },
-            };
+            return { 't.shipped': { between: dateRange(value) } };
         case 'nickname':
             return { [`t.nickname`]: { like: `%${value}%` } };
         case 'zoneFk':

src/pages/Order/Card/OrderCard.vue

@@ -1,7 +1,19 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
+import OrderFilter from './OrderFilter.vue';
+import OrderSearchbar from './OrderSearchbar.vue';
 </script>
 <template>
-    <VnCard data-key="Order" base-url="Orders" :descriptor="OrderDescriptor" />
+    <VnCard
+        data-key="Order"
+        base-url="Orders"
+        :descriptor="OrderDescriptor"
+        :filter-panel="OrderFilter"
+        search-data-key="OrderList"
+    >
+        <template #searchbar>
+            <OrderSearchbar />
+        </template>
+    </VnCard>
 </template>

src/pages/Order/Card/OrderSummary.vue

@@ -2,17 +2,14 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const stateStore = useStateStore();
 
 const $props = defineProps({
     id: {
@@ -53,10 +50,6 @@ const detailsColumns = ref([
 </script>
 
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <OrderSearchbar />
-    </Teleport>
-
     <div class="q-pa-md">
         <CardSummary ref="summary" :url="`Orders/${entityId}/summary`">
             <template #header="{ entity }">
@@ -158,11 +151,7 @@ const detailsColumns = ref([
                     <p class="header">
                         {{ t('order.summary.details') }}
                     </p>
-                    <QTable
-                        :columns="detailsColumns"
-                        :rows="entity?.rows"
-                        flat
-                    >
+                    <QTable :columns="detailsColumns" :rows="entity?.rows" flat>
                         <template #header="props">
                             <QTr :props="props">
                                 <QTh auto-width>{{ t('order.summary.item') }}</QTh>
@@ -187,10 +176,7 @@ const detailsColumns = ref([
                                             {{ props.row.item.subName }}
                                         </span>
                                     </div>
-                                    <fetched-tags
-                                        :item="props.row.item"
-                                        :max-length="5"
-                                    />
+                                    <FetchedTags :item="props.row.item" :max-length="5" />
                                 </QTd>
                                 <QTd key="quantity" :props="props">
                                     {{ props.row.quantity }}