CHANGELOG.md

@@ -1,214 +1,3 @@
-# Version 25.12 - 2025-03-25
-
-### Added 🆕
-
-- chore: add junit-merge dependency to package.json by:alexm
-- chore: downgrade version from 25.14.0 to 25.12.0 in package.json by:alexm
-- chore: reduce page load timeout in Cypress configuration by:alexm
-- chore: refs #6695 update Cypress to version 14.1.0 and simplify test execution in Jenkinsfile by:alexm
-- chore: refs #8602 add comments for clarity in Cypress commands file by:pablone
-- chore: refs #8602 enhance Cypress support files with detailed comments and organization by:pablone
-- ci: refs #6695 feat jenkins parallel e2e by:alexm
-- feat: integrate vue-router to enhance routing capabilities in ZoneCard component by:alexm
-- feat: refs #6695 implement parallel Cypress testing and enhance timeout configurations by:alexm
-- feat: refs #6695 update Cypress parallel test execution to use 3 instances by:alexm
-- feat: refs #6802 add dash placeholder for empty department names in InvoiceOut list by:jgallego
-- feat: refs #6802 add DepartmentDescriptorProxy to InvoiceOutList and update translations by:jgallego
-- feat: refs #6802 add DepartmentDescriptorProxy to various components and update department handling by:jgallego
-- feat: refs #7587 add 'ticketClaimed' translation and implement claims retrieval in TicketDescriptor by:jtubau
-- feat: refs #7949 show new field in ticket sales by:Jon
-- feat: refs #8045 added new logic to show the correct icon and the correct path to redirect by:Jon
-- feat: refs #8045 modified icon and route to redirect from CardDescriptor by:Jon
-- feat: refs #8074 modified spinner size by:Jon
-- feat: refs #8600 added calendar e2e and modified basic data by:Jon
-- feat: refs #8600 added deliveryDays and modified warehouse E2Es by:Jon
-- feat: refs #8600 added new tests for zoneSummary & zoneLocations by:provira
-- feat: refs #8602 add custom Cypress commands for improved element interaction and request handling by:pablone
-- feat: refs #8602 add new Cypress command for clicking buttons with icons by:pablone
-- feat: refs #8602 add remove functionality for tag filters in EntryBuys component by:pablone
-- feat: refs #8602 add sorting options for select fields and update locale files with supplier name by:pablone
-- feat: refs #8602 refactor EntryBuys component and enhance observation tests by:pablone
-- feat: refs #8602 remove unused state property from useArrayDataStore by:pablone
-- feat: refs #8602 remove unused URL property from VnTable in ClaimList component by:pablone
-- feat: refs #8602 skip warehouse creation and removal test in ZoneWarehouse spec by:pablone
-- feat: refs #8602 streamline beforeSaveFn execution in CrudModel component by:pablone
-- feat: refs #8602 streamline beforeSaveFn execution in VnTable component by:pablone
-- feat: refs #8602 streamline filter logic in EntryBuys component by:pablone
-- feat: refs #8602 update entry components and tests, add data-cy attributes for Cypress integration by:pablone
-- feat: refs #8602 update localization for purchased spaces and enhance Entry components with new labels by:pablone
-- feat: refs #8606 adapt module to VnCatdBeta by:Jon
-- feat: refs #8612 added summary button & changed e2e tests by:provira
-- feat: refs #8612 changed shelving to VnTable & created e2e tests by:provira
-- feat: refs #8616 add summary prop to CardDescriptor in RoadmapDescriptor and WorkerDescriptor by:jtubau
-- feat: refs #8616 add VnCheckbox component to VnFilter and update prop types in VnFilterPanel and VnSearchbar by:jtubau
-- feat: refs #8630 add Agency and Vehicle descriptor components with summary props by:jtubau
-- feat: refs #8638 add AWB field to travel and entry forms, update translations and styles by:pablone
-- feat: refs #8638 add data attributes for transfer buys functionality in EntryBuys.vue and corresponding tests by:pablone
-- feat: refs #8648 enhance roadmapList tests with improved selectors and additional scenarios by:jtubau
-- feat: refs #8664 add CmrFilter component and integrate it into CmrList for enhanced filtering options by:jtubau
-- feat: refs #8721 add ticket navigation and update route columns by:jtubau
-- feat: run.sh build neccessary images by:alexm
-- feat: update Jenkinsfile to pull Docker images for back and db services by:alexm
-- feat: update labels and add department selection in InvoiceOut filter and list by:jgallego
-- refactor: refs #8626 update button styles and improve route redirection logic by:jtubau
-- style: refs #8041 new variable by:benjaminedc
-
-### Changed 📦
-
-- feat: refs #8602 refactor EntryBuys component and enhance observation tests by:pablone
-- refactor(cypress): refs #6695 simplify parallel test execution script by:alexm
-- refactor: deleted useless (origin/Warmfix-DepartmentIcon) by:Jon
-- refactor: refs #6695 enable ClaimNotes test suite by:alexm
-- refactor: refs #6695 fix invoiceOutSummary by:alexm
-- refactor: refs #6695 improve notification check and extend waitForElement timeout by:alexm
-- refactor: refs #6695 remove mocha dependency and optimize Cypress command execution by:alexm
-- refactor: refs #6695 skips by:alexm
-- refactor: refs #6695 skip zoneWarehouse by:alexm
-- refactor: refs #6695 streamline Cypress test execution and remove deprecated configurations by:alexm
-- refactor: refs #6802 replace salesPerson references with department in claims and tickets by:jgallego
-- refactor: refs #6802 replace 'salesPerson' terminology with 'team' across multiple locales and components by:jgallego
-- refactor: refs #6802 update import paths for DepartmentDescriptorProxy to use Worker directory by:jgallego
-- refactor: refs #6802 update InvoiceOutNegativeBases to use Department instead of Worker by:jgallego
-- refactor: refs #6802 update TicketFilter and TicketSale components to use departmentFk and adjust API endpoints by:jgallego
-- refactor: refs #8041 unify class link and unify titles to VnTitles by:benjaminedc
-- refactor: refs #8045 modified icon and module const by:Jon
-- refactor: refs #8197 rename VnCardBeta to VnCard by:alexm
-- refactor: refs #8197 simplify menu retrieval logic in LeftMenu component by:alexm
-- refactor: refs #8322 changed Wagon component to use VnSection/VnCardBeta by:provira
-- refactor: refs #8322 remove keyBinding from Wagon router module by:alexm
-- refactor: refs #8322 update WagonCard component and routing structure by:alexm
-- refactor: refs #8370 modified function to get the correct date by:Jon
-- refactor: refs #8472 remove added div and add class to VnInput by:jtubau
-- refactor: refs #8472 unified styling for the more-create-dialog slot to ensure consistency across all scenarios by:jtubau
-- refactor: refs #8472 update class names from q-span-2 to col-span-2 for consistency in layout by:jtubau
-- refactor: refs #8600 changed test case description by:provira
-- refactor: refs #8600 modified make invoice and send dialog e2es by:Jon
-- refactor: refs #8600 modified upcomingDeliveries e2e and created deliveryDays by:Jon
-- refactor: refs #8600 modified zoneSummary e2e by:Jon
-- refactor: refs #8602 remove redundant date input test from entryList.spec.js by:pablone
-- refactor: refs #8606 clear some warnings by:Jon
-- refactor: refs #8606 deleted code and fixed translation by:Jon
-- refactor: refs #8606 merged previous and e2e changes and corrected minor errors by:Jon
-- refactor: refs #8606 requested changes by:Jon
-- refactor: refs #8616 integrate summary dialog and update navigation in Agency and Vehicle components by:jtubau
-- refactor: refs #8616 integrate VnSelectWorker component in RouteList and optimize format functions by:jtubau
-- refactor: refs #8616 simplify template bindings and improve link generation in VehicleSummary by:jtubau
-- refactor: refs #8616 update routing components for AgencyList and RouteRoadmap in route.js by:jtubau
-- refactor: refs #8619 simplify empty data check in RouteDescriptor component by:jtubau
-- refactor: refs #8626 add cardVisible property to RouteList columns by:jtubau
-- refactor: refs #8626 add formatting for agency and vehicle columns in RouteList by:jtubau
-- refactor: refs #8626 enhance Worker and Agency components with data attributes and improved routing by:jtubau
-- refactor: refs #8626 improve test messages and selectors in route tests by:jtubau
-- refactor: refs #8626 update button styles and improve route redirection logic by:jtubau
-- refactor: refs #8626 update RouteList columns and enable AgencyWorkCenter tests by:jtubau
-- refactor: refs #8630 add vehicle translations and enhance route list columns by:jtubau
-- refactor: refs #8648 update roadmap deletion test to use current element text by:jtubau
-- refactor: refs #8664 enhance CmrList component with query initialization and user parameters by:jtubau
-- refactor: refs #8664 localization files by:jtubau
-- refactor: refs #8664 remove CmrFilter and replace with VnSearchbar in CmrList by:jtubau
-- refactor: remove unnecessary login and reload calls in ClaimDevelopment tests by:alexm
-- refactor: simplify client selection in order creation test by:alexm
-- refactor: update client ID input selector and remove viewport setting by:alexm
-- test: refs #8197 comment out ticket list tests for refactoring by:alexm
-- test: refs #8626 refactor notification check in routeList.spec.js by:jtubau
-- test: refs #8626 refactor routeList.spec.js to use a constant for summary URL by:jtubau
-- test: refs #8626 refactor routeList.spec.js to use selectors and improve readability by:jtubau
-
-### Fixed 🛠️
-
-- fix: add --init flag to Docker container for Cypress tests by:alexm
-- fix: agency list filters by:jtubau
-- fix: align Article label to the left in EntryBuys component by:alexm
-- fix: card descriptor imports by:Jon
-- fix: card descriptor merge by:Jon
-- fix(ClaimAction): update shelving options to use URL instead of static data by:jgallego
-- fix(ClaimSummary): clean url by:alexm
-- fix(cypress.config.js): refs #6695 update reporter to junit and remove unused dependencies by:alexm
-- fix(cypressParallel.sh): refs #6695 improve script readability by:alexm
-- fix(cypressParallel.sh): refs #6695 improve test execution output for clarity by:alexm
-- fix(cypressParallel.sh): refs #6695 simplify test execution output format by:alexm
-- fix(cypress scripts): refs #6695 improve cleanup process and adjust output redirection by:alexm
-- fix: fixed department descriptor icon by:Jon
-- fix: fixed submodule descriptors icons by:Jon
-- fix(invoiceOutSummary.spec.js): refs #6695 remove unnecessary visibility check for descriptor by:alexm
-- fix(Jenkinsfile): reduce parallel Cypress test execution from 3 to 2 by:alexm
-- fix(Jenkinsfile): refs #6695 add credentials for Docker login in E2E stage by:alexm
-- fix(Jenkinsfile): refs #6695 change parallel test execution from 4 to 2 by:alexm
-- fix(Jenkinsfile): refs #6695 increase parallel test execution from 2 to 4 by:alexm
-- fix(Jenkinsfile): refs #6695 update parallel test execution to 4 by:alexm
-- fix(LeftMenu): refs #8197 handle missing children in findRoute and update menu structure by:alexm
-- fix: refs #6695 update Cypress configuration and test result paths by:alexm
-- fix: refs #6695 update Jenkinsfile to build Docker image correctly and modify logout test visit method by:alexm
-- fix: refs #6695 update Jenkinsfile to remove specific e2e XML files and adjust Cypress parallel execution by:alexm
-- fix: refs #6695 update Jenkinsfile to source cypressParallel.sh correctly by:alexm
-- fix: refs #6695 update visit method in TicketLackDetail.spec.js to prevent page reload by:alexm
-- fix: refs #6802 update import path for DepartmentDescriptorProxy in OrderList.vue by:jgallego
-- fix: refs #6802 update OrderFilter to use department relation instead of salesPerson by:jgallego
-- fix: refs #8041 update redirection from preview to summary in ShelvingList tests by:benjaminedc
-- fix: refs #8041 update selector for summary header in ParkingList tests by:benjaminedc
-- fix: refs #8041 update summaryHeader selector in ParkingList test by:benjaminedc
-- fix: refs #8322 update order property for WagonList component by:alexm
-- fix: refs #8370 change param rely on month by:Jon
-- fix: refs #8417 added data-cy to all files and fixed test by:provira
-- fix: refs #8417 added data-cy to delete button by:provira
-- fix: refs #8417 fixed claimPhoto e2e by:provira
-- fix: refs #8417 fixed claimPhoto e2e test by:provira
-- fix: refs #8417 fixed e2e test by:provira
-- fix: refs #8417 fixed e2e test case by:provira
-- fix: refs #8417 fixed failing test case by:provira
-- fix: refs #8417 fixed invoiceOutSummary e2e test by:provira
-- fix: refs #8417 removed .only by:provira
-- fix: refs #8583 basicData, business, summary by:carlossa
-- fix: refs #8583 basicData e2e by:carlossa
-- fix: refs #8583 basicData timeControl by:carlossa
-- fix: refs #8583 cypressconf by:carlossa
-- fix: refs #8583 dataCy operator by:carlossa
-- fix: refs #8583 fix AddCard by:carlossa
-- fix: refs #8583 mutual create by:carlossa
-- fix: refs #8583 operator by:carlossa
-- fix: refs #8583 remove workerTimeControl by:carlossa
-- fix: refs #8583 tMutual, tNotes, TOperator by:carlossa
-- fix: refs #8583 wBusiness by:carlossa
-- fix: refs #8583 wBusiness e2e by:carlossa
-- fix: refs #8583 workerBasicData & workerTimeControl by:carlossa
-- fix: refs #8583 workerBusiness by:carlossa
-- fix: refs #8583 workerBusiness e2e by:carlossa
-- fix: refs #8583 workerBusiness test by:carlossa
-- fix: refs #8583 workerE2E by:carlossa
-- fix: refs #8583 worker mutual e2e by:carlossa
-- fix: refs #8583 workerSummary test by:carlossa
-- fix: refs #8583 workerTimeControl by:carlossa
-- fix: refs #8583 workerTimeControl e2e by:carlossa
-- fix: refs #8600 e2e by:Jon
-- fix: refs #8600 fixed calendar e2e by:Jon
-- fix: refs #8600 fixed e2e and skip client ones by:Jon
-- fix: refs #8600 fixed e2e by:Jon
-- fix: refs #8600 fixed invoiceOut summary e2e by:Jon
-- fix: refs #8600 fixed zoneList & added test case to zoneSummary by:provira
-- fix: refs #8600 zone basic data e2e and skip intermitent invoice out summary it by:Jon
-- fix: refs #8602 delete unused entryDms and stockBought test files (origin/8581-e2eInvoiceIn) by:pablone
-- fix: refs #8606 deleted code by:Jon
-- fix: refs #8612 changed QCheckbox for VnCheckbox by:provira
-- fix: refs #8612 fixed shelving e2e tests by:provira
-- fix: refs #8616 add conditional for SupplierDescriptorProxy and bind attributes in CardDescriptor by:jtubau
-- fix: refs #8616 remove redundant v-on binding from QCheckbox in VnCheckbox.vue by:jtubau
-- fix: refs #8616 update binding syntax for is-editable prop in AgencyList.vue by:jtubau
-- fix: refs #8616 update FormModel prop from 'update-url' to 'url-update' in Agency and RoadMap BasicData by:jtubau
-- fix: refs #8619 handle empty ticket records in RouteDescriptor component by:jtubau
-- fix: refs #8619 update route descriptor to handle empty ticket records and adjust test cases by:jtubau
-- fix: refs #8626 remove duplicate ref attribute from RouteList.vue by:jtubau
-- fix: refs #8630 remove duplicated locations by:jtubau
-- fix: refs #8638 restore invoiceInBasicData by:pablone
-- fix: refs #8638 update comment formatting in VnTable.vue by:pablone
-- fix: refs #8638 update null check for maxlength validation in VnInput.vue by:pablone
-- fix: simplify menu structure in monitor router module (origin/fix_monitor_leftMenu) by:Javier Segarra
-- refactor: refs #6695 fix invoiceOutSummary by:alexm
-- refactor: refs #8606 deleted code and fixed translation by:Jon
-- test: fix intermitent e2e by:alexm
-- test: fix orderList e2e, unestables by:alexm
-- test(OrderList): fix inconsistency by:alexm
-- test(TicketList): fix inconsistency by:alexm
-
 # Version 25.10 - 2025-03-11
 
 ### Added 🆕

README.md

@@ -49,9 +49,3 @@ pnpm run test:e2e:summary
 ```bash
 quasar build
 ```
-
-### Serve the app for production
-
-```bash
-quasar build quasar serve dist/spa --host 0.0.0.0 --proxy=./proxy-serve.js
-```

package.json

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

src/components/ItemsFilterPanel.vue

@@ -198,7 +198,8 @@ const setCategoryList = (data) => {
                         v-model="params.typeFk"
                         :options="itemTypesOptions"
                         dense
-                        filled
+                        outlined
+                        rounded
                         use-input
                         :disable="!selectedCategoryFk"
                         @update:model-value="
@@ -234,7 +235,8 @@ const setCategoryList = (data) => {
                         v-model="value.selectedTag"
                         :options="tagOptions"
                         dense
-                        filled
+                        outlined
+                        rounded
                         :emit-value="false"
                         use-input
                         :is-clearable="false"
@@ -250,7 +252,8 @@ const setCategoryList = (data) => {
                         option-value="value"
                         option-label="value"
                         dense
-                        filled
+                        outlined
+                        rounded
                         emit-value
                         use-input
                         :disable="!value"
@@ -262,6 +265,7 @@ const setCategoryList = (data) => {
                         v-model="value.value"
                         :label="t('components.itemsFilterPanel.value')"
                         :disable="!value"
+                        is-outlined
                         :is-clearable="false"
                         @keyup.enter="applyTags(params, searchFn)"
                     />

src/components/NavBar.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
@@ -18,14 +18,6 @@ const state = useState();
 const user = state.getUser();
 const appName = 'Lilium';
 const pinnedModulesRef = ref();
-const hostname = window.location.hostname;
-const env = ref();
-
-const getEnvironment = computed(() => {
-    env.value = hostname.split('-');
-    if (env.value.length <= 1) return;
-    return env.value[0];
-});
 
 onMounted(() => stateStore.setMounted());
 const refresh = () => window.location.reload();
@@ -57,9 +49,6 @@ const refresh = () => window.location.reload();
                         {{ t('globals.backToDashboard') }}
                     </QTooltip>
                 </QBtn>
-                <QBadge v-if="getEnvironment" color="primary" align="top">
-                    {{ getEnvironment }}
-                </QBadge>
             </RouterLink>
             <VnBreadcrumbs v-if="$q.screen.gt.sm" />
             <QSpinner

src/components/TicketProblems.vue

@@ -17,6 +17,17 @@ defineProps({ row: { type: Object, required: true } });
                 </QTooltip>
             </QIcon>
         </router-link>
+        <QIcon
+            v-if="row?.reserved"
+            color="primary"
+            name="vn:reserva"
+            size="xs"
+            data-cy="ticketSaleReservedIcon"
+        >
+            <QTooltip>
+                {{ t('ticketSale.reserved') }}
+            </QTooltip>
+        </QIcon>
         <QIcon
             v-if="row?.isDeleted"
             color="primary"

src/components/VnTable/VnColumn.vue

@@ -55,8 +55,6 @@ const $props = defineProps({
     },
 });
 
-const label = $props.showLabel && $props.column.label ? $props.column.label : '';
-
 const defaultSelect = {
     attrs: {
         row: $props.row,
@@ -64,7 +62,7 @@ const defaultSelect = {
         class: 'fit',
     },
     forceAttrs: {
-        label,
+        label: $props.showLabel && $props.column.label,
     },
 };
 
@@ -76,7 +74,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     number: {
@@ -86,7 +84,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     date: {
@@ -98,7 +96,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     time: {
@@ -107,7 +105,7 @@ const defaultComponents = {
             disable: !$props.isEditable,
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     checkbox: {
@@ -127,7 +125,7 @@ const defaultComponents = {
             return defaultAttrs;
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
             autofocus: true,
         },
         events: {

src/components/VnTable/VnOrder.vue

@@ -70,7 +70,7 @@ function textAlignToFlex(textAlign) {
         :style="textAlignToFlex(align)"
     >
         <span :title="label">{{ label }}</span>
-        <div v-if="name && (model?.index || vertical)">
+        <div v-if="name && model?.index">
             <QChip
                 :label="!vertical ? model?.index : ''"
                 :icon="
@@ -83,14 +83,14 @@ function textAlignToFlex(textAlign) {
                 :size="vertical ? '' : 'sm'"
                 :class="[
                     model?.index ? 'color-vn-text' : 'bg-transparent',
-                    vertical ? 'q-mx-none q-py-lg' : '',
+                    vertical ? 'q-px-none' : '',
                 ]"
                 class="no-box-shadow"
                 :clickable="true"
                 style="min-width: 40px; max-height: 30px"
             >
                 <div
-                    class="column justify-center text-center"
+                    class="column flex-center"
                     v-if="vertical"
                     :style="!model?.index && 'color: #5d5d5d'"
                 >

src/components/VnTable/VnTable.vue

@@ -140,7 +140,7 @@ const $props = defineProps({
     },
     dataCy: {
         type: String,
-        default: 'vnTable',
+        default: 'vn-table',
     },
 });
 
@@ -633,7 +633,6 @@ const rowCtrlClickFunction = computed(() => {
                 :data-key="$attrs['data-key']"
                 :columns="columns"
                 :redirect="redirect"
-                v-bind="$attrs?.['table-filter']"
             >
                 <template
                     v-for="(_, slotName) in $slots"
@@ -685,7 +684,7 @@ const rowCtrlClickFunction = computed(() => {
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
                 :hide-selected-banner="true"
-                :data-cy
+                :data-cy="$props.dataCy ?? 'vnTable'"
             >
                 <template #top-left v-if="!$props.withoutHeader">
                     <slot name="top-left"> </slot>
@@ -782,7 +781,6 @@ const rowCtrlClickFunction = computed(() => {
                                 text-overflow: ellipsis;
                                 white-space: nowrap;
                             "
-                            :data-cy="`vnTableCell_${col.name}`"
                         >
                             <slot
                                 :name="`column-${col.name}`"
@@ -1156,7 +1154,7 @@ es:
 
 .grid-create {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
+    grid-template-columns: 1fr 1fr;
     max-width: 100%;
     grid-gap: 20px;
     margin: 0 auto;

src/components/VnTable/VnTableFilter.vue

@@ -26,12 +26,7 @@ function columnName(col) {
 }
 </script>
 <template>
-    <VnFilterPanel
+    <VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
-        v-bind="$attrs"
-        :search-button="true"
-        :disable-submit-event="true"
-        :search-url
-    >
         <template #body="{ params, orders, searchFn }">
             <div
                 class="container"
@@ -39,12 +34,6 @@ function columnName(col) {
                 :key="col.id"
             >
                 <div class="filter">
-                    <slot
-                        :name="`filter-${col.name}`"
-                        :params="params"
-                        :column-name="columnName(col)"
-                        :search-fn
-                    >
                     <VnFilter
                         ref="tableFilterRef"
                         :column="col"
@@ -52,7 +41,6 @@ function columnName(col) {
                         v-model="params[columnName(col)]"
                         :search-url="searchUrl"
                     />
-                    </slot>
                 </div>
                 <div class="order">
                     <VnTableOrder
@@ -89,13 +77,13 @@ function columnName(col) {
     display: flex;
     justify-content: center;
     align-items: center;
-    min-height: 45px;
+    height: 45px;
     gap: 10px;
 }
 
 .filter {
     width: 70%;
-    min-height: 40px;
+    height: 40px;
     text-align: center;
 }
 .order {

src/components/common/SendEmailDialog.vue

@@ -60,7 +60,7 @@ async function confirm() {
                     v-model="address"
                     is-outlined
                     autofocus
-                    data-cy="SendEmailNotificationDialogInput"
+                    data-cy="SendEmailNotifiactionDialogInput"
                 />
             </QCardSection>
             <QCardActions align="right">

src/components/common/SendSmsDialog.vue

@@ -1,15 +1,15 @@
 <script setup>
-import { useDialogPluginComponent } from 'quasar';
+import {useDialogPluginComponent} from 'quasar';
-import { useI18n } from 'vue-i18n';
+import {useI18n} from 'vue-i18n';
-import { computed, ref } from 'vue';
+import {computed, ref} from 'vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
-import useNotify from 'composables/useNotify';
+import useNotify from "composables/useNotify";
 
 const MESSAGE_MAX_LENGTH = 160;
 
-const { t } = useI18n();
+const {t} = useI18n();
-const { notify } = useNotify();
+const {notify} = useNotify();
 const props = defineProps({
     title: {
         type: String,
@@ -34,7 +34,7 @@ const props = defineProps({
 });
 
 const emit = defineEmits([...useDialogPluginComponent.emits, 'sent']);
-const { dialogRef, onDialogHide } = useDialogPluginComponent();
+const {dialogRef, onDialogHide} = useDialogPluginComponent();
 
 const smsRules = [
     (val) => (val && val.length > 0) || t("The message can't be empty"),
@@ -43,10 +43,10 @@ const smsRules = [
         t("The message it's too long"),
 ];
 
-const message = ref(t('routeDelay'));
+const message = ref('');
 
 const charactersRemaining = computed(
-    () => MESSAGE_MAX_LENGTH - new Blob([message.value]).size,
+    () => MESSAGE_MAX_LENGTH - new Blob([message.value]).size
 );
 
 const charactersChipColor = computed(() => {
@@ -114,7 +114,7 @@ const onSubmit = async () => {
                                 <QTooltip>
                                     {{
                                         t(
-                                            'Special characters like accents counts as a multiple',
+                                            'Special characters like accents counts as a multiple'
                                         )
                                     }}
                                 </QTooltip>
@@ -144,10 +144,7 @@ const onSubmit = async () => {
     max-width: 450px;
 }
 </style>
-
 <i18n>
-en:
-    routeDelay: "Your order has been delayed in transit.\nDelivery will take place throughout the day.\nWe apologize for the inconvenience and appreciate your patience."
 es:
     Message: Mensaje
     Send: Enviar
@@ -156,5 +153,4 @@ es:
     The destination can't be empty: El destinatario no puede estar vacio
     The message can't be empty: El mensaje no puede estar vacio
     The message it's too long: El mensaje es demasiado largo
-    routeDelay: "Retraso en ruta.\nInformamos que la ruta que lleva su pedido ha sufrido un retraso y la entrega se hará a lo largo del día.\nDisculpe las molestias."
+</i18n>
-    </i18n>

src/components/common/VnAccountNumber.vue

@@ -1,14 +1,35 @@
 <script setup>
+import { nextTick, ref } from 'vue';
 import VnInput from './VnInput.vue';
 import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
 
+const $props = defineProps({
+    insertable: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
 const model = defineModel({ prop: 'modelValue' });
+const inputRef = ref(false);
+
+function setCursorPosition(pos) {
+    const input = inputRef.value.vnInputRef.$el.querySelector('input');
+    input.focus();
+    input.setSelectionRange(pos, pos);
+}
+
+async function handleUpdateModel(val) {
+    model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
+    await nextTick(() => setCursorPosition(0));
+}
 </script>
 <template>
     <VnInput
         v-model="model"
         ref="inputRef"
-        @keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
+        :insertable
-        @input="model = $event.target.value.replace(/[^\d.]/g, '')"
+        @update:model-value="handleUpdateModel"
     />
 </template>

src/components/common/VnCard.vue

@@ -1,15 +1,12 @@
 <script setup>
-import { onBeforeMount, computed, markRaw } from 'vue';
+import { onBeforeMount } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
+import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
 
-const emit = defineEmits(['onFetch']);
-
 const props = defineProps({
-    id: { type: Number, required: false, default: null },
     dataKey: { type: String, required: true },
     url: { type: String, default: undefined },
     idInWhere: { type: Boolean, default: false },
@@ -19,25 +16,26 @@ const props = defineProps({
     searchDataKey: { type: String, default: undefined },
     searchbarProps: { type: Object, default: undefined },
     redirectOnError: { type: Boolean, default: false },
-    visual: { type: Boolean, default: true },
 });
 
-const route = useRoute();
 const stateStore = useStateStore();
 const router = useRouter();
-const entityId = computed(() => props.id || route?.params?.id);
+const arrayData = useArrayData(props.dataKey, {
-let arrayData = getArrayData(entityId.value, props.url);
+    url: props.url,
+    userFilter: props.filter,
+    oneRecord: true,
+});
 
 onBeforeRouteLeave(() => {
     stateStore.cardDescriptorChangeValue(null);
 });
 
 onBeforeMount(async () => {
-    stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
+    stateStore.cardDescriptorChangeValue(props.descriptor);
 
     const route = router.currentRoute.value;
     try {
-        await fetch(entityId.value);
+        await fetch(route.params.id);
     } catch {
         const { matched: matches } = route;
         const { path } = matches.at(-1);
@@ -53,41 +51,24 @@ onBeforeRouteUpdate(async (to, from) => {
             router.push({ name, params: to.params });
         }
     }
-    if (entityId.value !== to.params.id) await fetch(to.params.id, true);
+    const id = to.params.id;
+    if (id !== from.params.id) await fetch(id, true);
 });
 
 async function fetch(id, append = false) {
+    const regex = /\/(\d+)/;
     if (props.idInWhere) arrayData.store.filter.where = { id };
-    else {
+    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
-        arrayData = getArrayData(id);
+    else arrayData.store.url = props.url.replace(regex, `/${id}`);
-    }
     await arrayData.fetch({ append, updateRouter: false });
-    emit('onFetch', arrayData.store.data);
 }
 function hasRouteParam(params, valueToCheck = ':addressId') {
     return Object.values(params).includes(valueToCheck);
 }
-
-function formatUrl(id) {
-    const newId = id || entityId.value;
-    const regex = /\/(\d+)/;
-    if (!regex.test(props.url)) return `${props.url}/${newId}`;
-    return props.url.replace(regex, `/${newId}`);
-}
-
-function getArrayData(id, url) {
-    return useArrayData(props.dataKey, {
-        url: url ?? formatUrl(id),
-        userFilter: props.filter,
-        oneRecord: true,
-    });
-}
 </script>
 <template>
-    <template v-if="visual">
     <VnSubToolbar />
     <div :class="[useCardSize(), $attrs.class]">
         <RouterView :key="$route.path" />
     </div>
-    </template>
 </template>

src/components/common/VnCheckbox.vue

@@ -27,11 +27,7 @@ const checkboxModel = computed({
 </script>
 <template>
     <div>
-        <QCheckbox
+        <QCheckbox v-bind="$attrs" v-model="checkboxModel" />
-            v-bind="$attrs"
-            v-model="checkboxModel"
-            :data-cy="$attrs['data-cy'] ?? `vnCheckbox${$attrs['label'] ?? ''}`"
-        />
         <QIcon
             v-if="info"
             v-bind="$attrs"

src/components/common/VnDms.vue

@@ -35,10 +35,6 @@ const $props = defineProps({
         type: String,
         default: null,
     },
-    hasFile: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const warehouses = ref();
@@ -94,7 +90,6 @@ function defaultData() {
     if ($props.formInitialData) return (dms.value = $props.formInitialData);
     return addDefaultData({
         reference: route.params.id,
-        hasFile: $props.hasFile,
     });
 }
 

src/components/common/VnDmsInput.vue

@@ -1,166 +0,0 @@
-<script setup>
-import VnConfirm from '../ui/VnConfirm.vue';
-import VnInput from './VnInput.vue';
-import VnDms from './VnDms.vue';
-import axios from 'axios';
-import { useQuasar } from 'quasar';
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { downloadFile } from 'src/composables/downloadFile';
-
-const { t } = useI18n();
-const quasar = useQuasar();
-const documentDialogRef = ref({});
-const editDownloadDisabled = ref(false);
-const $props = defineProps({
-    defaultDmsCode: {
-        type: String,
-        default: 'invoiceIn',
-    },
-    disable: {
-        type: Boolean,
-        default: true,
-    },
-    data: {
-        type: Object,
-        default: null,
-    },
-    formRef: {
-        type: Object,
-        default: null,
-    },
-});
-
-function deleteFile(dmsFk) {
-    quasar
-        .dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('globals.confirmDeletion'),
-                message: t('globals.confirmDeletionMessage'),
-            },
-        })
-        .onOk(async () => {
-            await axios.post(`dms/${dmsFk}/removeFile`);
-            $props.formRef.formData.dmsFk = null;
-            $props.formRef.formData.dms = undefined;
-            $props.formRef.hasChanges = true;
-            $props.formRef.save();
-        });
-}
-</script>
-<template>
-    <div class="row no-wrap">
-        <VnInput
-            :label="t('Document')"
-            v-model="data.dmsFk"
-            clearable
-            clear-icon="close"
-            class="full-width"
-            :disable="disable"
-        />
-        <div
-            v-if="data.dmsFk"
-            class="row no-wrap q-pa-xs q-gutter-x-xs"
-            data-cy="dms-buttons"
-        >
-            <QBtn
-                :disable="editDownloadDisabled"
-                @click="downloadFile(data.dmsFk)"
-                icon="cloud_download"
-                color="primary"
-                flat
-                :class="{
-                    'no-pointer-events': editDownloadDisabled,
-                }"
-                padding="xs"
-                round
-            >
-                <QTooltip>{{ t('Download file') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                :disable="editDownloadDisabled"
-                @click="
-                    () => {
-                        documentDialogRef.show = true;
-                        documentDialogRef.dms = data.dms;
-                    }
-                "
-                icon="edit"
-                color="primary"
-                flat
-                :class="{
-                    'no-pointer-events': editDownloadDisabled,
-                }"
-                padding="xs"
-                round
-            >
-                <QTooltip>{{ t('Edit document') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                :disable="editDownloadDisabled"
-                @click="deleteFile(data.dmsFk)"
-                icon="delete"
-                color="primary"
-                flat
-                round
-                :class="{
-                    'no-pointer-events': editDownloadDisabled,
-                }"
-                padding="xs"
-            >
-                <QTooltip>{{ t('Delete file') }}</QTooltip>
-            </QBtn>
-        </div>
-        <QBtn
-            v-else
-            icon="add_circle"
-            color="primary"
-            flat
-            round
-            v-shortcut="'+'"
-            padding="xs"
-            @click="
-                () => {
-                    documentDialogRef.show = true;
-                    delete documentDialogRef.dms;
-                }
-            "
-            data-cy="dms-create"
-        >
-            <QTooltip>{{ t('Create document') }}</QTooltip>
-        </QBtn>
-    </div>
-    <QDialog v-model="documentDialogRef.show">
-        <VnDms
-            model="dms"
-            :default-dms-code="defaultDmsCode"
-            :form-initial-data="documentDialogRef.dms"
-            :url="
-                documentDialogRef.dms
-                    ? `Dms/${documentDialogRef.dms.id}/updateFile`
-                    : 'Dms/uploadFile'
-            "
-            :description="documentDialogRef.supplierName"
-            @on-data-saved="
-                (_, { data }) => {
-                    let dmsData = data;
-                    if (Array.isArray(data)) dmsData = data[0];
-                    formRef.formData.dmsFk = dmsData.id;
-                    formRef.formData.dms = dmsData;
-                    formRef.hasChanges = true;
-                    formRef.save();
-                }
-            "
-        />
-    </QDialog>
-</template>
-<i18n>
-es:
-    Document: Documento
-    Download file: Descargar archivo
-    Edit document: Editar documento
-    Delete file: Eliminar archivo
-    Create document: Crear documento
-
-</i18n>

src/components/common/VnDropdown.vue

@@ -1,53 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import VnSelect from './VnSelect.vue';
-
-const stateBtnDropdownRef = ref();
-
-const emit = defineEmits(['changeState']);
-
-const $props = defineProps({
-    disable: {
-        type: Boolean,
-        default: null,
-    },
-    options: {
-        type: Array,
-        default: null,
-    },
-    optionLabel: {
-        type: String,
-        default: 'name',
-    },
-    optionValue: {
-        type: String,
-        default: 'id',
-    },
-});
-
-async function changeState(value) {
-    stateBtnDropdownRef.value?.hide();
-    emit('changeState', value);
-}
-</script>
-
-<template>
-    <QBtnDropdown
-        ref="stateBtnDropdownRef"
-        color="black"
-        text-color="white"
-        :label="$t('globals.changeState')"
-        :disable="$props.disable"
-    >
-        <VnSelect
-            :options="$props.options"
-            :option-label="$props.optionLabel"
-            :option-value="$props.optionValue"
-            hide-selected
-            hide-dropdown-icon
-            focus-on-mount
-            @update:model-value="changeState"
-        >
-        </VnSelect>
-    </QBtnDropdown>
-</template>

src/components/common/VnInput.vue

@@ -84,7 +84,7 @@ const mixinRules = [
     ...($attrs.rules ?? []),
     (val) => {
         const maxlength = $props.maxlength;
-        if (maxlength && +val?.length > maxlength)
+        if (maxlength && +val.length > maxlength)
             return t(`maxLength`, { value: maxlength });
         const { min, max } = vnInputRef.value.$attrs;
         if (!min) return null;

src/components/common/VnInputDate.vue

@@ -107,7 +107,7 @@ const manageDate = (date) => {
             @click="isPopupOpen = !isPopupOpen"
             @keydown="isPopupOpen = false"
             hide-bottom-space
-            :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDate'"
         >
             <template #append>
                 <QIcon

src/components/common/VnLog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
+import { ref, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
@@ -11,11 +11,11 @@ import { useCapitalize } from 'src/composables/useCapitalize';
 import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
 import VnLogValue from './VnLogValue.vue';
+import FetchData from '../FetchData.vue';
+import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
 import VnPaginate from '../ui/VnPaginate.vue';
-import VnLogFilter from 'src/components/common/VnLogFilter.vue';
 import RightMenu from './RightMenu.vue';
-import { useFilterParams } from 'src/composables/useFilterParams';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -72,8 +72,39 @@ const filter = {
 };
 
 const paginate = ref();
-const dataKey = computed(() => `${props.model}Log`);
+const actions = ref();
-const userParams = ref(useFilterParams(dataKey.value).params);
+const changeInput = ref();
+const searchInput = ref();
+const userRadio = ref();
+const userSelect = ref();
+const dateFrom = ref();
+const dateFromDialog = ref(false);
+const dateTo = ref();
+const dateToDialog = ref(false);
+const selectedFilters = ref({});
+const userTypes = [
+    { label: 'All', value: undefined },
+    { label: 'User', value: { neq: null } },
+    { label: 'System', value: null },
+];
+const checkboxOptions = ref({
+    insert: {
+        label: 'Creates',
+        selected: false,
+    },
+    update: {
+        label: 'Edits',
+        selected: false,
+    },
+    delete: {
+        label: 'Deletes',
+        selected: false,
+    },
+    select: {
+        label: 'Accesses',
+        selected: false,
+    },
+});
 
 let validations = models;
 let pointRecord = ref(null);
@@ -215,55 +246,131 @@ async function setLogTree(data) {
 function filterByRecord(modelLog) {
     byRecord.value = true;
     const { id, model } = modelLog;
-    applyFilter({ changedModelId: id, changedModel: model });
+
+    searchInput.value = id;
+    selectedFilters.value.changedModelId = id;
+    selectedFilters.value.changedModel = model;
+    applyFilter();
 }
 
-async function applyFilter(params = {}) {
+async function applyFilter() {
-    paginate.value.arrayData.resetPagination();
+    filter.where = { and: [] };
-    paginate.value.arrayData.applyFilter({
+    if (
-        filter: {},
+        !selectedFilters.value.changedModel ||
-        params: { originFk: route.params.id, ...params },
+        (!selectedFilters.value.changedModelValue &&
-    });
+            !selectedFilters.value.changedModelId)
+    )
+        byRecord.value = false;
+
+    if (!byRecord.value) filter.where.and.push({ originFk: route.params.id });
+
+    if (Object.keys(selectedFilters.value).length) {
+        filter.where.and.push(selectedFilters.value);
+    }
+
+    paginate.value.fetch({ filter });
 }
 
-function exprBuilder(param, value) {
+function setDate(type) {
-    switch (param) {
+    let from = dateFrom.value
-        case 'changedModelValue':
+        ? date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
-            return { [param]: { like: `%${value}%` } };
+        : undefined;
-        case 'change':
+    from = date.adjustDate(from, { hour: 0, minute: 0, second: 0, millisecond: 0 }, true);
-            if (value)
+
-                return {
+    let to = dateTo.value
-                    or: [
+        ? date.formatDate(dateTo.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
-                        { oldJson: { like: `%${value}%` } },
+        : date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD');
-                        { newJson: { like: `%${value}%` } },
+    to = date.adjustDate(
-                        { description: { like: `%${value}%` } },
+        to,
-                    ],
+        { hour: 21, minute: 59, second: 59, millisecond: 999 },
-                };
+        true,
-            break;
+    );
-        case 'action':
+
-            if (value?.length) return { [param]: { inq: value } };
+    switch (type) {
-            break;
         case 'from':
-            return { creationDate: { gte: value } };
+            return { between: [from, to] };
-        case 'to':
+        case 'to': {
-            return { creationDate: { lte: value } };
+            if (dateFrom.value) {
-        case 'userType':
+                return {
-            if (value === 'User') return { userFk: { neq: null } };
+                    between: [from, to],
-            if (value === 'System') return { userFk: null };
+                };
-            break;
+            }
-        default:
+            return { lte: to };
-            return { [param]: value };
+        }
     }
 }
 
+function selectFilter(type, dateType) {
+    const filter = {};
+    const actions = { inq: [] };
+    let reload = true;
+
+    if (type === 'search') {
+        if (/^\s*[0-9]+\s*$/.test(searchInput.value) || props.byRecord) {
+            selectedFilters.value.changedModelId = searchInput.value.trim();
+        } else if (!searchInput.value) {
+            selectedFilters.value.changedModelId = undefined;
+            selectedFilters.value.changedModelValue = undefined;
+        } else {
+            selectedFilters.value.changedModelValue = { like: `%${searchInput.value}%` };
+        }
+    }
+    if (type === 'action' && selectedFilters.value.changedModel === null) {
+        selectedFilters.value.changedModel = undefined;
+    }
+    if (type === 'userRadio') {
+        selectedFilters.value.userFk = userRadio.value;
+    }
+    if (type === 'change') {
+        if (changeInput.value)
+            selectedFilters.value.or = [
+                { oldJson: { like: `%${changeInput.value}%` } },
+                { newJson: { like: `%${changeInput.value}%` } },
+                { description: { like: `%${changeInput.value}%` } },
+            ];
+        else selectedFilters.value.or = undefined;
+    }
+    if (type === 'userSelect') {
+        selectedFilters.value.userFk =
+            userSelect.value !== null ? userSelect.value : undefined;
+    }
+    if (type === 'date') {
+        if (!dateFrom.value && !dateTo.value) {
+            selectedFilters.value.creationDate = undefined;
+        } else if (dateType === 'to') {
+            selectedFilters.value.creationDate = setDate('to');
+        } else if (dateType === 'from') {
+            selectedFilters.value.creationDate = setDate('from');
+        }
+    }
+
+    Object.keys(checkboxOptions.value).forEach((key) => {
+        if (checkboxOptions.value[key].selected) actions.inq.push(key);
+    });
+    selectedFilters.value.action = actions.inq.length ? actions : undefined;
+
+    Object.keys(selectedFilters.value).forEach((key) => {
+        if (selectedFilters.value[key]) filter[key] = selectedFilters.value[key];
+    });
+
+    if (reload) applyFilter(filter);
+}
+
 async function clearFilter() {
+    selectedFilters.value = {};
     byRecord.value = false;
+    userSelect.value = undefined;
+    searchInput.value = undefined;
+    changeInput.value = undefined;
+    dateFrom.value = undefined;
+    dateTo.value = undefined;
+    userRadio.value = undefined;
+    Object.keys(checkboxOptions.value).forEach(
+        (opt) => (checkboxOptions.value[opt].selected = false),
+    );
     await applyFilter();
 }
 
-onMounted(() => {
-    stateStore.rightDrawerChangeValue(true);
-});
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
@@ -276,18 +383,32 @@ watch(
 );
 </script>
 <template>
+    <FetchData
+        :url="`${props.model}Logs/${route.params.id}/models`"
+        :filter="{ order: ['changedModel'] }"
+        @on-fetch="
+            (data) =>
+                (actions = data.map((item) => {
+                    const changedModel = item.changedModel;
+                    return {
+                        locale: useCapitalize(
+                            validations[changedModel]?.locale?.name ?? changedModel,
+                        ),
+                        value: changedModel,
+                    };
+                }))
+        "
+        auto-load
+    />
     <VnPaginate
         ref="paginate"
-        :data-key
+        :data-key="`${model}Log`"
-        :url="dataKey + 's'"
+        :url="`${model}Logs`"
         :user-filter="filter"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
-        @on-change="setLogTree"
         search-url="logs"
-        :exprBuilder
-        :order="['creationDate DESC', 'id DESC']"
     >
         <template #body>
             <div
@@ -346,7 +467,6 @@ watch(
                                             backgroundColor: useColor(modelLog.model),
                                         }"
                                         :title="`${modelLog.model} #${modelLog.id}`"
-                                        data-cy="vnLog-model-chip"
                                     >
                                         {{ t(modelLog.modelI18n) }}
                                     </QChip>
@@ -441,7 +561,9 @@ watch(
                                                                         }}:
                                                                     </span>
                                                                     <VnLogValue
-                                                                        :value="value.val"
+                                                                        :value="
+                                                                            value.val.val
+                                                                        "
                                                                         :name="value.name"
                                                                     />
                                                                 </QItem>
@@ -460,7 +582,6 @@ watch(
                                                             }`,
                                                         )
                                                     "
-                                                    data-cy="vnLog-action-icon"
                                                 />
                                             </div>
                                         </QItem>
@@ -495,9 +616,10 @@ watch(
                                                         {{ prop.nameI18n }}:
                                                     </span>
                                                     <VnLogValue
-                                                        :value="prop.val"
+                                                        :value="prop.val.val"
                                                         :name="prop.name"
                                                     />
+                                                    <VnIconLink />
                                                     <span
                                                         v-if="
                                                             propIndex <
@@ -526,7 +648,7 @@ watch(
                                                     </span>
                                                     <span v-if="log.action == 'update'">
                                                         <VnLogValue
-                                                            :value="prop.old"
+                                                            :value="prop.old.val"
                                                             :name="prop.name"
                                                         />
                                                         <span
@@ -537,7 +659,7 @@ watch(
                                                         </span>
                                                         →
                                                         <VnLogValue
-                                                            :value="prop.val"
+                                                            :value="prop.val.val"
                                                             :name="prop.name"
                                                         />
                                                         <span
@@ -549,7 +671,7 @@ watch(
                                                     </span>
                                                     <span v-else="prop.old.val">
                                                         <VnLogValue
-                                                            :value="prop.val"
+                                                            :value="prop.val.val"
                                                             :name="prop.name"
                                                         />
                                                         <span
@@ -578,12 +700,176 @@ watch(
     </VnPaginate>
     <RightMenu>
         <template #right-panel>
-            <VnLogFilter :data-key />
+            <QList dense>
+                <QSeparator />
+                <QItem class="q-mt-sm">
+                    <QInput
+                        :label="t('globals.search')"
+                        v-model="searchInput"
+                        class="full-width"
+                        clearable
+                        clear-icon="close"
+                        @keyup.enter="() => selectFilter('search')"
+                        @focusout="() => selectFilter('search')"
+                        @clear="() => selectFilter('search')"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItem>
+                <QItem>
+                    <VnSelect
+                        class="full-width"
+                        :label="t('globals.entity')"
+                        v-model="selectedFilters.changedModel"
+                        option-label="locale"
+                        option-value="value"
+                        :options="actions"
+                        @update:model-value="selectFilter('action')"
+                        hide-selected
+                    />
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QOptionGroup
+                        size="sm"
+                        v-model="userRadio"
+                        :options="userTypes"
+                        color="primary"
+                        @update:model-value="selectFilter('userRadio')"
+                        right-label
+                    >
+                        <template #label="{ label }">
+                            {{ t(`Users.${label}`) }}
+                        </template>
+                    </QOptionGroup>
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QItemSection v-if="userRadio !== null">
+                        <VnSelect
+                            class="full-width"
+                            :label="t('globals.user')"
+                            v-model="userSelect"
+                            option-label="name"
+                            option-value="id"
+                            :url="`${model}Logs/${route.params.id}/editors`"
+                            :fields="['id', 'nickname', 'name', 'image']"
+                            sort-by="nickname"
+                            @update:model-value="selectFilter('userSelect')"
+                            hide-selected
+                        >
+                            <template #option="{ opt, itemProps }">
+                                <QItem
+                                    v-bind="itemProps"
+                                    class="q-pa-xs row items-center"
+                                >
+                                    <QItemSection class="col-3 items-center">
+                                        <VnAvatar :worker-id="opt.id" />
+                                    </QItemSection>
+                                    <QItemSection class="col-9 justify-center">
+                                        <span>{{ opt.name }}</span>
+                                        <span class="text-grey">{{ opt.nickname }}</span>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QInput
+                        :label="t('globals.changes')"
+                        v-model="changeInput"
+                        class="full-width"
+                        clearable
+                        clear-icon="close"
+                        @keyup.enter="selectFilter('change')"
+                        @focusout="selectFilter('change')"
+                        @clear="selectFilter('change')"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip max-width="250px">{{
+                                    t('tooltips.changes')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItem>
+                <QItem
+                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
+                    v-for="(checkboxOption, index) in checkboxOptions"
+                    :key="index"
+                >
+                    <QCheckbox
+                        size="sm"
+                        v-model="checkboxOption.selected"
+                        :label="t(`actions.${checkboxOption.label}`)"
+                        @update:model-value="selectFilter"
+                    />
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QInput
+                        class="full-width"
+                        :label="t('globals.date')"
+                        @click="dateFromDialog = true"
+                        @focus="(evt) => evt.target.blur()"
+                        @clear="selectFilter('date', 'to')"
+                        v-model="dateFrom"
+                        clearable
+                        clear-icon="close"
+                    />
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QInput
+                        class="full-width"
+                        :label="t('globals.to')"
+                        @click="dateToDialog = true"
+                        @focus="(evt) => evt.target.blur()"
+                        @clear="selectFilter('date', 'from')"
+                        v-model="dateTo"
+                        clearable
+                        clear-icon="close"
+                    />
+                </QItem>
+            </QList>
         </template>
     </RightMenu>
+    <QDialog v-model="dateFromDialog">
+        <QDate
+            :years-in-month-view="false"
+            v-model="dateFrom"
+            dense
+            flat
+            minimal
+            @update:model-value="
+                (value) => {
+                    dateFromDialog = false;
+                    dateFrom = date.formatDate(value, 'DD-MM-YYYY');
+                    selectFilter('date', 'from');
+                }
+            "
+        />
+    </QDialog>
+    <QDialog v-model="dateToDialog">
+        <QDate
+            v-model="dateTo"
+            dense
+            flat
+            minimal
+            @update:model-value="
+                (value) => {
+                    dateToDialog = false;
+                    dateTo = date.formatDate(value, 'DD-MM-YYYY');
+                    selectFilter('date', 'to');
+                }
+            "
+        />
+    </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn
-            v-if="Object.keys(userParams).some((filter) => filter !== 'originFk')"
+            v-if="Object.values(selectedFilters).some((filter) => filter !== undefined)"
             color="primary"
             icon="filter_alt_off"
             size="md"

src/components/common/VnLogFilter.vue

@@ -1,249 +1,77 @@
 <script setup>
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnTableFilter from '../VnTable/VnTableFilter.vue';
+import FetchData from 'components/FetchData.vue';
-import VnSelect from './VnSelect.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import { useRoute } from 'vue-router';
-import VnInput from './VnInput.vue';
-import { ref, computed, watch } from 'vue';
-import VnInputDate from './VnInputDate.vue';
-import { useFilterParams } from 'src/composables/useFilterParams';
-import FetchData from '../FetchData.vue';
-import { useValidator } from 'src/composables/useValidator';
-import { useCapitalize } from 'src/composables/useCapitalize';
-import VnAvatar from '../ui/VnAvatar.vue';
 
-const $props = defineProps({
+const { t } = useI18n();
+const props = defineProps({
     dataKey: {
         type: String,
-        default: null,
+        required: true,
     },
 });
 
-const { t } = useI18n();
+const workers = ref();
-const route = useRoute();
-const validationsStore = useValidator();
-const { models } = validationsStore;
-const entities = ref([]);
-const editors = ref([]);
-const userParams = ref(useFilterParams($props.dataKey).params);
-let validations = models;
-const userTypes = [
-    { value: 'All', label: t(`Users.All`) },
-    { value: 'User', label: t(`Users.User`) },
-    { value: 'System', label: t(`Users.System`) },
-];
-const checkboxOptions = ref([
-    { name: 'insert', label: 'Creates', selected: false },
-    { name: 'update', label: 'Edits', selected: false },
-    { name: 'delete', label: 'Deletes', selected: false },
-    { name: 'select', label: 'Accesses', selected: false },
-]);
-const columns = computed(() => [
-    { name: 'changedModelValue' },
-    { name: 'changedModel' },
-    { name: 'userType', orderBy: false },
-    { name: 'userFk' },
-    { name: 'change', orderBy: false },
-    { name: 'action' },
-    { name: 'from', orderBy: 'creationDate' },
-    { name: 'to', orderBy: 'creationDate' },
-]);
-
-const userParamsWatcher = watch(
-    () => userParams.value,
-    (params) => {
-        if (params.action) {
-            params.action.forEach((option) => {
-                checkboxOptions.value.find((o) => o.name === option).selected = true;
-            });
-            userParamsWatcher();
-        }
-    },
-);
-
-function getActions() {
-    const actions = checkboxOptions.value
-        .filter((option) => option.selected)
-        ?.map((o) => o.name);
-    return actions.length ? actions : null;
-}
 </script>
 
 <template>
     <FetchData
-        :url="`${dataKey}s/${route.params.id}/models`"
+        url="Workers/activeWithInheritedRole"
-        :filter="{ order: ['changedModel'] }"
+        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="
+        @on-fetch="(data) => (workers = data)"
-            (data) =>
-                (entities = data.map((item) => {
-                    const changedModel = item.changedModel;
-                    return {
-                        locale: useCapitalize(
-                            validations[changedModel]?.locale?.name ?? changedModel,
-                        ),
-                        value: changedModel,
-                    };
-                }))
-        "
         auto-load
     />
-    <FetchData
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        :url="`${dataKey}s/${route.params.id}/editors`"
+        <template #tags="{ tag, formatFn }">
-        :filter="{ fields: ['id', 'nickname', 'name', 'image'] }"
+            <div class="q-gutter-x-xs">
-        sort-by="nickname"
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-        @on-fetch="(data) => (editors = data)"
+                <span>{{ formatFn(tag.value) }}</span>
-        auto-load
+            </div>
-    />
+        </template>
-    <VnTableFilter
+        <template #body="{ params, searchFn }">
-        v-if="dataKey"
+            <QDate
-        :data-key
+                v-model="params.created"
-        :columns="columns"
+                @update:model-value="searchFn()"
-        :redirect="false"
+                dense
-        :hiddenTags="['originFk', 'creationDate']"
+                flat
-        search-url="logs"
+                minimal
-        :showTagChips="false"
             >
-        <template #filter-changedModelValue="{ params, columnName, searchFn }">
+            </QDate>
-            <VnInput
+            <QSeparator />
-                :label="t('globals.search')"
+            <QItem>
-                v-model="params[columnName]"
+                <QItemSection v-if="!workers">
-                @keyup.enter="searchFn"
+                    <QSkeleton type="QInput" class="full-width" />
-                @blur="searchFn"
-                @remove="searchFn"
-                :info="t('tooltips.search')"
-                dense
-                filled
-                data-cy="vnLog-search"
-            />
-        </template>
-        <template #filter-changedModel="{ params, columnName, searchFn }">
-            <VnSelect
-                :label="t('globals.entity')"
-                v-model="params[columnName]"
-                option-label="locale"
-                option-value="value"
-                :options="entities"
-                @update:model-value="() => searchFn()"
-                dense
-                filled
-                data-cy="vnLog-entity"
-            />
-        </template>
-        <template #filter-userType="{ params, columnName, searchFn }">
-            <QOptionGroup
-                class="text-left"
-                size="sm"
-                v-model="params[columnName]"
-                :options="userTypes"
-                color="primary"
-                @update:model-value="
-                    () => {
-                        params.userFk = null;
-                        searchFn();
-                    }
-                "
-            />
-        </template>
-        <template #filter-userFk="{ params, columnName, searchFn }">
-            <VnSelect
-                :label="t('globals.user')"
-                v-model="params[columnName]"
-                :options="editors"
-                @update:modelValue="() => searchFn()"
-                :disable="params.userType === 'System'"
-                dense
-                filled
-            >
-                <template #option="{ opt, itemProps }">
-                    <QItem v-bind="itemProps" class="q-pa-xs row items-center">
-                        <QItemSection class="col-3 items-center">
-                            <VnAvatar :worker-id="opt.id" />
                 </QItemSection>
-                        <QItemSection class="col-9 justify-center">
+                <QItemSection v-if="workers">
-                            <span>{{ opt.name }}</span>
+                    <QSelect
-                            <span class="text-grey">{{ opt.nickname }}</span>
+                        :label="t('User')"
+                        v-model="params.userFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
                 </QItemSection>
             </QItem>
         </template>
-            </VnSelect>
+    </VnFilterPanel>
-        </template>
-        <template #filter-change="{ params, columnName, searchFn }">
-            <VnInput
-                :label="t('globals.changes')"
-                v-model="params[columnName]"
-                @keyup.enter="searchFn"
-                @blur="searchFn"
-                @remove="searchFn"
-                :info="t('tooltips.changes')"
-                dense
-                filled
-            />
-        </template>
-        <template #filter-action="{ searchFn }">
-            <div class="column">
-                <QCheckbox
-                    v-for="checkboxOption in checkboxOptions"
-                    :key="checkboxOption"
-                    size="sm"
-                    v-model="checkboxOption.selected"
-                    :label="t(`actions.${checkboxOption.label}`)"
-                    @update:model-value="
-                        () => searchFn(undefined, 'action', getActions())
-                    "
-                    data-cy="vnLog-checkbox"
-                />
-            </div>
-        </template>
-        <template #filter-from="{ params, columnName, searchFn }">
-            <VnInputDate
-                :label="t('globals.from')"
-                v-model="params[columnName]"
-                dense
-                filled
-                @update:modelValue="() => searchFn()"
-            />
-        </template>
-        <template #filter-to="{ params, columnName, searchFn }">
-            <VnInputDate
-                :label="t('globals.to')"
-                v-model="params[columnName]"
-                dense
-                filled
-                @update:modelValue="() => searchFn()"
-            />
-        </template>
-    </VnTableFilter>
 </template>
-<i18n>
-es:
-    tooltips:
-        search: Buscar por identificador o concepto
-        changes: Buscar por cambios. Los atributos deben buscarse por su nombre interno, para obtenerlo situar el cursor sobre el atributo.
-    actions:
-        Creates: Crea
-        Edits: Modifica
-        Deletes: Elimina
-        Accesses: Accede
-    Users:
-        User: Usuario
-        All: Todo
-        System: Sistema
-    params:
-        changedModel: Entity
 
+<i18n>
 en:
-    tooltips:
-        search: Search by identifier or concept
-        changes: Search by changes. Attributes must be searched by their internal name, to get it place the cursor over the attribute.
-    actions:
-        Creates: Creates
-        Edits: Edits
-        Deletes: Deletes
-        Accesses: Accesses
-    Users:
-        User: User
-        All: All
-        System: System
     params:
-        changedModel: Entidad
+        search: Contains
+        userFk: User
+        created: Created
+es:
+    params:
+        search: Contiene
+        userFk: Usuario
+        created: Creada
+    User: Usuario
 </i18n>

src/components/common/VnLogValue.vue

@@ -5,24 +5,18 @@ import { computed } from 'vue';
 const descriptorStore = useDescriptorStore();
 
 const $props = defineProps({
-    value: { type: Object, default: () => {} },
+    name: { type: [String], default: undefined },
-    name: { type: String, default: undefined },
 });
 
 const descriptor = computed(() => descriptorStore.has($props.name));
 </script>
 <template>
-    <VnJsonValue :value="value.val" />
+    <VnJsonValue v-bind="$attrs" />
-    <span
-        v-if="(value.id || typeof value.val == 'number') && descriptor"
-        style="margin-left: 2px"
-    >
     <QIcon
         name="launch"
         class="link"
+        v-if="$attrs.value && descriptor"
         :data-cy="'iconLaunch-' + $props.name"
-            style="padding-bottom: 2px"
     />
-        <component :is="descriptor" :id="value.id ?? value.val" />
+    <component :is="descriptor" :id="$attrs.value" v-if="$attrs.value && descriptor" />
-    </span>
 </template>

src/components/common/VnSection.vue

@@ -40,6 +40,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    keepData: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const route = useRoute();
@@ -57,6 +61,7 @@ onBeforeMount(() => {
     if ($props.dataKey)
         arrayData = useArrayData($props.dataKey, {
             searchUrl: 'table',
+            keepData: $props.keepData,
             ...$props.arrayDataProps,
             navigate: $props.redirect,
         });

src/components/common/VnSelect.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted, useAttrs, nextTick } from 'vue';
+import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRequired } from 'src/composables/useRequired';
@@ -152,10 +152,6 @@ const value = computed({
     },
 });
 
-const computedSortBy = computed(() => {
-    return $props.sortBy || $props.optionLabel + ' ASC';
-});
-
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -190,7 +186,7 @@ function findKeyInOptions() {
 }
 
 function setOptions(data) {
-    data = dataByOrder(data, computedSortBy.value);
+    data = dataByOrder(data, $props.sortBy);
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
     emit('update:options', data);
@@ -220,8 +216,7 @@ function filter(val, options) {
 async function fetchFilter(val) {
     if (!$props.url) return;
 
-    const { fields, include, limit } = $props;
+    const { fields, include, sortBy, limit } = $props;
-    const sortBy = computedSortBy.value;
     const key =
         optionFilterValue.value ??
         (new RegExp(/\d/g).test(val)
@@ -252,7 +247,6 @@ async function fetchFilter(val) {
 }
 
 async function filterHandler(val, update) {
-    if (isLoading.value) return update();
     if (!val && lastVal.value === val) {
         lastVal.value = val;
         return update();
@@ -300,7 +294,6 @@ async function onScroll({ to, direction, from, index }) {
         await arrayData.loadMore();
         setOptions(arrayData.store.data);
         vnSelectRef.value.scrollTo(lastIndex);
-        await nextTick();
         isLoading.value = false;
     }
 }

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

@@ -6,13 +6,10 @@ describe('VnDmsList', () => {
     let vm;
     const dms = { 
         userFk: 1, 
-        name: 'DMS 1',
+        name: 'DMS 1' 
     };
     
     beforeAll(() => {
-        vi.mock('src/composables/getUrl', () => ({
-            getUrl: vi.fn().mockResolvedValue(''),
-        }));
         vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         vm = createWrapper(VnDmsList, {
             props: {
@@ -21,8 +18,8 @@ describe('VnDmsList', () => {
                 filter: 'wd.workerFk',
                 updateModel: 'Workers',
                 deleteModel: 'WorkerDms',
-                downloadModel: 'WorkerDms',
+                downloadModel: 'WorkerDms' 
-            },
+            }
         }).vm;
     });
 
@@ -37,7 +34,7 @@ describe('VnDmsList', () => {
                 name: 'Jessica',
                 lastName: 'Jones',
                 file: '4.jpg',
-                created: '2021-07-28 21:00:00',
+                created: '2021-07-28 21:00:00'
             },
             { 
                 userFk: 2, 
@@ -50,26 +47,27 @@ describe('VnDmsList', () => {
                     lastName: 'BannerDMS',
                     created: '2022-07-28 21:00:00',
                     file: '4.jpg',
-                },
+                } 
             },
             {
                 userFk: 3,
                 name: 'Natasha',
                 lastName: 'Romanoff',
                 file: '4.jpg',
-                created: '2021-10-28 21:00:00',
+                created: '2021-10-28 21:00:00'
-            },
+            }  
-        ];
+        ]
 
         it('Should replace objects that contain the "dms" property with the value of the same and sort by creation date', () => {
             vm.setData(data);
             expect([vm.rows][0][0].lastName).toEqual('BannerDMS');
             expect([vm.rows][0][1].lastName).toEqual('Romanoff');
+
         });
     });
 
     describe('parseDms()', () => {
-        const resultDms = { ...dms, userId: 1 };
+        const resultDms = { ...dms, userId:1};
         
         it('Should add properties that end with "Fk" by changing the suffix to "Id"', () => {
             const parsedDms = vm.parseDms(dms);
@@ -78,7 +76,7 @@ describe('VnDmsList', () => {
     });
 
     describe('showFormDialog()', () => {
-        const resultDms = { ...dms, userId: 1 };
+        const resultDms = { ...dms, userId:1};
         
         it('should call fn parseDms() and set show true if dms is defined', () => {
             vm.showFormDialog(dms);

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

@@ -108,4 +108,27 @@ describe('VnLog', () => {
         expect(vm.logTree[0].originFk).toEqual(1);
         expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
     });
+
+    it('should correctly set the selectedFilters when filtering', () => {
+        vm.searchInput = '1';
+        vm.userSelect = '21';
+        vm.checkboxOptions.insert.selected = true;
+        vm.checkboxOptions.update.selected = true;
+
+        vm.selectFilter('search');
+        vm.selectFilter('userSelect');
+
+        expect(vm.selectedFilters.changedModelId).toEqual('1');
+        expect(vm.selectedFilters.userFk).toEqual('21');
+        expect(vm.selectedFilters.action).toEqual({ inq: ['insert', 'update'] });
+    });
+
+    it('should correctly set the date from', () => {
+        vm.dateFrom = '18-09-2023';
+        vm.selectFilter('date', 'from');
+        expect(vm.selectedFilters.creationDate.between).toEqual([
+            new Date('2023-09-18T00:00:00.000Z'),
+            new Date('2023-09-18T21:59:59.999Z'),
+        ]);
+    });
 });

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

@@ -1,28 +0,0 @@
-import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnLogFilter from 'src/components/common/VnLogFilter.vue';
-
-describe('VnLogFilter', () => {
-    let vm;
-    beforeAll(async () => {
-        vm = createWrapper(VnLogFilter, {
-            props: {
-                dataKey: 'ClaimLog',
-            },
-        }).vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    it('should getActions selected', async () => {
-        vm.checkboxOptions.find((o) => o.name == 'insert').selected = true;
-        vm.checkboxOptions.find((o) => o.name == 'update').selected = true;
-
-        const actions = vm.getActions();
-
-        expect(actions.length).toEqual(2);
-        expect(actions).toEqual(['insert', 'update']);
-    });
-});

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

@@ -1,6 +1,16 @@
-import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
+import {
+    describe,
+    it,
+    expect,
+    vi,
+    beforeAll,
+    afterEach,
+    beforeEach,
+    afterAll,
+} from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnNotes from 'src/components/ui/VnNotes.vue';
+import vnDate from 'src/boot/vnDate';
 
 describe('VnNotes', () => {
     let vm;
@@ -8,7 +18,6 @@ describe('VnNotes', () => {
     let spyFetch;
     let postMock;
     let patchMock;
-    let deleteMock;
     let expectedInsertBody;
     let expectedUpdateBody;
     const defaultOptions = {
@@ -48,7 +57,6 @@ describe('VnNotes', () => {
     beforeEach(() => {
         postMock = vi.spyOn(axios, 'post');
         patchMock = vi.spyOn(axios, 'patch');
-        deleteMock = vi.spyOn(axios, 'delete');
     });
 
     afterEach(() => {
@@ -145,16 +153,4 @@ describe('VnNotes', () => {
             );
         });
     });
-
-    describe('delete', () => {
-        it('Should call axios.delete with url and vnPaginateRef.fetch', async () => {
-            generateWrapper();
-            createSpyFetch();
-
-            await vm.deleteNote({ id: 1 });
-
-            expect(deleteMock).toHaveBeenCalledWith(`${vm.$props.url}/1`);
-            expect(spyFetch).toHaveBeenCalled();
-        });
-    });
 });

src/components/ui/CardDescriptor.vue

@@ -1,38 +1,355 @@
 <script setup>
-import { ref } from 'vue';
+import { onBeforeMount, watch, computed, ref } from 'vue';
-import VnDescriptor from './VnDescriptor.vue';
+import { useI18n } from 'vue-i18n';
+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, useRouter } from 'vue-router';
+import { useClipboard } from 'src/composables/useClipboard';
+import VnMoreOptions from './VnMoreOptions.vue';
 
 const $props = defineProps({
-    id: {
+    url: {
-        type: Number,
+        type: String,
-        default: false,
+        default: '',
     },
-    card: {
+    filter: {
         type: Object,
         default: null,
     },
+    title: {
+        type: String,
+        default: '',
+    },
+    subtitle: {
+        type: Number,
+        default: null,
+    },
+    dataKey: {
+        type: String,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+    width: {
+        type: String,
+        default: 'md-width',
+    },
 });
 
+const state = useState();
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+const { copyText } = useClipboard();
+const { viewSummary } = useSummaryDialog();
+let arrayData;
+let store;
+let entity;
+const isLoading = ref(false);
+const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+const DESCRIPTOR_PROXY = 'DescriptorProxy';
+const moduleName = ref();
+const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
+defineExpose({ getData });
+
+onBeforeMount(async () => {
+    arrayData = useArrayData($props.dataKey, {
+        url: $props.url,
+        userFilter: $props.filter,
+        skip: 0,
+        oneRecord: true,
+    });
+    store = arrayData.store;
+    entity = computed(() => {
+        const data = store.data ?? {};
+        if (data) emit('onFetch', data);
+        return data;
+    });
+
+    // It enables to load data only once if the module is the same as the dataKey
+    if (!isSameDataKey.value || !route.params.id) await getData();
+    watch(
+        () => [$props.url, $props.filter],
+        async () => {
+            if (!isSameDataKey.value) await getData();
+        },
+    );
+});
+
+function getName() {
+    let name = $props.dataKey;
+    if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
+        name = name.split(DESCRIPTOR_PROXY)[0];
+    }
+    return name;
+}
+const routeName = computed(() => {
+    let routeName = getName();
+    return `${routeName}Summary`;
+});
+
+async function getData() {
+    store.url = $props.url;
+    store.filter = $props.filter ?? {};
+    isLoading.value = true;
+    try {
+        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        state.set($props.dataKey, data);
+        emit('onFetch', data);
+    } finally {
+        isLoading.value = false;
+    }
+}
+
+function getValueFromPath(path) {
+    if (!path) return;
+    const keys = path.toString().split('.');
+    let current = entity.value;
+
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
+    }
+    return current;
+}
+
+function copyIdText(id) {
+    copyText(id, {
+        component: {
+            copyValue: id,
+        },
+    });
+}
+
 const emit = defineEmits(['onFetch']);
-const entity = ref();
+
+const iconModule = computed(() => {
+    moduleName.value = getName();
+    if (isSameModuleName) {
+        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
+            ?.meta?.icon;
+    } else {
+        return route.matched[1].meta.icon;
+    }
+});
+
+const toModule = computed(() => {
+    moduleName.value = getName();
+    if (isSameModuleName) {
+        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
+            ?.children[0]?.redirect;
+    } else {
+        return route.matched[1].path.split('/').length > 2
+            ? route.matched[1].redirect
+            : route.matched[1].children[0].redirect;
+    }
+});
 </script>
 
 <template>
-    <component
+    <div class="descriptor">
-        :is="card"
+        <template v-if="entity && !isLoading">
-        :id
+            <div class="header bg-primary q-pa-sm justify-between">
-        :visual="false"
+                <slot name="header-extra-action">
-        v-bind="$attrs"
+                    <QBtn
-        @on-fetch="
+                        round
-            (data) => {
+                        flat
-                entity = data;
+                        dense
-                emit('onFetch', data);
+                        size="md"
-            }
+                        :icon="iconModule"
-        "
+                        color="white"
-    />
+                        class="link"
-    <VnDescriptor v-model="entity" v-bind="$attrs">
+                        :to="toModule"
-        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+                    >
-            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+                        <QTooltip>
+                            {{ t('globals.goToModuleIndex') }}
+                        </QTooltip>
+                    </QBtn>
+                </slot>
+                <QBtn
+                    @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
+                    round
+                    flat
+                    dense
+                    size="md"
+                    icon="preview"
+                    color="white"
+                    class="link"
+                    v-if="summary"
+                    data-cy="openSummaryBtn"
+                >
+                    <QTooltip>
+                        {{ t('components.smartCard.openSummary') }}
+                    </QTooltip>
+                </QBtn>
+                <RouterLink :to="{ name: routeName, params: { id: entity.id } }">
+                    <QBtn
+                        class="link"
+                        color="white"
+                        dense
+                        flat
+                        icon="launch"
+                        round
+                        size="md"
+                        data-cy="goToSummaryBtn"
+                    >
+                        <QTooltip>
+                            {{ t('components.cardDescriptor.summary') }}
+                        </QTooltip>
+                    </QBtn>
+                </RouterLink>
+                <VnMoreOptions v-if="$slots.menu">
+                    <template #menu="{ menuRef }">
+                        <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                     </template>
-    </VnDescriptor>
+                </VnMoreOptions>
+            </div>
+            <slot name="before" />
+            <div class="body q-py-sm">
+                <QList dense>
+                    <QItemLabel header class="ellipsis text-h5" :lines="1">
+                        <div class="title">
+                            <span v-if="$props.title" :title="getValueFromPath(title)">
+                                {{ getValueFromPath(title) ?? $props.title }}
+                            </span>
+                            <slot v-else name="description" :entity="entity">
+                                <span :title="entity.name">
+                                    {{ entity.name }}
+                                </span>
+                            </slot>
+                        </div>
+                    </QItemLabel>
+                    <QItem>
+                        <QItemLabel class="subtitle" data-cy="descriptor_id">
+                            #{{ getValueFromPath(subtitle) ?? entity.id }}
+                        </QItemLabel>
+                        <QBtn
+                            round
+                            flat
+                            dense
+                            size="sm"
+                            icon="content_copy"
+                            color="primary"
+                            @click.stop="copyIdText(entity.id)"
+                        >
+                            <QTooltip>
+                                {{ t('globals.copyId') }}
+                            </QTooltip>
+                        </QBtn>
+                    </QItem>
+                </QList>
+                <div class="list-box q-mt-xs">
+                    <slot name="body" :entity="entity" />
+                </div>
+            </div>
+            <div class="icons">
+                <slot name="icons" :entity="entity" />
+            </div>
+            <div class="actions justify-center" data-cy="descriptor_actions">
+                <slot name="actions" :entity="entity" />
+            </div>
+            <slot name="after" />
+        </template>
+        <SkeletonDescriptor v-if="!entity || isLoading" />
+    </div>
+    <QInnerLoading
+        :label="t('globals.pleaseWait')"
+        :showing="isLoading"
+        color="primary"
+    />
 </template>
+
+<style lang="scss">
+.body {
+    background-color: var(--vn-section-color);
+    .text-h5 {
+        font-size: 20px;
+        padding-top: 5px;
+        padding-bottom: 0px;
+    }
+    .q-item {
+        min-height: 20px;
+
+        .link {
+            margin-left: 10px;
+        }
+    }
+    .vn-label-value {
+        display: flex;
+        padding: 0px 16px;
+        .label {
+            color: var(--vn-label-color);
+            font-size: 14px;
+
+            &:not(:has(a))::after {
+                content: ':';
+            }
+        }
+        .value {
+            color: var(--vn-text-color);
+            font-size: 14px;
+            margin-left: 4px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            text-align: left;
+        }
+        .info {
+            margin-left: 5px;
+        }
+    }
+}
+</style>
+
+<style lang="scss" scoped>
+.title {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    span {
+        color: var(--vn-text-color);
+        font-weight: bold;
+    }
+}
+.subtitle {
+    color: var(--vn-text-color);
+    font-size: 16px;
+    margin-bottom: 2px;
+}
+.list-box {
+    .q-item__label {
+        color: var(--vn-label-color);
+        padding-bottom: 0%;
+    }
+}
+.descriptor {
+    width: 256px;
+    .header {
+        display: flex;
+        align-items: center;
+    }
+    .icons {
+        margin: 0 10px;
+        display: flex;
+        justify-content: center;
+        .q-icon {
+            margin-right: 5px;
+        }
+    }
+    .actions {
+        margin: 0 5px;
+        justify-content: center !important;
+    }
+}
+</style>
+<i18n>
+    en:
+        globals:
+            copyId: Copy ID
+    es:
+        globals:
+            copyId: Copiar ID
+</i18n>

src/components/ui/CardSummary.vue

@@ -159,7 +159,6 @@ async function fetch() {
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;
-                align-items: start;
                 .label {
                     color: var(--vn-label-color);
                     width: 9em;
@@ -170,15 +169,9 @@ async function fetch() {
                     flex-grow: 0;
                     flex-shrink: 0;
                 }
-                &.ellipsis > .value {
-                    text-overflow: ellipsis;
-                    white-space: pre;
-                }
                 .value {
                     color: var(--vn-text-color);
                     overflow: hidden;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
                 }
             }
             .header {
@@ -208,23 +201,6 @@ async function fetch() {
         }
     }
 }
-
-.vn-card-group {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-    gap: 16px;
-}
-
-.vn-card-content {
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    > div {
-        max-height: 70px;
-    }
-}
 </style>
 <style lang="scss" scoped>
 .summaryHeader .vn-label-value {

src/components/ui/EntityDescriptor.vue

@@ -1,78 +0,0 @@
-<script setup>
-import { onBeforeMount, watch, computed, ref } from 'vue';
-import { useArrayData } from 'composables/useArrayData';
-import { useState } from 'src/composables/useState';
-import { useRoute } from 'vue-router';
-import VnDescriptor from './VnDescriptor.vue';
-
-const $props = defineProps({
-    url: {
-        type: String,
-        default: '',
-    },
-    filter: {
-        type: Object,
-        default: null,
-    },
-    dataKey: {
-        type: String,
-        default: null,
-    },
-});
-
-const state = useState();
-const route = useRoute();
-let arrayData;
-let store;
-let entity;
-const isLoading = ref(false);
-const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
-defineExpose({ getData });
-
-onBeforeMount(async () => {
-    arrayData = useArrayData($props.dataKey, {
-        url: $props.url,
-        userFilter: $props.filter,
-        skip: 0,
-        oneRecord: true,
-    });
-    store = arrayData.store;
-    entity = computed(() => {
-        const data = store.data ?? {};
-        if (data) emit('onFetch', data);
-        return data;
-    });
-
-    // It enables to load data only once if the module is the same as the dataKey
-    if (!isSameDataKey.value || !route.params.id) await getData();
-    watch(
-        () => [$props.url, $props.filter],
-        async () => {
-            if (!isSameDataKey.value) await getData();
-        },
-    );
-});
-
-async function getData() {
-    store.url = $props.url;
-    store.filter = $props.filter ?? {};
-    isLoading.value = true;
-    try {
-        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-        state.set($props.dataKey, data);
-        emit('onFetch', data);
-    } finally {
-        isLoading.value = false;
-    }
-}
-
-const emit = defineEmits(['onFetch']);
-</script>
-
-<template>
-    <VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey">
-        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
-            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-        </template>
-    </VnDescriptor>
-</template>

src/components/ui/VnDescriptor.vue

@@ -1,322 +0,0 @@
-<script setup>
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useRoute, useRouter } from 'vue-router';
-import { useClipboard } from 'src/composables/useClipboard';
-import VnMoreOptions from './VnMoreOptions.vue';
-
-const entity = defineModel({ type: Object, default: null });
-const $props = defineProps({
-    title: {
-        type: String,
-        default: '',
-    },
-    subtitle: {
-        type: Number,
-        default: null,
-    },
-    summary: {
-        type: Object,
-        default: null,
-    },
-    width: {
-        type: String,
-        default: 'md-width',
-    },
-    module: {
-        type: String,
-        default: null,
-    },
-    toModule: {
-        type: Object,
-        default: null,
-    },
-});
-
-const route = useRoute();
-const router = useRouter();
-const { t } = useI18n();
-const { copyText } = useClipboard();
-const { viewSummary } = useSummaryDialog();
-const DESCRIPTOR_PROXY = 'DescriptorProxy';
-const moduleName = ref();
-const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
-
-function getName() {
-    let name = $props.module;
-    if ($props.module.includes(DESCRIPTOR_PROXY)) {
-        name = name.split(DESCRIPTOR_PROXY)[0];
-    }
-    return name;
-}
-const routeName = computed(() => {
-    let routeName = getName();
-    return `${routeName}Summary`;
-});
-
-function getValueFromPath(path) {
-    if (!path) return;
-    const keys = path.toString().split('.');
-    let current = entity.value;
-
-    for (const key of keys) {
-        if (current[key] === undefined) return undefined;
-        else current = current[key];
-    }
-    return current;
-}
-
-function copyIdText(id) {
-    copyText(id, {
-        component: {
-            copyValue: id,
-        },
-    });
-}
-
-const emit = defineEmits(['onFetch']);
-
-const iconModule = computed(() => {
-    moduleName.value = getName();
-    if ($props.toModule) {
-        return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
-    }
-    if (isSameModuleName) {
-        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
-            ?.meta?.icon;
-    } else {
-        return route.matched[1].meta.icon;
-    }
-});
-
-const toModule = computed(() => {
-    moduleName.value = getName();
-    if ($props.toModule) return $props.toModule;
-    if (isSameModuleName) {
-        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
-            ?.redirect;
-    } else {
-        return route.matched[1].path.split('/').length > 2
-            ? route.matched[1].redirect
-            : route.matched[1].children[0].redirect;
-    }
-});
-</script>
-
-<template>
-    <div class="descriptor" data-cy="vnDescriptor">
-        <template v-if="entity && entity?.id">
-            <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action">
-                    <QBtn
-                        round
-                        flat
-                        dense
-                        size="md"
-                        :icon="iconModule"
-                        color="white"
-                        class="link"
-                        :to="toModule"
-                    >
-                        <QTooltip>
-                            {{ t('globals.goToModuleIndex') }}
-                        </QTooltip>
-                    </QBtn>
-                </slot>
-                <QBtn
-                    @click.stop="viewSummary(entity.id, summary, width)"
-                    round
-                    flat
-                    dense
-                    size="md"
-                    icon="preview"
-                    color="white"
-                    class="link"
-                    v-if="summary"
-                    data-cy="openSummaryBtn"
-                >
-                    <QTooltip>
-                        {{ t('components.smartCard.openSummary') }}
-                    </QTooltip>
-                </QBtn>
-                <RouterLink :to="{ name: routeName, params: { id: entity.id } }">
-                    <QBtn
-                        class="link"
-                        color="white"
-                        dense
-                        flat
-                        icon="launch"
-                        round
-                        size="md"
-                        data-cy="goToSummaryBtn"
-                    >
-                        <QTooltip>
-                            {{ t('components.vnDescriptor.summary') }}
-                        </QTooltip>
-                    </QBtn>
-                </RouterLink>
-                <VnMoreOptions v-if="$slots.menu">
-                    <template #menu="{ menuRef }">
-                        <slot name="menu" :entity="entity" :menu-ref="menuRef" />
-                    </template>
-                </VnMoreOptions>
-            </div>
-            <slot name="before" />
-            <div class="body q-py-sm">
-                <QList dense>
-                    <QItemLabel header class="ellipsis text-h5" :lines="1">
-                        <div class="title">
-                            <span
-                                v-if="title"
-                                :title="getValueFromPath(title)"
-                                :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
-                            >
-                                {{ getValueFromPath(title) ?? title }}
-                            </span>
-                            <slot v-else name="description" :entity="entity">
-                                <span
-                                    :title="entity.name"
-                                    :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_description`"
-                                    v-text="entity.name"
-                                />
-                            </slot>
-                        </div>
-                    </QItemLabel>
-                    <QItem>
-                        <QItemLabel
-                            class="subtitle"
-                            :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
-                        >
-                            #{{ getValueFromPath(subtitle) ?? entity.id }}
-                        </QItemLabel>
-                        <QBtn
-                            round
-                            flat
-                            dense
-                            size="sm"
-                            icon="content_copy"
-                            color="primary"
-                            @click.stop="copyIdText(entity.id)"
-                        >
-                            <QTooltip>
-                                {{ t('globals.copyId') }}
-                            </QTooltip>
-                        </QBtn>
-                    </QItem>
-                </QList>
-                <div
-                    class="list-box q-mt-xs"
-                    :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_listbox`"
-                >
-                    <slot name="body" :entity="entity" />
-                </div>
-            </div>
-            <div class="icons">
-                <slot name="icons" :entity="entity" />
-            </div>
-            <div class="actions justify-center" data-cy="descriptor_actions">
-                <slot name="actions" :entity="entity" />
-            </div>
-            <slot name="after" />
-        </template>
-        <SkeletonDescriptor v-if="!entity" />
-    </div>
-    <QInnerLoading :label="t('globals.pleaseWait')" :showing="!entity" color="primary" />
-</template>
-
-<style lang="scss">
-.body {
-    background-color: var(--vn-section-color);
-    .text-h5 {
-        font-size: 20px;
-        padding-top: 5px;
-        padding-bottom: 0px;
-    }
-    .q-item {
-        min-height: 20px;
-
-        .link {
-            margin-left: 10px;
-        }
-    }
-    .vn-label-value {
-        display: flex;
-        padding: 0px 16px;
-        .label {
-            color: var(--vn-label-color);
-            font-size: 14px;
-
-            &:not(:has(a))::after {
-                content: ':';
-            }
-        }
-        &.ellipsis > .value {
-            text-overflow: ellipsis;
-            white-space: pre;
-        }
-        .value {
-            color: var(--vn-text-color);
-            font-size: 14px;
-            margin-left: 4px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            text-align: left;
-        }
-        .info {
-            margin-left: 5px;
-        }
-    }
-}
-</style>
-
-<style lang="scss" scoped>
-.title {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    span {
-        color: var(--vn-text-color);
-        font-weight: bold;
-    }
-}
-.subtitle {
-    color: var(--vn-text-color);
-    font-size: 16px;
-    margin-bottom: 2px;
-}
-.list-box {
-    .q-item__label {
-        color: var(--vn-label-color);
-        padding-bottom: 0%;
-    }
-}
-.descriptor {
-    width: 256px;
-    .header {
-        display: flex;
-        align-items: center;
-    }
-    .icons {
-        margin: 0 10px;
-        display: flex;
-        justify-content: center;
-        .q-icon {
-            margin-right: 5px;
-        }
-    }
-    .actions {
-        margin: 0 5px;
-        justify-content: center !important;
-    }
-}
-</style>
-<i18n>
-    en:
-        globals:
-            copyId: Copy ID
-    es:
-        globals:
-            copyId: Copiar ID
-</i18n>

src/components/ui/VnFilterPanel.vue

@@ -61,10 +61,6 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    showTagChips: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const emit = defineEmits([
@@ -92,14 +88,13 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
 defineExpose({ search, params: userParams, remove });
 
 const isLoading = ref(false);
-async function search(evt, name, value) {
+async function search(evt) {
     try {
         if (evt && $props.disableSubmitEvent) return;
 
         store.filter.where = {};
         isLoading.value = true;
         const filter = { ...userParams.value, ...$props.modelValue };
-        if (name) filter[name] = value;
         store.userParamsChanged = true;
         await arrayData.addFilter({
             params: filter,
@@ -219,7 +214,7 @@ const getLocale = (label) => {
         </QTooltip>
     </QBtn>
     <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
-        <QList dense v-if="showTagChips">
+        <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>
                     <QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">
@@ -254,7 +249,7 @@ const getLocale = (label) => {
                         :key="chip.label"
                         :removable="!unremovableParams?.includes(chip.label)"
                         @remove="remove(chip.label)"
-                        :data-cy="`vnFilterPanelChip_${chip.label}`"
+                        data-cy="vnFilterPanelChip"
                     >
                         <slot
                             name="tags"

src/components/ui/VnLinkMail.vue

@@ -1,11 +1,8 @@
 <script setup>
-import { dashIfEmpty } from 'src/filters';
-
 defineProps({ email: { type: [String], default: null } });
 </script>
 <template>
     <QBtn
-        class="q-pr-xs"
         v-if="email"
         flat
         round
@@ -16,5 +13,4 @@ defineProps({ email: { type: [String], default: null } });
         :href="`mailto:${email}`"
         @click.stop
     />
-    <span>{{ dashIfEmpty(email) }}</span>
 </template>

src/components/ui/VnLinkPhone.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
-import { dashIfEmpty, parsePhone } from 'src/filters';
+import { parsePhone } from 'src/filters';
 import useOpenURL from 'src/composables/useOpenURL';
 
 const props = defineProps({
@@ -12,51 +12,38 @@ const props = defineProps({
 
 const phone = ref(props.phoneNumber);
 const config = reactive({
+    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
         icon: 'vn:saysimple',
         url: null,
         channel: props.channel,
     },
-    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
 });
-
+const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
-const attrs = useAttrs();
-const types = Object.keys(config)
-    .filter((key) => key in attrs)
-    .sort();
-const activeTypes = types.length ? types : ['sip'];
 
 onBeforeMount(async () => {
     if (!phone.value) return;
-
-    for (const type of activeTypes) {
-        if (type === 'say-simple') {
     let { channel } = config[type];
+
+    if (type === 'say-simple') {
         const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
             .data;
         if (!channel) channel = defaultChannel;
 
-            phone.value = await parsePhone(
+        phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
-                props.phoneNumber,
+        config[
-                props.country?.toLowerCase(),
+            type
-            );
+        ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
-            config[type].url =
-                `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
-        }
     }
 });
 
-function handleClick(type) {
+function handleClick() {
     if (config[type].url) useOpenURL(config[type].url);
     else if (config[type].href) window.location.href = config[type].href;
 }
 </script>
-
 <template>
-    <div class="flex items-center gap-2">
-        <template v-for="type in activeTypes">
     <QBtn
-                :key="type"
         v-if="phone"
         flat
         round
@@ -64,13 +51,10 @@ function handleClick(type) {
         size="sm"
         color="primary"
         padding="none"
-                @click.stop="() => handleClick(type)"
+        @click.stop="handleClick"
     >
         <QTooltip>
             {{ capitalize(type).replace('-', '') }}
         </QTooltip>
-            </QBtn></template
+    </QBtn>
-        >
-        <span>{{ dashIfEmpty(phone) }}</span>
-    </div>
 </template>

src/components/ui/VnLv.vue

@@ -28,14 +28,13 @@ function copyValueText() {
 const val = computed(() => $props.value);
 </script>
 <template>
-    <div class="vn-label-value" :data-cy="`${$attrs['data-cy'] ?? 'vnLv'}${label ?? ''}`">
+    <div class="vn-label-value">
         <QCheckbox
             v-if="typeof value === 'boolean'"
             v-model="val"
             :label="label"
             disable
             dense
-            size="sm"
         />
         <template v-else>
             <div v-if="label || $slots.label" class="label">
@@ -43,9 +42,9 @@ const val = computed(() => $props.value);
                     <span style="color: var(--vn-label-color)">{{ label }}</span>
                 </slot>
             </div>
-            <div class="value" v-if="value || $slots.value">
+            <div class="value">
                 <slot name="value">
-                    <span :title="value" style="text-overflow: ellipsis">
+                    <span :title="value">
                         {{ dash ? dashIfEmpty(value) : value }}
                     </span>
                 </slot>

src/components/ui/VnMoreOptions.vue

@@ -9,10 +9,10 @@
         data-cy="descriptor-more-opts"
     >
         <QTooltip>
-            {{ $t('components.vnDescriptor.moreOptions') }}
+            {{ $t('components.cardDescriptor.moreOptions') }}
         </QTooltip>
         <QMenu ref="menuRef" data-cy="descriptor-more-opts-menu">
-            <QList data-cy="descriptor-more-opts_list">
+            <QList>
                 <slot name="menu" :menu-ref="$refs.menuRef" />
             </QList>
         </QMenu>

src/components/ui/VnNotes.vue

@@ -18,10 +18,10 @@ import VnInput from 'components/common/VnInput.vue';
 
 const emit = defineEmits(['onFetch']);
 
-const originalAttrs = useAttrs();
+const $attrs = useAttrs();
-const $attrs = computed(() => {
+
-    const { required, deletable, ...rest } = originalAttrs;
+const isRequired = computed(() => {
-    return rest;
+    return Object.keys($attrs).includes('required');
 });
 
 const $props = defineProps({
@@ -40,11 +40,6 @@ const quasar = useQuasar();
 const newNote = reactive({ text: null, observationTypeFk: null });
 const observationTypes = ref([]);
 const vnPaginateRef = ref();
-
-const defaultObservationType = computed(() => 
-    observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
-);
-
 let originalText;
 
 function handleClick(e) {
@@ -53,11 +48,6 @@ function handleClick(e) {
     else insert();
 }
 
-async function deleteNote(e) {
-    await axios.delete(`${$props.url}/${e.id}`);
-    await vnPaginateRef.value.fetch();
-}
-
 async function insert() {
     if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
 
@@ -121,22 +111,14 @@ function fetchData([data]) {
     originalText = data?.notes;
     emit('onFetch', data);
 }
-
-const handleObservationTypes = (data) => {
-    observationTypes.value = data;
-    if(defaultObservationType.value) {
-        newNote.observationTypeFk = defaultObservationType.value;
-    }
-};
-
 </script>
 <template>
     <FetchData
         v-if="selectType"
         url="ObservationTypes"
-        :filter="{ fields: ['id', 'description', 'code'] }"
+        :filter="{ fields: ['id', 'description'] }"
         auto-load
-        @on-fetch="handleObservationTypes"
+        @on-fetch="(data) => (observationTypes = data)"
     />
     <FetchData
         v-if="justInput"
@@ -162,7 +144,7 @@ const handleObservationTypes = (data) => {
                     v-model="newNote.observationTypeFk"
                     option-label="description"
                     style="flex: 0.15"
-                    :required="'required' in originalAttrs"
+                    :required="isRequired"
                     @keyup.enter.stop="insert"
                 />
                 <VnInput
@@ -170,10 +152,10 @@ const handleObservationTypes = (data) => {
                     type="textarea"
                     :label="$props.justInput && newNote.text ? '' : t('Add note here...')"
                     filled
+                    size="lg"
                     autogrow
-                    autofocus
                     @keyup.enter.stop="handleClick"
-                    :required="'required' in originalAttrs"
+                    :required="isRequired"
                     clearable
                 >
                     <template #append>
@@ -207,6 +189,7 @@ const handleObservationTypes = (data) => {
         :search-url="false"
         @on-fetch="
             newNote.text = '';
+            newNote.observationTypeFk = null;
         "
     >
         <template #body="{ rows }">
@@ -243,21 +226,6 @@ const handleObservationTypes = (data) => {
                                 </QBadge>
                             </div>
                             <span v-text="toDateHourMin(note.created)" />
-                            <div>
-                                <QIcon
-                                    v-if="'deletable' in originalAttrs"
-                                    name="delete"
-                                    size="sm"
-                                    class="cursor-pointer"
-                                    color="primary"
-                                    @click="deleteNote(note)"
-                                    data-cy="notesRemoveNoteBtn"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticketNotes.removeNote') }}
-                                    </QTooltip>
-                                </QIcon>
-                            </div>
                         </div>
                     </QCardSection>
                     <QCardSection class="q-pa-xs q-my-none q-py-none">

src/components/ui/VnPaginate.vue

@@ -115,7 +115,7 @@ onMounted(async () => {
 });
 
 onBeforeUnmount(() => {
-    arrayData.reset(['data']);
+    if (!store.keepData) arrayData.reset(['data']);
     arrayData.resetPagination();
 });
 
@@ -215,7 +215,6 @@ defineExpose({
     paginate,
     userParams: arrayData.store.userParams,
     currentFilter: arrayData.store.currentFilter,
-    arrayData,
 });
 </script>
 

src/components/ui/VnToSummary.vue

@@ -26,7 +26,6 @@ const id = props.entityId;
         :to="{ name: routeName, params: { id: id } }"
         class="header link"
         :href="url"
-        data-cy="goToSummaryBtn"
     >
         <QIcon name="open_in_new" color="white" size="sm" />
     </router-link>

src/composables/__tests__/downloadFile.spec.js

@@ -6,12 +6,10 @@ const session = useSession();
 const token = session.getToken();
 
 describe('downloadFile', () => {
+    const baseUrl = 'http://localhost:9000';
     let defaulCreateObjectURL;
 
     beforeAll(() => {
-        vi.mock('src/composables/getUrl', () => ({
-            getUrl: vi.fn().mockResolvedValue(''),
-        }));
         defaulCreateObjectURL = window.URL.createObjectURL;
         window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
     });
@@ -24,14 +22,15 @@ describe('downloadFile', () => {
             headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
         };
         vi.spyOn(axios, 'get').mockImplementation((url) => {
-            if (url.includes('downloadFile')) return Promise.resolve(res);
+            if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
+            else if (url.includes('downloadFile')) return Promise.resolve(res);
         });
 
         await downloadFile(1);
 
         expect(axios.get).toHaveBeenCalledWith(
-            `/api/dms/1/downloadFile?access_token=${token}`,
+            `${baseUrl}/api/dms/1/downloadFile?access_token=${token}`,
-            { responseType: 'blob' },
+            { responseType: 'blob' }
         );
     });
 });

src/composables/__tests__/useRole.spec.js

@@ -23,19 +23,18 @@ describe('useRole', () => {
                 name: `T'Challa`,
                 nickname: 'Black Panther',
                 lang: 'en',
-                worker: { department: { departmentFk: 155 } },
             };
             const expectedUser = {
                 id: 999,
                 name: `T'Challa`,
                 nickname: 'Black Panther',
                 lang: 'en',
-                departmentFk: 155,
             };
             const expectedRoles = ['salesPerson', 'admin'];
-            vi.spyOn(axios, 'get').mockResolvedValueOnce({
+            vi.spyOn(axios, 'get')
+            .mockResolvedValueOnce({
                 data: { roles: rolesData, user: fetchedUser },
-            });
+            })
 
             vi.spyOn(role.state, 'setUser');
             vi.spyOn(role.state, 'setRoles');

src/composables/__tests__/useSession.spec.js

@@ -75,7 +75,6 @@ describe('session', () => {
                 userConfig: {
                     darkMode: false,
                 },
-                worker: { department: { departmentFk: 155 } },
             };
             const rolesData = [
                 {
@@ -144,7 +143,7 @@ describe('session', () => {
                 await session.destroy(); // this clears token and user for any other test
             });
         },
-        {},
+        {}
     );
 
     describe('RenewToken', () => {
@@ -176,7 +175,7 @@ describe('session', () => {
             await session.checkValidity();
             expect(sessionStorage.getItem('token')).toEqual(expectedToken);
             expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
-                expectedTokenMultimedia,
+                expectedTokenMultimedia
             );
         });
         it('Should renewToken', async () => {
@@ -205,7 +204,7 @@ describe('session', () => {
             await session.checkValidity();
             expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
             expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
-                expectedTokenMultimedia,
+                expectedTokenMultimedia
             );
         });
     });

src/composables/downloadFile.js

@@ -7,33 +7,18 @@ const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
-    const appUrl = await getAppUrl();
+    const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
     const response = await axios.get(
         url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
-        { responseType: 'blob' },
+        { responseType: 'blob' }
     );
 
-    download(response);
-}
-
-export async function downloadDocuware(url, params) {
-    const appUrl = await getAppUrl();
-    const response = await axios.get(`${appUrl}/api/` + url, {
-        responseType: 'blob',
-        params,
-    });
-
-    download(response);
-}
-
-function download(response) {
     const contentDisposition = response.headers['content-disposition'];
     const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
-    const filename = matches?.[1] ? matches[1].replace(/['"]/g, '') : 'downloaded-file';
+    const filename =
+        matches != null && matches[1]
+            ? matches[1].replace(/['"]/g, '')
+            : 'downloaded-file';
 
     exportFile(filename, response.data);
 }
-
-async function getAppUrl() {
-    return (await getUrl('', 'lilium')).replace('/#/', '');
-}

src/composables/useAcl.js

@@ -30,16 +30,9 @@ export function useAcl() {
         return false;
     }
 
-    function hasAcl(model, prop, accessType) {
-        const modelAcl = state.getAcls().value[model];
-        const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
-        return !!(propAcl?.[accessType] || propAcl?.['*']);
-    }
-
     return {
         fetch,
         hasAny,
         state,
-        hasAcl,
     };
 }

src/composables/useArrayData.js

@@ -56,6 +56,7 @@ export function useArrayData(key, userOptions) {
             'searchUrl',
             'navigate',
             'mapKey',
+            'keepData',
             'oneRecord',
         ];
         if (typeof userOptions === 'object') {
@@ -107,7 +108,7 @@ export function useArrayData(key, userOptions) {
         store.hasMoreData = limit && response.data.length >= limit;
 
         if (!append && !isDialogOpened() && updateRouter) {
-            if (updateStateParams(response.data)?.redirect) return;
+            if (updateStateParams(response.data)?.redirect && !store.keepData) return;
         }
         store.isLoading = false;
         canceller = null;
@@ -188,7 +189,7 @@ export function useArrayData(key, userOptions) {
 
         store.order = order;
         resetPagination();
-        await fetch({});
+        fetch({});
         index++;
 
         return { index, order };

src/composables/useFilterParams.js

@@ -14,7 +14,7 @@ export function useFilterParams(key) {
     watch(
         () => arrayData.value.store?.currentFilter,
         (val, oldValue) => (val || oldValue) && setUserParams(val),
-        { immediate: true, deep: true },
+        { immediate: true, deep: true }
     );
 
     function parseOrder(urlOrders) {
@@ -54,7 +54,7 @@ export function useFilterParams(key) {
                     Object.assign(params, item);
                 });
                 delete params[key];
-            } else if (value && typeof value === 'object' && !Array.isArray(value)) {
+            } else if (value && typeof value === 'object') {
                 const param = Object.values(value)[0];
                 if (typeof param == 'string') params[key] = param.replaceAll('%', '');
             }

src/composables/useRole.js

@@ -13,7 +13,6 @@ export function useRole() {
             name: data.user.name,
             nickname: data.user.nickname,
             lang: data.user.lang || 'es',
-            departmentFk: data.user?.worker?.department?.departmentFk,
         };
         state.setUser(userData);
         state.setRoles(roles);

src/css/app.scss

@@ -325,6 +325,7 @@ input::-webkit-inner-spin-button {
         min-height: auto !important;
         display: flex;
         align-items: flex-end;
+        padding-bottom: 2px;
         .q-field__native.row {
             min-height: auto !important;
         }

src/i18n/locale/en.yml

@@ -370,11 +370,6 @@ globals:
         countryCodeFk: Country
         companyFk: Company
         nickname: Alias
-        changedModel: Entity
-        changedModelValue: Search
-        changedModelId: Entity id
-        userFk: User
-        action: Action
     model: Model
     fuel: Fuel
     active: Active
@@ -651,7 +646,6 @@ worker:
         model: Model
         serialNumber: Serial number
         removePDA: Deallocate PDA
-        sendToTablet: Send to tablet
     create:
         lastName: Last name
         birth: Birth
@@ -822,7 +816,6 @@ travel:
     search: Search travel
     searchInfo: You can search by travel id or name
     id: Id
-    awbFk: AWB
     travelList:
         tableVisibleColumns:
             ref: Reference
@@ -847,7 +840,6 @@ travel:
         availabledHour: Availabled hour
         thermographs: Thermographs
         hb: HB
-        roundedCc: Rounded CC
     basicData:
         daysInForward: Automatic movement (Raid)
         isRaid: Raid
@@ -890,7 +882,7 @@ components:
         openCard: View
         openSummary: Summary
         viewSummary: Summary
-    vnDescriptor:
+    cardDescriptor:
         mainList: Main list
         summary: Summary
         moreOptions: More options
@@ -900,8 +892,6 @@ components:
     VnLv:
         copyText: '{copyValue} has been copied to the clipboard'
     iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
-    VnNotes:
-        clientWithoutPhone: 'The following clients do not have a phone number and the message will not be sent to them: {clientWithoutPhone}'
 weekdays:
     sun: Sunday
     mon: Monday

src/i18n/locale/es.yml

@@ -371,11 +371,6 @@ globals:
         countryCodeFk: País
         companyFk: Empresa
         nickname: Alias
-        changedModel: Entidad
-        changedModelValue: Buscar
-        changedModelId: Id de entidad
-        userFk: Usuario
-        action: Acción
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -736,7 +731,6 @@ worker:
         model: Modelo
         serialNumber: Número de serie
         removePDA: Desasignar PDA
-        sendToTablet: Enviar a la tablet
     create:
         lastName: Apellido
         birth: Fecha de nacimiento
@@ -905,7 +899,6 @@ travel:
     search: Buscar envío
     searchInfo: Buscar envío por id o nombre
     id: Id
-    awbFk: Guía aérea
     travelList:
         tableVisibleColumns:
             ref: Referencia
@@ -930,7 +923,6 @@ travel:
         availabled: F. Disponible
         availabledHour: Hora Disponible
         hb: HB
-        roundedCc: CC redondeado
     basicData:
         daysInForward: Desplazamiento automatico (redada)
         isRaid: Redada
@@ -974,7 +966,7 @@ components:
         openCard: Ficha
         openSummary: Detalles
         viewSummary: Vista previa
-    vnDescriptor:
+    cardDescriptor:
         mainList: Listado principal
         summary: Resumen
         moreOptions: Más opciones
@@ -984,8 +976,6 @@ components:
     VnLv:
         copyText: '{copyValue} se ha copiado al portapepeles'
     iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
-    VnNotes:
-        clientWithoutPhone: 'Estos clientes no tienen asociado número de télefono y el sms no les será enviado: {clientWithoutPhone}'
 weekdays:
     sun: Domingo
     mon: Lunes

src/pages/Account/AccountFilter.vue

@@ -47,7 +47,7 @@ const rolesOptions = ref([]);
                         :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
@@ -57,7 +57,7 @@ const rolesOptions = ref([]);
                         :label="t('account.card.alias')"
                         v-model="params.nickname"
                         lazy-rules
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
@@ -75,7 +75,8 @@ const rolesOptions = ref([]);
                         use-input
                         hide-selected
                         dense
-                        filled
+                        outlined
+                        rounded
                         :input-debounce="0"
                     />
                 </QItemSection>

src/pages/Account/Acls/AclFilter.vue

@@ -56,7 +56,8 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        filled
+                        outlined
+                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -71,7 +72,8 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        filled
+                        outlined
+                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -81,7 +83,7 @@ onBeforeMount(() => {
                         :label="t('acls.aclFilter.property')"
                         v-model="params.property"
                         lazy-rules
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
@@ -96,7 +98,8 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        filled
+                        outlined
+                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -111,7 +114,8 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        filled
+                        outlined
+                        rounded
                     />
                 </QItemSection>
             </QItem>

src/pages/Account/Alias/Card/AliasDescriptor.vue

@@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 
-import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import axios from 'axios';
@@ -48,12 +48,11 @@ const removeAlias = () => {
 </script>
 
 <template>
-    <EntityDescriptor
+    <CardDescriptor
         ref="descriptor"
         :url="`MailAliases/${entityId}`"
         data-key="Alias"
         title="alias"
-        :to-module="{ name: 'AccountAlias' }"
     >
         <template #menu>
             <QItem v-ripple clickable @click="removeAlias()">
@@ -63,7 +62,7 @@ const removeAlias = () => {
         <template #body="{ entity }">
             <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
-    </EntityDescriptor>
+    </CardDescriptor>
 </template>
 
 <i18n>

src/pages/Account/Card/AccountDescriptor.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
-import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
@@ -20,7 +20,7 @@ onMounted(async () => {
 </script>
 
 <template>
-    <EntityDescriptor
+    <CardDescriptor
         ref="descriptor"
         :url="`VnUsers/preview`"
         :filter="{ ...filter, where: { id: entityId } }"
@@ -78,7 +78,7 @@ onMounted(async () => {
                 </QIcon>
             </QCardActions>
         </template>
-    </EntityDescriptor>
+    </CardDescriptor>
 </template>
 <style scoped>
 .q-item__label {

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -100,8 +100,12 @@ const onChangePass = (oldPass) => {
 };
 
 onMounted(() => {
-    hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
+    hasitManagementAccess.value = useAcl().hasAny([
-    hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
+        { model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
+    ]);
+    hasSysadminAccess.value = useAcl().hasAny([
+        { model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
+    ]);
 });
 </script>
 <template>
@@ -223,7 +227,7 @@ onMounted(() => {
         <QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
     </QItem>
     <QItem
-        v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
+        v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
         v-ripple
         clickable
         @click="showSyncDialog = true"

src/pages/Account/Card/AccountDescriptorProxy.vue

@@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
     <QPopupProxy style="max-width: 10px">
         <AccountDescriptor
             v-if="$attrs.id"
-            v-bind="$attrs"
+            v-bind="$attrs.id"
             :summary="AccountSummary"
             :proxy-render="true"
         />

src/pages/Account/Card/AccountSummary.vue

@@ -18,7 +18,7 @@ const entityId = computed(() => $props.id || route.params.id);
         data-key="Account"
         ref="AccountSummary"
         url="VnUsers/preview"
-        :filter="{ ...filter, where: { id: entityId } }"
+        :filter="filter"
     >
         <template #header="{ entity }">{{ entity.id }} - {{ entity.nickname }}</template>
         <template #menu>

src/pages/Account/Role/AccountRolesFilter.vue

@@ -27,7 +27,7 @@ const props = defineProps({
                         :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
@@ -37,7 +37,7 @@ const props = defineProps({
                         :label="t('role.description')"
                         v-model="params.description"
                         lazy-rules
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>

src/pages/Account/Role/Card/RoleDescriptor.vue

@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -32,12 +32,11 @@ const removeRole = async () => {
 </script>
 
 <template>
-    <EntityDescriptor
+    <CardDescriptor
         url="VnRoles"
         :filter="{ where: { id: entityId } }"
         data-key="Role"
         :summary="$props.summary"
-        :to-module="{ name: 'AccountRoles' }"
     >
         <template #menu>
             <QItem v-ripple clickable @click="removeRole()">
@@ -47,7 +46,7 @@ const removeRole = async () => {
         <template #body="{ entity }">
             <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
-    </EntityDescriptor>
+    </CardDescriptor>
 </template>
 <style scoped>
 .q-item__label {

src/pages/Claim/Card/ClaimBasicData.vue

@@ -2,7 +2,6 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { getDifferences, getUpdatedValues } from 'src/filters';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FetchData from 'components/FetchData.vue';
@@ -10,18 +9,12 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
 
 const route = useRoute();
 const { t } = useI18n();
 const workersOptions = ref([]);
-
-function onBeforeSave(formData, originalData) {
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData,
-    );
-}
 </script>
 <template>
     <FetchData
@@ -34,7 +27,6 @@ function onBeforeSave(formData, originalData) {
     <FormModel
         model="Claim"
         :url-update="`Claims/updateClaim/${route.params.id}`"
-        :mapper="onBeforeSave"
         auto-load
     >
         <template #form="{ data, validate }">

src/pages/Claim/Card/ClaimDescriptor.vue

@@ -6,7 +6,7 @@ import { toDateHourMinSec, toPercentage } from 'src/filters';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
-import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import { getUrl } from 'src/composables/getUrl';
@@ -44,7 +44,7 @@ onMounted(async () => {
 </script>
 
 <template>
-    <EntityDescriptor
+    <CardDescriptor
         :url="`Claims/${entityId}`"
         :filter="filter"
         title="client.name"
@@ -147,7 +147,7 @@ onMounted(async () => {
                 </QBtn>
             </QCardActions>
         </template>
-    </EntityDescriptor>
+    </CardDescriptor>
 </template>
 <style scoped>
 .q-item__label {

src/pages/Claim/Card/ClaimSummary.vue

@@ -21,7 +21,6 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 import ClaimDescriptorMenu from './ClaimDescriptorMenu.vue';
-import VnDropdown from 'src/components/common/VnDropdown.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -37,7 +36,7 @@ const $props = defineProps({
 });
 
 const entityId = computed(() => $props.id || route.params.id);
-const claimStates = ref([]);
+const ClaimStates = ref([]);
 const claimDmsRef = ref();
 const claimDms = ref([]);
 const multimediaDialog = ref();
@@ -174,9 +173,7 @@ function openDialog(dmsId) {
 }
 
 async function changeState(value) {
-    await axios.patch(`Claims/updateClaim/${entityId.value}`, {
+    await axios.patch(`Claims/updateClaim/${entityId.value}`, { claimStateFk: value });
-        claimStateFk: value,
-    });
     router.go(route.fullPath);
 }
 
@@ -186,18 +183,13 @@ function claimUrl(section) {
 </script>
 
 <template>
-    <FetchData
-        url="ClaimStates"
-        :filter="{ fields: ['id', 'description'] }"
-        @on-fetch="(data) => (claimStates = data)"
-        auto-load
-    />
     <FetchData
         url="ClaimDms"
         :filter="claimDmsFilter"
         @on-fetch="(data) => setClaimDms(data)"
         ref="claimDmsRef"
     />
+    <FetchData url="ClaimStates" @on-fetch="(data) => (ClaimStates = data)" auto-load />
     <CardSummary
         ref="summary"
         :url="`Claims/${entityId}/getSummary`"
@@ -209,11 +201,34 @@ function claimUrl(section) {
             {{ claim.id }} - {{ claim.client.name }} ({{ claim.client.id }})
         </template>
         <template #header-right>
-            <VnDropdown
+            <QBtnDropdown
-                :options="claimStates"
+                side
-                option-label="description"
+                top
-                @change-state="changeState"
+                color="black"
-            />
+                text-color="white"
+                :label="t('globals.changeState')"
+            >
+                <QList>
+                    <QVirtualScroll
+                        class="max-container-height"
+                        :items="ClaimStates"
+                        separator
+                        v-slot="{ item, index }"
+                    >
+                        <QItem
+                            :key="index"
+                            dense
+                            clickable
+                            v-close-popup
+                            @click="changeState(item.id)"
+                        >
+                            <QItemSection>
+                                <QItemLabel>{{ item.description }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QVirtualScroll>
+                </QList>
+            </QBtnDropdown>
         </template>
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity.claim" />

src/pages/Claim/ClaimFilter.vue

@@ -33,7 +33,7 @@ const props = defineProps({
                     :label="t('claim.customerId')"
                     v-model="params.clientFk"
                     lazy-rules
-                    filled
+                    is-outlined
                 >
                     <template #prepend> <QIcon name="badge" size="xs" /></template>
                 </VnInput>
@@ -41,11 +41,12 @@ const props = defineProps({
                     :label="t('Client Name')"
                     v-model="params.clientName"
                     lazy-rules
-                    filled
+                    is-outlined
                 />
                 <VnSelect
+                    outlined
                     dense
-                    filled
+                    rounded
                     :label="t('globals.params.departmentFk')"
                     v-model="params.departmentFk"
                     option-value="id"
@@ -60,7 +61,8 @@ const props = defineProps({
                     :use-like="false"
                     option-filter="firstName"
                     dense
-                    filled
+                    outlined
+                    rounded
                 />
                 <VnSelect
                     :label="t('claim.state')"
@@ -68,12 +70,14 @@ const props = defineProps({
                     :options="states"
                     option-label="description"
                     dense
-                    filled
+                    outlined
+                    rounded
                 />
                 <VnInputDate
                     v-model="params.created"
                     :label="t('claim.created')"
-                    filled
+                    outlined
+                    rounded
                     dense
                 />
                 <VnSelect
@@ -82,7 +86,8 @@ const props = defineProps({
                     url="Items/withName"
                     :use-like="false"
                     sort-by="id DESC"
-                    filled
+                    outlined
+                    rounded
                     dense
                 />
                 <VnSelect
@@ -93,13 +98,15 @@ const props = defineProps({
                     :use-like="false"
                     option-filter="firstName"
                     dense
-                    filled
+                    outlined
+                    rounded
                 />
                 <VnSelect
                     :label="t('claim.zone')"
                     v-model="params.zoneFk"
                     url="Zones"
-                    filled
+                    outlined
+                    rounded
                     dense
                 />
                 <QCheckbox
@@ -115,7 +122,6 @@ const props = defineProps({
 <i18n>
 en:
     params:
-        departmentFk: Department
         search: Contains
         clientFk: Customer
         clientName: Customer
@@ -128,7 +134,6 @@ en:
         zoneFk: Zone
 es:
     params:
-        departmentFk: Departamento
         search: Contiene
         clientFk: Cliente
         clientName: Cliente

src/pages/Claim/ClaimList.vue

@@ -134,7 +134,7 @@ const columns = computed(() => [
 
 const STATE_COLOR = {
     pending: 'bg-warning',
-    loses: 'bg-negative',
+    managed: 'bg-info',
     resolved: 'bg-positive',
 };
 </script>

src/pages/Customer/Card/CustomerBalance.vue

@@ -20,12 +20,11 @@ import VnFilter from 'components/VnTable/VnFilter.vue';
 
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { openConfirmationModal } = useVnConfirm();
 const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
-const { hasAcl } = useAcl();
+const { hasAny } = useAcl();
 
 const quasar = useQuasar();
 const route = useRoute();
@@ -90,7 +89,15 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('Employee'),
-        name: 'workerFk',
+        columnField: {
+            component: 'userLink',
+            attrs: ({ row }) => {
+                return {
+                    workerId: row.workerFk,
+                    name: row.userName,
+                };
+            },
+        },
         cardVisible: true,
     },
     {
@@ -124,6 +131,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'balance',
         label: t('Balance'),
+        format: ({ balance }) => toCurrency(balance),
         cardVisible: true,
     },
     {
@@ -138,14 +146,12 @@ const columns = computed(() => [
         actions: [
             {
                 title: t('globals.downloadPdf'),
-                isPrimary: true,
                 icon: 'cloud_download',
                 show: (row) => row.isInvoice,
                 action: (row) => showBalancePdf(row),
             },
             {
                 title: t('Send compensation'),
-                isPrimary: true,
                 icon: 'outgoing_mail',
                 show: (row) => !!row.isCompensation,
                 action: ({ id }) =>
@@ -250,12 +256,6 @@ const showBalancePdf = ({ id }) => {
         <template #column-balance="{ rowIndex }">
             {{ toCurrency(balances[rowIndex]?.balance) }}
         </template>
-        <template #column-workerFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.userName }}
-                <WorkerDescriptorProxy :id="row.workerFk" />
-            </span>
-        </template>
         <template #column-description="{ row }">
             <span class="link" v-if="row.isInvoice" @click.stop>
                 {{ t('bill', { ref: row.description }) }}
@@ -276,7 +276,9 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="!hasAcl('Receipt', '*', 'WRITE')"
+                    :disable="
+                        !hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
+                    "
                     @keypress.enter="scope.set"
                     autofocus
                 />

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -7,7 +7,7 @@ import { toCurrency, toDate } from 'src/filters';
 
 import useCardDescription from 'src/composables/useCardDescription';
 
-import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
@@ -54,7 +54,7 @@ const debtWarning = computed(() => {
 </script>
 
 <template>
-    <EntityDescriptor
+    <CardDescriptor
         :url="`Clients/${entityId}/getCard`"
         :summary="$props.summary"
         data-key="Customer"
@@ -105,6 +105,15 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('customer.card.isDisabled') }}</QTooltip>
                 </QIcon>
+
+                <QIcon
+                    v-if="entity?.substitutionAllowed"
+                    name="help"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Allowed substitution') }}</QTooltip>
+                </QIcon>
                 <QIcon
                     v-if="!entity.account?.active"
                     color="primary"
@@ -223,7 +232,7 @@ const debtWarning = computed(() => {
                 </QBtn>
             </QCardActions>
         </template>
-    </EntityDescriptor>
+    </CardDescriptor>
 </template>
 
 <i18n>

src/pages/Customer/Card/CustomerDescriptorMenu.vue

@@ -61,6 +61,16 @@ const openCreateForm = (type) => {
         .join('&');
     useOpenURL(`/#/${type}/list?${params}`);
 };
+const updateSubstitutionAllowed = async () => {
+    try {
+        await axios.patch(`Clients/${route.params.id}`, {
+            substitutionAllowed: !$props.customer.substitutionAllowed,
+        });
+        notify('globals.notificationSent', 'positive');
+    } catch (error) {
+        notify(error.message, 'positive');
+    }
+};
 </script>
 
 <template>
@@ -69,6 +79,13 @@ const openCreateForm = (type) => {
             {{ t('globals.pageTitles.createTicket') }}
         </QItemSection>
     </QItem>
+    <QItem v-ripple clickable>
+        <QItemSection @click="updateSubstitutionAllowed()">{{
+            $props.customer.substitutionAllowed
+                ? t('Disable substitution')
+                : t('Allow substitution')
+        }}</QItemSection>
+    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>

src/pages/Customer/Card/CustomerSummary.vue

@@ -84,31 +84,29 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
                 <VnLv :label="t('globals.name')" :value="entity.name" />
                 <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
-                <VnLv :label="t('customer.extendedList.tableVisibleColumns.phone')">
+                <VnLv :value="entity.phone">
-                    <template #value>
+                    <template #label>
+                        {{ t('customer.extendedList.tableVisibleColumns.phone') }}
                         <VnLinkPhone :phone-number="entity.phone" />
                     </template>
                 </VnLv>
-                <VnLv :label="t('customer.summary.mobile')">
+                <VnLv :value="entity.mobile">
-                    <template #value>
+                    <template #label>
+                        {{ t('customer.summary.mobile') }}
+                        <VnLinkPhone :phone-number="entity.mobile" />
                         <VnLinkPhone
-                            sip
                             say-simple
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
+                            class="q-ml-xs"
                         />
                     </template>
                 </VnLv>
-                <VnLv
+                <VnLv :value="entity.email" copy
-                    :label="t('globals.params.email')"
+                    ><template #label>
-                    :value="entity.email"
+                        {{ t('globals.params.email') }}
-                    class="ellipsis"
+                        <VnLinkMail email="entity.email"></VnLinkMail> </template
-                    copy
+                ></VnLv>
-                >
-                    <template #value>
-                        <VnLinkMail :email="entity.email" />
-                    </template>
-                </VnLv>
                 <VnLv :label="t('globals.department')">
                     <template #value>
                         <span class="link" v-text="entity.department?.name" />

src/pages/Customer/CustomerFilter.vue

@@ -41,7 +41,7 @@ const exprBuilder = (param, value) => {
         <template #body="{ params, searchFn }">
             <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnInput :label="t('FI')" v-model="params.fi" filled>
+                    <VnInput :label="t('FI')" v-model="params.fi" is-outlined>
                         <template #prepend>
                             <QIcon name="badge" size="xs" />
                         </template>
@@ -50,7 +50,7 @@ const exprBuilder = (param, value) => {
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('Name')" v-model="params.name" filled />
+                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
@@ -58,21 +58,21 @@ const exprBuilder = (param, value) => {
                     <VnInput
                         :label="t('customer.summary.socialName')"
                         v-model="params.socialName"
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnSelect
+                        outlined
                         dense
-                        filled
+                        rounded
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
                         option-value="id"
                         option-label="name"
                         url="Departments"
-                        no-one="true"
                     />
                 </QItemSection>
             </QItem>
@@ -89,7 +89,8 @@ const exprBuilder = (param, value) => {
                         map-options
                         hide-selected
                         dense
-                        filled
+                        outlined
+                        rounded
                         auto-load
                         :input-debounce="0"
                     />
@@ -97,12 +98,12 @@ const exprBuilder = (param, value) => {
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('City')" v-model="params.city" filled />
+                    <VnInput :label="t('City')" v-model="params.city" is-outlined />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('Phone')" v-model="params.phone" filled>
+                    <VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
                         <template #prepend>
                             <QIcon name="phone" size="xs" />
                         </template>
@@ -111,7 +112,7 @@ const exprBuilder = (param, value) => {
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('Email')" v-model="params.email" filled>
+                    <VnInput :label="t('Email')" v-model="params.email" is-outlined>
                         <template #prepend>
                             <QIcon name="email" size="sm" />
                         </template>
@@ -131,14 +132,19 @@ const exprBuilder = (param, value) => {
                         map-options
                         hide-selected
                         dense
-                        filled
+                        outlined
+                        rounded
                         auto-load
                         sortBy="name ASC"
                 /></QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('Postcode')" v-model="params.postcode" filled />
+                    <VnInput
+                        :label="t('Postcode')"
+                        v-model="params.postcode"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
         </template>
@@ -155,7 +161,6 @@ en:
         city: City
         phone: Phone
         email: Email
-        departmentFk: Department
         isToBeMailed: Mailed
         isEqualizated: Equailized
         businessTypeFk: Business type
@@ -168,7 +173,6 @@ en:
         postcode: Postcode
 es:
     params:
-        departmentFk: Departamento
         search: Contiene
         fi: NIF
         isActive: Activo

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -45,7 +45,8 @@ const departments = ref();
                     dense
                     option-label="name"
                     option-value="id"
-                    filled
+                    outlined
+                    rounded
                     emit-value
                     hide-selected
                     map-options
@@ -66,7 +67,8 @@ const departments = ref();
                         map-options
                         option-label="name"
                         option-value="id"
-                        filled
+                        outlined
+                        rounded
                         use-input
                         v-model="params.departmentFk"
                         @update:model-value="searchFn()"
@@ -89,7 +91,8 @@ const departments = ref();
                         map-options
                         option-label="name"
                         option-value="id"
-                        filled
+                        outlined
+                        rounded
                         use-input
                         v-model="params.countryFk"
                         @update:model-value="searchFn()"
@@ -105,7 +108,7 @@ const departments = ref();
                     <VnInput
                         :label="t('P. Method')"
                         clearable
-                        filled
+                        is-outlined
                         v-model="params.paymentMethod"
                     />
                 </QItemSection>
@@ -116,7 +119,7 @@ const departments = ref();
                     <VnInput
                         :label="t('Balance D.')"
                         clearable
-                        filled
+                        is-outlined
                         v-model="params.balance"
                     />
                 </QItemSection>
@@ -134,7 +137,8 @@ const departments = ref();
                         map-options
                         option-label="name"
                         option-value="id"
-                        filled
+                        outlined
+                        rounded
                         use-input
                         v-model="params.workerFk"
                         @update:model-value="searchFn()"
@@ -150,7 +154,7 @@ const departments = ref();
                     <VnInputDate
                         :label="t('L. O. Date')"
                         clearable
-                        filled
+                        is-outlined
                         v-model="params.date"
                     />
                 </QItemSection>
@@ -161,7 +165,7 @@ const departments = ref();
                     <VnInput
                         :label="t('Credit I.')"
                         clearable
-                        filled
+                        is-outlined
                         v-model="params.credit"
                     />
                 </QItemSection>
@@ -171,7 +175,7 @@ const departments = ref();
                 <QItemSection>
                     <VnInputDate
                         :label="t('From')"
-                        filled
+                        is-outlined
                         v-model="params.defaulterSinced"
                     />
                 </QItemSection>
@@ -192,10 +196,8 @@ en:
         date: L. O. Date
         credit: Credit I.
         defaulterSinced: From
-        departmentFk: Department
 es:
     params:
-        departmentFk: Departamento
         clientFk: Cliente
         countryFk: País
         paymentMethod: F. Pago

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -127,7 +127,6 @@ es:
     Identifier: Identificador
     Social name: Razón social
     Phone: Teléfono
-    Postcode: Código postal
     City: Población
     Email: Email
     Campaign consumption: Consumo campaña

src/pages/Customer/Payments/CustomerPaymentsFilter.vue

@@ -25,7 +25,7 @@ const props = defineProps({
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('Order ID')" v-model="params.orderFk" filled>
+                    <VnInput :label="t('Order ID')" v-model="params.orderFk" is-outlined>
                         <template #prepend>
                             <QIcon name="vn:basket" size="xs" />
                         </template>
@@ -34,7 +34,11 @@ const props = defineProps({
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('Customer ID')" v-model="params.clientFk" filled>
+                    <VnInput
+                        :label="t('Customer ID')"
+                        v-model="params.clientFk"
+                        is-outlined
+                    >
                         <template #prepend>
                             <QIcon name="vn:client" size="xs" />
                         </template>
@@ -43,15 +47,19 @@ const props = defineProps({
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputNumber :label="t('Amount')" v-model="params.amount" filled />
+                    <VnInputNumber
+                        :label="t('Amount')"
+                        v-model="params.amount"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate v-model="params.from" :label="t('From')" filled />
+                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
                 </QItemSection>
                 <QItemSection>
-                    <VnInputDate v-model="params.to" :label="t('To')" filled />
+                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
                 </QItemSection>
             </QItem>
         </template>

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -93,26 +93,10 @@ const updateAddressTicket = async () => {
 };
 
 const updateObservations = async (payload) => {
-    await axios.post('AddressObservations/crud', cleanPayload(payload));
+    await axios.post('AddressObservations/crud', payload);
     notes.value = [];
     deletes.value = [];
 };
-
-function cleanPayload(payload) {
-    ['creates', 'deletes', 'updates'].forEach((prop) => {
-        if (prop === 'creates' || prop === 'updates') {
-            payload[prop] = payload[prop].filter(
-                (item) => item.description !== '' && item.observationTypeFk !== '',
-            );
-        } else {
-            payload[prop] = payload[prop].filter(
-                (item) => item !== null && item !== undefined,
-            );
-        }
-    });
-    return payload;
-}
-
 async function updateAll({ data, payload }) {
     await updateObservations(payload);
     await updateAddress(data);

src/pages/Customer/components/CustomerNewPayment.vue

@@ -3,20 +3,18 @@ import { onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useDialogPluginComponent } from 'quasar';
-
 import { getClientRisk } from '../composables/getClientRisk';
+import { useDialogPluginComponent } from 'quasar';
+import FormModelPopup from 'components/FormModelPopup.vue';
 import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
-
-import FormModelPopup from 'components/FormModelPopup.vue';
 import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputNumber from 'components/common/VnInputNumber.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -50,7 +48,7 @@ const maxAmount = ref();
 const accountingType = ref({});
 const isCash = ref(false);
 const formModelRef = ref(false);
-const amountToReturn = ref();
+
 const filterBanks = {
     fields: ['id', 'bank', 'accountingTypeFk'],
     include: { relation: 'accountingType' },
@@ -92,7 +90,7 @@ function setPaymentType(data, accounting) {
     let descriptions = [];
     if (accountingType.value.receiptDescription)
         descriptions.push(accountingType.value.receiptDescription);
-    if (data.description > 0) descriptions.push(data.description);
+    if (data.description) descriptions.push(data.description);
     data.description = descriptions.join(', ');
 }
 
@@ -102,7 +100,7 @@ const calculateFromAmount = (event) => {
 };
 
 const calculateFromDeliveredAmount = (event) => {
-    amountToReturn.value = event - initialData.amountPaid;
+    initialData.amountToReturn = parseFloat(event) - initialData.amountPaid;
 };
 
 function onBeforeSave(data) {
@@ -123,16 +121,17 @@ async function onDataSaved(formData, { id }) {
                 recipient: formData.email,
             });
 
-        if (viewReceipt.value) openReport(`Receipts/${id}/receipt-pdf`, {}, '_blank');
+        if (viewReceipt.value) openReport(`Receipts/${id}/receipt-pdf`);
     } finally {
         if ($props.promise) $props.promise();
         if (closeButton.value) closeButton.value.click();
     }
 }
 
-async function getSupplierClientReferences(value) {
+async function accountShortToStandard({ target: { value } }) {
     if (!value) return (initialData.description = '');
-    const params = { bankAccount: value };
+    initialData.compensationAccount = value.replace('.', '0'.repeat(11 - value.length));
+    const params = { bankAccount: initialData.compensationAccount };
     const { data } = await axios(`Clients/getClientOrSupplierReference`, { params });
     if (!data.clientId) {
         initialData.description = t('Supplier Compensation Reference', {
@@ -242,16 +241,17 @@ async function getAmountPaid() {
                         @update:model-value="getAmountPaid()"
                     />
                 </VnRow>
-                <div v-if="accountingType.code == 'compensation'">
+
+                <div v-if="data.bankFk?.accountingType?.code == 'compensation'">
                     <div class="text-h6">
                         {{ t('Compensation') }}
                     </div>
                     <VnRow>
-                        <VnAccountNumber
+                        <VnInputNumber
                             :label="t('Compensation account')"
                             clearable
                             v-model="data.compensationAccount"
-                            @blur="getSupplierClientReferences(data.compensationAccount)"
+                            @blur="accountShortToStandard"
                         />
                     </VnRow>
                 </div>
@@ -261,7 +261,8 @@ async function getAmountPaid() {
                     clearable
                     v-model="data.description"
                 />
-                <div v-if="accountingType.code == 'cash'">
+
+                <div v-if="data.bankFk?.accountingType?.code == 'cash'">
                     <div class="text-h6">{{ t('Cash') }}</div>
                     <VnRow>
                         <VnInputNumber
@@ -273,7 +274,7 @@ async function getAmountPaid() {
                         <VnInputNumber
                             :label="t('Amount to return')"
                             disable
-                            v-model="amountToReturn"
+                            v-model="data.amountToReturn"
                         />
                     </VnRow>
                     <VnRow>

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => {
         :without-header="true"
         auto-load
         :row-click="rowClick"
-        order="shipped DESC, id DESC"
+        order="shipped DESC, id"
         :disable-option="{ card: true, table: true }"
         class="full-width"
         :disable-infinite-scroll="true"

src/pages/Entry/Card/EntryBasicData.vue

@@ -14,8 +14,6 @@ import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import VnSelectTravelExtended from 'src/components/common/VnSelectTravelExtended.vue';
 import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 import VnCheckbox from 'src/components/common/VnCheckbox.vue';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-import VnDmsInput from 'src/components/common/VnDmsInput.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -26,7 +24,6 @@ const user = state.getUser().fn();
 
 const companiesOptions = ref([]);
 const currenciesOptions = ref([]);
-const entryRef = ref({});
 
 onMounted(() => {
     checkEntryLock(route.params.id, user.id);
@@ -51,11 +48,10 @@ onMounted(() => {
         auto-load
     />
     <FormModel
-        ref="entryRef"
-        model="Entry"
         :url-update="`Entries/${route.params.id}`"
-        :clear-store-on-unmount="false"
+        model="Entry"
         auto-load
+        :clear-store-on-unmount="false"
     >
         <template #form="{ data }">
             <VnRow class="q-py-sm">
@@ -71,18 +67,11 @@ onMounted(() => {
                 />
             </VnRow>
             <VnRow class="q-py-sm">
-                <VnInput
+                <VnInput v-model="data.reference" :label="t('globals.reference')" />
-                    v-model="data.reference"
+                <VnInputNumber
-                    :label="t('entry.list.tableVisibleColumns.reference')"
+                    v-model="data.invoiceAmount"
-                />
+                    :label="t('entry.summary.invoiceAmount')"
-                <VnSelect
+                    :positive="false"
-                    v-model="data.typeFk"
-                    url="entryTypes"
-                    :fields="['code', 'description']"
-                    option-value="code"
-                    optionLabel="description"
-                    sortBy="description"
-                    :label="t('entry.list.tableVisibleColumns.entryTypeDescription')"
                 />
             </VnRow>
             <VnRow class="q-py-sm">
@@ -124,6 +113,7 @@ onMounted(() => {
                     name="initialTemperature"
                     :label="t('entry.basicData.initialTemperature')"
                     :step="0.5"
+                    :decimal-places="2"
                     :positive="false"
                 />
                 <VnInputNumber
@@ -131,21 +121,20 @@ onMounted(() => {
                     name="finalTemperature"
                     :label="t('entry.basicData.finalTemperature')"
                     :step="0.5"
+                    :decimal-places="2"
                     :positive="false"
                 />
+                <VnSelect
+                    v-model="data.typeFk"
+                    url="entryTypes"
+                    :fields="['code', 'description']"
+                    option-value="code"
+                    optionLabel="description"
+                    sortBy="description"
+                />
             </VnRow>
             <VnRow class="q-py-sm">
-                <VnInputNumber
+                <QInput
-                    v-model="data.invoiceAmount"
-                    :label="t('entry.list.tableVisibleColumns.invoiceAmount')"
-                    :positive="false"
-                    @update:model-value="data.buyerFk = user.id"
-                />
-                <VnSelectWorker v-model="data.buyerFk" hide-selected />
-                <VnDmsInput :data="data" :formRef="entryRef" :disable="false" />
-            </VnRow>
-            <VnRow class="q-py-sm">
-                <VnInputNumber
                     :label="t('entry.basicData.observation')"
                     type="textarea"
                     v-model="data.observation"

src/pages/Entry/Card/EntryBuys.vue

@@ -18,7 +18,6 @@ import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import { checkEntryLock } from 'src/composables/checkEntryLock';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const $props = defineProps({
     id: {
@@ -45,8 +44,6 @@ const entityId = ref($props.id ?? route.params.id);
 const entryBuysRef = ref();
 const footerFetchDataRef = ref();
 const footer = ref({});
-const dialogRef = ref(false);
-const newEntryRef = ref(null);
 const columns = [
     {
         align: 'center',
@@ -253,7 +250,6 @@ const columns = [
         component: 'number',
         attrs: {
             positive: false,
-            decimalPlaces: 3,
         },
         cellEvent: {
             'update:modelValue': async (value, oldValue, row) => {
@@ -501,23 +497,6 @@ async function setBuyUltimate(itemFk, data) {
     });
 }
 
-async function transferBuys(rows, newEntry) {
-    if (!newEntry) return;
-
-    const promises = rows.map((row) => {
-        return axios.patch('Buys', { id: row.id, entryFk: newEntry });
-    });
-
-    await Promise.all(promises);
-
-    await axios.post(`Entries/${newEntry}/recalcEntryPrices`);
-    await axios.post(`Entries/${entityId.value}/recalcEntryPrices`);
-
-    entryBuysRef.value.reload();
-    newEntryRef.value = null;
-    dialogRef.value = false;
-}
-
 onMounted(() => {
     stateStore.rightDrawer = false;
     if ($props.editableMode) checkEntryLock(entityId.value, user.id);
@@ -592,47 +571,6 @@ onMounted(() => {
                     </QItem>
                 </QList>
             </QBtnDropdown>
-            <QBtn
-                icon="move_group"
-                color="primary"
-                :title="t('Transfer buys')"
-                data-cy="transferBuys"
-                flat
-                @click="dialogRef = true"
-                :disable="!selectedRows.length"
-            />
-            <QDialog v-model="dialogRef">
-                <QCard>
-                    <QCardSection>
-                        <span>{{ t('Transfer buys') }}</span>
-                    </QCardSection>
-                    <QCardSection>
-                        <VnInputNumber
-                            v-model="newEntryRef"
-                            :label="t('Entry')"
-                            type="number"
-                            data-cy="entryDestinyInput"
-                        />
-                    </QCardSection>
-                    <QCardSection>
-                        <QCardActions>
-                            <QBtn
-                                label="Cancel"
-                                flat
-                                color="primary"
-                                @click="dialogRef = false"
-                            />
-                            <QBtn
-                                label="Transfer"
-                                data-cy="transferBuysBtn"
-                                flat
-                                color="primary"
-                                @click="transferBuys(selectedRows, newEntryRef)"
-                            />
-                        </QCardActions>
-                    </QCardSection>
-                </QCard>
-            </QDialog>
         </QBtnGroup>
     </Teleport>
     <FetchData
@@ -648,7 +586,7 @@ onMounted(() => {
         :url="`Entries/${entityId}/getBuyList`"
         search-url="EntryBuys"
         save-url="Buys/crud"
-        :filter="editableMode ? filter : {}"
+        :filter="filter"
         :disable-option="{ card: true }"
         v-model:selected="selectedRows"
         @on-fetch="() => footerFetchDataRef.fetch()"
@@ -682,7 +620,7 @@ onMounted(() => {
             },
             columnGridStyle: {
                 'max-width': '50%',
-                'margin-right': '5%',
+                'margin-right': '30px',
                 flex: 1,
             },
             previousStyle: {
@@ -714,7 +652,6 @@ onMounted(() => {
                     :fields="['id', 'nickname']"
                     option-label="nickname"
                     sort-by="nickname ASC"
-                    :use-like="false"
                 />
                 <VnSelect
                     :label="t('Family')"
@@ -879,8 +816,6 @@ es:
     Create buy: Crear compra
     Invert quantity value: Invertir valor de cantidad
     Check buy amount: Marcar como correcta la cantidad de compra
-    Transfer buys: Transferir compras
-    Entry: Entrada
 </i18n>
 <style lang="scss" scoped>
 .centered-container {

src/pages/Entry/Card/EntryCard.vue

@@ -8,6 +8,6 @@ import filter from './EntryFilter.js';
         data-key="Entry"
         url="Entries"
         :descriptor="EntryDescriptor"
-        :filter="{ ...filter, where: { id: $route.params.id } }"
+        :filter="filter"
     />
 </template>

src/pages/Entry/Card/EntryDescriptor.vue

@@ -6,7 +6,7 @@ import { toDate } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import { useQuasar } from 'quasar';
 import { usePrintService } from 'composables/usePrintService';
-import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 import axios from 'axios';
@@ -92,7 +92,7 @@ const getEntryRedirectionFilter = (entry) => {
 };
 
 function showEntryReport() {
-    openReport(`Entries/${entityId.value}/entry-order-pdf`, {}, true);
+    openReport(`Entries/${entityId.value}/entry-order-pdf`);
 }
 
 function showNotification(type, message) {
@@ -145,7 +145,7 @@ async function deleteEntry() {
 </script>
 
 <template>
-    <EntityDescriptor
+    <CardDescriptor
         :url="`Entries/${entityId}`"
         :filter="entryFilter"
         title="supplier.nickname"
@@ -264,7 +264,7 @@ async function deleteEntry() {
                 </QBtn>
             </QCardActions>
         </template>
-    </EntityDescriptor>
+    </CardDescriptor>
 </template>
 <i18n>
 es:

src/pages/Entry/Card/EntrySummary.vue

@@ -70,8 +70,8 @@ onMounted(async () => {
                     :url="`#/entry/${entityId}/basic-data`"
                     :text="t('globals.summary.basicData')"
                 />
-                <div class="vn-card-group">
+                <div class="card-group">
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv
                             :label="t('entry.summary.commission')"
                             :value="entry?.commission"
@@ -84,16 +84,13 @@ onMounted(async () => {
                             :label="t('globals.company')"
                             :value="entry?.company?.code"
                         />
-                        <VnLv
+                        <VnLv :label="t('globals.reference')" :value="entry?.reference" />
-                            :label="t('entry.list.tableVisibleColumns.reference')"
-                            :value="entry?.reference"
-                        />
                         <VnLv
                             :label="t('entry.summary.invoiceNumber')"
                             :value="entry?.invoiceNumber"
                         />
                     </div>
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnCheckbox
                             :label="t('entry.list.tableVisibleColumns.isOrdered')"
                             v-model="entry.isOrdered"
@@ -130,8 +127,8 @@ onMounted(async () => {
                     :url="`#/travel/${entry.travel.id}/summary`"
                     :text="t('Travel')"
                 />
-                <div class="vn-card-group">
+                <div class="card-group">
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv :label="t('entry.summary.travelReference')">
                             <template #value>
                                 <span class="link">
@@ -161,8 +158,7 @@ onMounted(async () => {
                             :value="entry.travel.warehouseIn?.name"
                         />
                     </div>
-                    <div class="vn-card-content">
+                    <div class="card-content">
-                        <VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
                         <VnCheckbox
                             :label="t('entry.summary.travelDelivered')"
                             v-model="entry.travel.isDelivered"
@@ -193,6 +189,31 @@ onMounted(async () => {
         </template>
     </CardSummary>
 </template>
+<style lang="scss" scoped>
+.card-group {
+    display: flex;
+    flex-direction: column;
+}
+
+.card-content {
+    display: flex;
+    flex-direction: column;
+    text-overflow: ellipsis;
+    > div {
+        max-height: 24px;
+    }
+}
+
+@media (min-width: 1010px) {
+    .card-group {
+        flex-direction: row;
+    }
+    .card-content {
+        flex: 1;
+        margin-right: 16px;
+    }
+}
+</style>
 <i18n>
 es:
     Travel: Envío

src/pages/Entry/EntryFilter.vue

@@ -101,14 +101,14 @@ const entryFilterPanel = ref();
                         :label="t('params.landed')"
                         v-model="params.landed"
                         @update:model-value="searchFn()"
-                        filled
+                        is-outlined
                         data-cy="landed"
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput v-model="params.id" label="Id" filled />
+                    <VnInput v-model="params.id" label="Id" is-outlined />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -118,7 +118,8 @@ const entryFilterPanel = ref();
                         @update:model-value="searchFn()"
                         hide-selected
                         dense
-                        filled
+                        outlined
+                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -127,7 +128,7 @@ const entryFilterPanel = ref();
                     <VnInput
                         v-model="params.reference"
                         :label="t('entry.list.tableVisibleColumns.reference')"
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
@@ -142,7 +143,8 @@ const entryFilterPanel = ref();
                         :fields="['id', 'name']"
                         hide-selected
                         dense
-                        filled
+                        outlined
+                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -151,7 +153,7 @@ const entryFilterPanel = ref();
                     <VnInput
                         v-model="params.evaNotes"
                         :label="t('params.evaNotes')"
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
@@ -166,7 +168,8 @@ const entryFilterPanel = ref();
                         sort-by="name ASC"
                         hide-selected
                         dense
-                        filled
+                        outlined
+                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -181,7 +184,8 @@ const entryFilterPanel = ref();
                         sort-by="name ASC"
                         hide-selected
                         dense
-                        filled
+                        outlined
+                        rounded
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -203,7 +207,7 @@ const entryFilterPanel = ref();
                     <VnInput
                         v-model="params.invoiceNumber"
                         :label="t('params.invoiceNumber')"
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
@@ -220,16 +224,8 @@ const entryFilterPanel = ref();
                         option-label="description"
                         hide-selected
                         dense
-                        filled
+                        outlined
-                    />
+                        rounded
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        v-model="params.evaNotes"
-                        :label="t('params.evaNotes')"
-                        filled
                     />
                 </QItemSection>
             </QItem>

src/pages/Entry/EntryList.vue

@@ -248,6 +248,7 @@ function getBadgeAttrs(row) {
 
     let timeDiff = today - timeTicket;
 
+    if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
     if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' };
     switch (row.entryTypeCode) {
         case 'regularization':
@@ -273,7 +274,6 @@ function getBadgeAttrs(row) {
         default:
             break;
     }
-    if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
     return { color: 'transparent' };
 }
 

src/pages/Entry/EntryStockBought.vue

@@ -116,7 +116,6 @@ const filter = computed(() => ({
             hour: 0,
             minute: 0,
             second: 0,
-            milliseconds: 0,
         }),
         m3: { neq: null },
     },
@@ -163,8 +162,8 @@ async function beforeSave(data, getChanges) {
     }
 
     await Promise.all(patchPromises);
-    data.creates = [];
+    const filteredChanges = changes.filter((change) => change?.isReal !== false);
-    return data;
+    data.creates = filteredChanges;
 }
 </script>
 <template>
@@ -204,7 +203,7 @@ async function beforeSave(data, getChanges) {
             </VnRow>
         </template>
     </VnSubToolbar>
-    <QDialog v-model="travelDialogRef" :class="['vn-row', 'wrap']">
+    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
         <FormModelPopup
             :url-update="`Travels/${travel?.id}`"
             model="travel"
@@ -253,15 +252,12 @@ async function beforeSave(data, getChanges) {
                     </span>
                 </template>
                 <template #column-footer-reserve>
-                    <span class="q-pr-xs">
+                    <span>
                         {{ round(footer.reserve) }}
                     </span>
                 </template>
                 <template #column-footer-bought>
-                    <span
+                    <span :style="boughtStyle(footer?.bought, footer?.reserve)">
-                        :style="boughtStyle(footer?.bought, footer?.reserve)"
-                        class="q-pr-xs"
-                    >
                         {{ round(footer.bought) }}
                     </span>
                 </template>
@@ -279,7 +275,7 @@ async function beforeSave(data, getChanges) {
 }
 .column {
     min-width: 35%;
-    margin-top: 1%;
+    margin-top: 5%;
 }
 .text-negative {
     color: $negative !important;

src/pages/Entry/locale/es.yml

@@ -33,8 +33,7 @@ entry:
         invoiceAmount: Importe
         ordered: Pedida
         booked: Contabilizada
-        excludedFromAvailable: Excluir del disponible
+        excludedFromAvailable: Excluido
-        isConfirmed: Lista para etiquetar
         travelReference: Referencia
         travelAgency: Agencia
         travelShipped: F. envio
@@ -57,7 +56,7 @@ entry:
         observation: Observación
         commission: Comisión
         booked: Contabilizada
-        excludedFromAvailable: Excluir del disponible
+        excludedFromAvailable: Excluido
         initialTemperature: Ini °C
         finalTemperature: Fin °C
     buys:
@@ -120,9 +119,9 @@ entry:
         supplierName: Proveedor
 entryFilter:
     params:
-        isExcludedFromAvailable: Excluir del disponible
+        isExcludedFromAvailable: Excluido
         isOrdered: Pedida
-        isConfirmed: Lista para etiquetar
+        isConfirmed: Confirmado
         isReceived: Recibida
         isRaid: Raid
         landed: Fecha

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -121,49 +121,42 @@ function deleteFile(dmsFk) {
                     hide-selected
                     :is-clearable="false"
                     :required="true"
-                    data-cy="invoiceInBasicDataSupplier"
                 />
                 <VnInput
                     clearable
                     clear-icon="close"
                     :label="t('invoiceIn.supplierRef')"
                     v-model="data.supplierRef"
-                    data-cy="invoiceInBasicDataSupplierRef"
                 />
             </VnRow>
             <VnRow>
-                <VnInputDate
+                <VnInputDate :label="t('Expedition date')" v-model="data.issued" />
-                    :label="t('Expedition date')"
-                    v-model="data.issued"
-                    data-cy="invoiceInBasicDataIssued"
-                />
                 <VnInputDate
                     :label="t('Operation date')"
                     v-model="data.operated"
                     autofocus
-                    data-cy="invoiceInBasicDataOperated"
                 />
             </VnRow>
             <VnRow>
-                <VnInputDate
+                <VnInputDate :label="t('Entry date')" v-model="data.bookEntried" />
-                    :label="t('Entry date')"
+                <VnInputDate :label="t('Accounted date')" v-model="data.booked" />
-                    v-model="data.bookEntried"
-                    data-cy="invoiceInBasicDatabookEntried"
-                />
-                <VnInputDate
-                    :label="t('Accounted date')"
-                    v-model="data.booked"
-                    data-cy="invoiceInBasicDataBooked"
-                />
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('invoiceIn.summary.sage')"
+                    :label="t('Undeductible VAT')"
-                    v-model="data.withholdingSageFk"
+                    v-model="data.deductibleExpenseFk"
-                    :options="sageWithholdings"
+                    :options="expenses"
                     option-value="id"
-                    option-label="withholding"
+                    option-label="id"
-                />
+                    :filter-options="['id', 'name']"
+                    data-cy="UnDeductibleVatSelect"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                        </QItem>
+                    </template>
+                </VnSelect>
 
                 <div class="row no-wrap">
                     <VnInput
@@ -189,7 +182,6 @@ function deleteFile(dmsFk) {
                             padding="xs"
                             round
                             @click="downloadFile(data.dmsFk)"
-                            data-cy="invoiceInBasicDataDmsDownload"
                         />
                         <QBtn
                             :class="{
@@ -205,7 +197,6 @@ function deleteFile(dmsFk) {
                                     documentDialogRef.dms = data.dms;
                                 }
                             "
-                            data-cy="invoiceInBasicDataDmsEdit"
                         >
                             <QTooltip>{{ t('Edit document') }}</QTooltip>
                         </QBtn>
@@ -219,7 +210,6 @@ function deleteFile(dmsFk) {
                             padding="xs"
                             round
                             @click="deleteFile(data.dmsFk)"
-                            data-cy="invoiceInBasicDataDmsDelete"
                         />
                     </div>
                     <QBtn
@@ -234,7 +224,7 @@ function deleteFile(dmsFk) {
                                 delete documentDialogRef.dms;
                             }
                         "
-                        data-cy="invoiceInBasicDataDmsAdd"
+                        data-cy="dms-create"
                     >
                         <QTooltip>{{ t('Create document') }}</QTooltip>
                     </QBtn>
@@ -247,9 +237,9 @@ function deleteFile(dmsFk) {
                     :label="t('Currency')"
                     v-model="data.currencyFk"
                     :options="currencies"
+                    option-value="id"
                     option-label="code"
                     sort-by="id"
-                    data-cy="invoiceInBasicDataCurrencyFk"
                 />
 
                 <VnSelect
@@ -259,8 +249,17 @@ function deleteFile(dmsFk) {
                     :label="t('Company')"
                     v-model="data.companyFk"
                     :options="companies"
+                    option-value="id"
                     option-label="code"
-                    data-cy="invoiceInBasicDataCompanyFk"
+                />
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    :label="t('invoiceIn.summary.sage')"
+                    v-model="data.withholdingSageFk"
+                    :options="sageWithholdings"
+                    option-value="id"
+                    option-label="withholding"
                 />
             </VnRow>
         </template>
@@ -314,6 +313,7 @@ function deleteFile(dmsFk) {
         supplierFk: Proveedor
         Expedition date: Fecha expedición
         Operation date: Fecha operación
+        Undeductible VAT: Iva no deducible
         Document: Documento
         Download file: Descargar archivo
         Entry date: Fecha asiento

src/pages/InvoiceIn/Card/InvoiceInCorrective.vue

@@ -1,16 +1,22 @@
 <script setup>
 import { ref, computed, capitalize } from 'vue';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
+const route = useRoute();
 const { t } = useI18n();
 
 const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const invoiceInCorrectionRef = ref();
+const filter = {
+    include: { relation: 'invoiceIn' },
+    where: { correctingFk: route.params.id },
+};
 const columns = computed(() => [
     {
         name: 'origin',
@@ -86,8 +92,7 @@ const requiredFieldRule = (val) => val || t('globals.requiredField');
         v-if="invoiceIn"
         data-key="InvoiceInCorrection"
         url="InvoiceInCorrections"
-        :user-filter="{ include: { relation: 'invoiceIn' } }"
+        :filter="filter"
-        :filter="{ where: { correctingFk: $route.params.id } }"
         auto-load
         primary-key="correctingFk"
         :default-remove="false"
@@ -110,7 +115,6 @@ const requiredFieldRule = (val) => val || t('globals.requiredField');
                             :option-label="col.optionLabel"
                             :disable="row.invoiceIn.isBooked"
                             :filter-options="['description']"
-                            data-cy="invoiceInCorrective_type"
                         >
                             <template #option="{ opt, itemProps }">
                                 <QItem v-bind="itemProps">
@@ -133,7 +137,6 @@ const requiredFieldRule = (val) => val || t('globals.requiredField');
                             :rules="[requiredFieldRule]"
                             :filter-options="['code', 'description']"
                             :disable="row.invoiceIn.isBooked"
-                            data-cy="invoiceInCorrective_class"
                         >
                             <template #option="{ opt, itemProps }">
                                 <QItem v-bind="itemProps">
@@ -158,7 +161,6 @@ const requiredFieldRule = (val) => val || t('globals.requiredField');
                             :option-label="col.optionLabel"
                             :rules="[requiredFieldRule]"
                             :disable="row.invoiceIn.isBooked"
-                            data-cy="invoiceInCorrective_reason"
                         />
                     </QTd>
                 </template>

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
 import VnLv from 'src/components/ui/VnLv.vue';
-import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import filter from './InvoiceInFilter.js';
 import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
@@ -17,16 +17,20 @@ const { t } = useI18n();
 const cardDescriptorRef = ref();
 const entityId = computed(() => $props.id || +currentRoute.value.params.id);
 const totalAmount = ref();
+const config = ref();
+const cplusRectificationTypes = ref([]);
+const siiTypeInvoiceIns = ref([]);
+const invoiceCorrectionTypes = ref([]);
 const invoiceInCorrection = reactive({ correcting: [], corrected: null });
 const routes = reactive({
     getSupplier: (id) => {
         return { name: 'SupplierCard', params: { id } };
     },
-    getInvoices: (id) => {
+    getTickets: (id) => {
         return {
             name: 'InvoiceInList',
             query: {
-                table: JSON.stringify({ supplierFk: id }),
+                params: JSON.stringify({ supplierFk: id }),
             },
         };
     },
@@ -35,7 +39,7 @@ const routes = reactive({
             return {
                 name: 'InvoiceInList',
                 query: {
-                    table: JSON.stringify({ correctedFk: entityId.value }),
+                    params: JSON.stringify({ correctedFk: entityId.value }),
                 },
             };
         }
@@ -84,7 +88,7 @@ async function setInvoiceCorrection(id) {
 }
 </script>
 <template>
-    <EntityDescriptor
+    <CardDescriptor
         ref="cardDescriptorRef"
         data-key="InvoiceIn"
         :url="`InvoiceIns/${entityId}`"
@@ -104,7 +108,7 @@ async function setInvoiceCorrection(id) {
             <VnLv :label="t('invoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
             <VnLv :label="t('invoiceIn.list.supplier')">
                 <template #value>
-                    <span class="link" data-cy="invoiceInDescriptor_supplier">
+                    <span class="link">
                         {{ entity?.supplier?.nickname }}
                         <SupplierDescriptorProxy :id="entity?.supplierFk" />
                     </span>
@@ -131,11 +135,11 @@ async function setInvoiceCorrection(id) {
                 </QBtn>
                 <QBtn
                     size="md"
-                    icon="vn:invoice-in"
+                    icon="vn:ticket"
                     color="primary"
-                    :to="routes.getInvoices(entity.supplierFk)"
+                    :to="routes.getTickets(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip>
+                    <QTooltip>{{ t('globals.ticketList') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="
@@ -159,7 +163,7 @@ async function setInvoiceCorrection(id) {
                 </QBtn>
             </QCardActions>
         </template>
-    </EntityDescriptor>
+    </CardDescriptor>
 </template>
 <style lang="scss" scoped>
 .q-dialog {

src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, toRefs, reactive, onBeforeMount } from 'vue';
+import { ref, computed, toRefs, reactive } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -111,9 +111,10 @@ async function cloneInvoice() {
 }
 
 const isAgricultural = () => {
+    if (!config.value) return false;
     return (
-        invoiceIn.value?.supplier?.sageWithholdingFk ==
+        invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
-        config.value?.sageFarmerWithholdingFk
+        config?.value[0]?.sageWithholdingFk
     );
 };
 function showPdfInvoice() {
@@ -152,17 +153,9 @@ const createInvoiceInCorrection = async () => {
     );
     push({ path: `/invoice-in/${correctingId}/summary` });
 };
-
-onBeforeMount(async () => {
-    config.value = (
-        await axios.get('invoiceinConfigs/findOne', {
-            params: { fields: ['sageFarmerWithholdingFk'] },
-        })
-    ).data;
-});
 </script>
+
 <template>
-    <template v-if="config">
     <FetchData
         url="InvoiceCorrectionTypes"
         @on-fetch="(data) => (invoiceCorrectionTypes = data)"
@@ -179,6 +172,12 @@ onBeforeMount(async () => {
         @on-fetch="(data) => (siiTypeInvoiceIns = data)"
         auto-load
     />
+    <FetchData
+        url="InvoiceInConfigs"
+        :where="{ fields: ['sageWithholdingFk'] }"
+        auto-load
+        @on-fetch="(data) => (config = data)"
+    />
     <InvoiceInToBook>
         <template #content="{ book }">
             <QItem
@@ -209,12 +208,7 @@ onBeforeMount(async () => {
     >
         <QItemSection>{{ t('invoiceIn.descriptorMenu.deleteInvoice') }}</QItemSection>
     </QItem>
-        <QItem
+    <QItem v-if="canEditProp('clone')" v-ripple clickable @click="triggerMenu('clone')">
-            v-if="canEditProp('clone')"
-            v-ripple
-            clickable
-            @click="triggerMenu('clone')"
-        >
         <QItemSection>{{ t('invoiceIn.descriptorMenu.cloneInvoice') }}</QItemSection>
     </QItem>
     <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('showPdf')">
@@ -238,16 +232,11 @@ onBeforeMount(async () => {
             >{{ t('invoiceIn.descriptorMenu.createCorrective') }}...</QItemSection
         >
     </QItem>
-        <QItem
+    <QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">
-            v-if="invoice.dmsFk"
-            v-ripple
-            clickable
-            @click="downloadFile(invoice.dmsFk)"
-        >
         <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
     </QItem>
     <QDialog ref="correctionDialogRef">
-            <QCard data-cy="correctiveInvoiceDialog">
+        <QCard>
             <QCardSection>
                 <QItem class="q-px-none">
                     <span class="text-primary text-h6 full-width">
@@ -271,7 +260,6 @@ onBeforeMount(async () => {
                             option-value="id"
                             option-label="code"
                             :required="true"
-                                data-cy="invoiceInDescriptorMenu_class"
                         />
                     </QItemSection>
                     <QItemSection>
@@ -282,7 +270,6 @@ onBeforeMount(async () => {
                             option-value="id"
                             option-label="description"
                             :required="true"
-                                data-cy="invoiceInDescriptorMenu_type"
                         >
                             <template #option="{ itemProps, opt }">
                                 <QItem v-bind="itemProps">
@@ -304,31 +291,24 @@ onBeforeMount(async () => {
                             option-value="id"
                             option-label="description"
                             :required="true"
-                                data-cy="invoiceInDescriptorMenu_reason"
                         />
                     </QItemSection>
                 </QItem>
             </QCardSection>
             <QCardActions class="justify-end q-mr-sm">
-                    <QBtn
+                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                        flat
-                        :label="t('globals.close')"
-                        color="primary"
-                        v-close-popup
-                    />
                 <QBtn
                     :label="t('globals.save')"
                     color="primary"
                     v-close-popup
                     @click="createInvoiceInCorrection"
                     :disable="isNotFilled"
-                        data-cy="saveCorrectiveInvoice"
                 />
             </QCardActions>
         </QCard>
     </QDialog>
-    </template>
 </template>
+
 <i18n>
 en:
     isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries

src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

@@ -25,8 +25,7 @@ const invoiceInFormRef = ref();
 const invoiceId = +route.params.id;
 const filter = { where: { invoiceInFk: invoiceId } };
 const areRows = ref(false);
-const totalTaxableBase = ref();
+const totals = ref();
-const noMatch = computed(() => totalAmount.value != totalTaxableBase.value);
 const columns = computed(() => [
     {
         name: 'duedate',
@@ -75,12 +74,9 @@ async function insert() {
     notify(t('globals.dataSaved'), 'positive');
 }
 
-async function setTaxableBase() {
+onBeforeMount(async () => {
-    const { data } = await axios.get(`InvoiceIns/${invoiceId}/getTotals`);
+    totals.value = (await axios.get(`InvoiceIns/${invoiceId}/getTotals`)).data;
-    totalTaxableBase.value = data.totalTaxableBase;
+});
-}
-
-onBeforeMount(async () => await setTaxableBase());
 </script>
 <template>
     <CrudModel
@@ -93,14 +89,13 @@ onBeforeMount(async () => await setTaxableBase());
         :data-required="{ invoiceInFk: invoiceId }"
         v-model:selected="rowsSelected"
         @on-fetch="(data) => (areRows = !!data.length)"
-        @save-changes="setTaxableBase"
     >
         <template #body="{ rows }">
             <QTable
                 v-model:selected="rowsSelected"
                 selection="multiple"
-                :columns
+                :columns="columns"
-                :rows
+                :rows="rows"
                 row-key="$index"
                 :grid="$q.screen.lt.sm"
             >
@@ -156,18 +151,7 @@ onBeforeMount(async () => await setTaxableBase());
                         <QTd />
                         <QTd />
                         <QTd>
-                            <QChip
-                                dense
-                                :color="noMatch ? 'negative' : 'transparent'"
-                                class="q-pa-xs"
-                                :title="
-                                    noMatch
-                                        ? t('invoiceIn.noMatch', { totalTaxableBase })
-                                        : ''
-                                "
-                            >
                             {{ toCurrency(totalAmount) }}
-                            </QChip>
                         </QTd>
                         <QTd>
                             <template v-if="isNotEuro(invoiceIn.currency.code)">
@@ -253,7 +237,7 @@ onBeforeMount(async () => await setTaxableBase());
                     if (!areRows) insert();
                     else
                         invoiceInFormRef.insert({
-                            amount: (totalTaxableBase - totalAmount).toFixed(2),
+                            amount: (totals.totalTaxableBase - totalAmount).toFixed(2),
                             invoiceInFk: invoiceId,
                         });
                 }
@@ -265,10 +249,6 @@ onBeforeMount(async () => await setTaxableBase());
 .bg {
     background-color: var(--vn-light-gray);
 }
-
-.q-chip {
-    color: var(--vn-text-color);
-}
 </style>
 <i18n>
     es:

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -40,13 +40,6 @@ const vatColumns = ref([
         sortable: true,
         align: 'left',
     },
-    {
-        name: 'isDeductible',
-        label: 'invoiceIn.isDeductible',
-        field: (row) => row.isDeductible,
-        sortable: true,
-        align: 'center',
-    },
     {
         name: 'vat',
         label: 'invoiceIn.summary.sageVat',
@@ -205,7 +198,6 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                         color="orange-11"
                         text-color="black"
                         @click="book(entityId)"
-                        data-cy="invoiceInSummary_book"
                     />
                 </template>
             </InvoiceIntoBook>
@@ -214,42 +206,43 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             <InvoiceInDescriptorMenu :invoice="entity" />
         </template>
         <template #body="{ entity }">
-            <QCard class="max-width">
+            <!--Basic Data-->
+            <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
                         :text="t('globals.pageTitles.basicData')"
                     />
-                <div class="vn-card-group">
+                </QCardSection>
-                    <div class="vn-card-content">
                 <VnLv
                     :label="t('invoiceIn.list.supplier')"
                     :value="entity.supplier?.name"
                 >
                     <template #value>
-                                <span class="link" data-cy="invoiceInSummary_supplier">
+                        <span class="link">
                             {{ entity.supplier?.name }}
                             <SupplierDescriptorProxy :id="entity.supplierFk" />
                         </span>
                     </template>
                 </VnLv>
-                        <VnLv
+                <VnLv :label="t('invoiceIn.supplierRef')" :value="entity.supplierRef" />
-                            :label="t('invoiceIn.supplierRef')"
-                            :value="entity.supplierRef"
-                        />
                 <VnLv
                     :label="t('invoiceIn.summary.currency')"
                     :value="entity.currency?.code"
                 />
-                        <VnLv
+                <VnLv :label="t('invoiceIn.serial')" :value="`${entity.serial}`" />
-                            :label="t('invoiceIn.serial')"
-                            :value="`${entity.serial}`"
-                        />
                 <VnLv
                     :label="t('globals.country')"
                     :value="entity.supplier?.country?.code"
                 />
-                    </div>
+            </QCard>
-                    <div class="vn-card-content">
+            <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <VnTitle
+                        :url="getLink('basic-data')"
+                        :text="t('globals.pageTitles.basicData')"
+                    />
+                </QCardSection>
                 <VnLv
                     :ellipsis-value="false"
                     :label="t('invoiceIn.summary.issued')"
@@ -267,12 +260,15 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :label="t('invoiceIn.summary.bookedDate')"
                     :value="toDate(entity.booked)"
                 />
-                        <VnLv
+                <VnLv :label="t('globals.isVies')" :value="entity.supplier?.isVies" />
-                            :label="t('globals.isVies')"
+            </QCard>
-                            :value="entity.supplier?.isVies"
+            <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <VnTitle
+                        :url="getLink('basic-data')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
-                    </div>
+                </QCardSection>
-                    <div class="vn-card-content">
                 <VnLv
                     :label="t('invoiceIn.summary.sage')"
                     :value="entity.sageWithholding?.withholding"
@@ -285,12 +281,16 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :label="t('invoiceIn.card.company')"
                     :value="entity.company?.code"
                 />
-                        <VnLv
+                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
-                            :label="t('invoiceIn.isBooked')"
+            </QCard>
-                            :value="invoiceIn?.isBooked"
+            <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <VnTitle
+                        :url="getLink('basic-data')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
-                    </div>
+                </QCardSection>
-                    <div class="vn-card-content">
+                <QCardSection class="q-pa-none">
                     <VnLv
                         :label="t('invoiceIn.summary.taxableBase')"
                         :value="toCurrency(entity.totals.totalTaxableBase)"
@@ -304,10 +304,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                 :color="amountsNotMatch ? 'negative' : 'transparent'"
                                 :title="
                                     amountsNotMatch
-                                            ? t('invoiceIn.noMatch', {
+                                        ? t('invoiceIn.summary.noMatch')
-                                                  totalTaxableBase:
-                                                      entity.totals.totalTaxableBase,
-                                              })
                                         : t('invoiceIn.summary.dueTotal')
                                 "
                             >
@@ -315,8 +312,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                             </QChip>
                         </template>
                     </VnLv>
-                    </div>
+                </QCardSection>
-                </div>
             </QCard>
             <!--Vat-->
             <QCard v-if="entity.invoiceInTax.length" class="vat">
@@ -338,15 +334,6 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                             </QTh>
                         </QTr>
                     </template>
-                    <template #body-cell-isDeductible="{ row }">
-                        <QTd align="center">
-                            <QCheckbox
-                                v-model="row.isDeductible"
-                                disable
-                                data-cy="isDeductible_checkbox"
-                            />
-                        </QTd>
-                    </template>
                     <template #body-cell-vat="{ value: vatCell }">
                         <QTd :title="vatCell" shrink>
                             {{ vatCell }}

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -53,13 +53,6 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
     },
-    {
-        name: 'isDeductible',
-        label: t('invoiceIn.isDeductible'),
-        field: (row) => row.isDeductible,
-        model: 'isDeductible',
-        align: 'center',
-    },
     {
         name: 'sageiva',
         label: t('Sage iva'),
@@ -126,7 +119,6 @@ const filter = {
         'foreignValue',
         'taxTypeSageFk',
         'transactionTypeSageFk',
-        'isDeductible',
     ],
     where: {
         invoiceInFk: route.params.id,
@@ -210,9 +202,6 @@ function setCursor(ref) {
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'name']"
                             :tooltip="t('Create a new expense')"
-                            :acls="[
-                                { model: 'Expense', props: '*', accessType: 'WRITE' },
-                            ]"
                             @keydown.tab.prevent="
                                 autocompleteExpense(
                                     $event,
@@ -238,14 +227,6 @@ function setCursor(ref) {
                         </VnSelectDialog>
                     </QTd>
                 </template>
-                <template #body-cell-isDeductible="{ row }">
-                    <QTd align="center">
-                        <QCheckbox
-                            v-model="row.isDeductible"
-                            data-cy="isDeductible_checkbox"
-                        />
-                    </QTd>
-                </template>
                 <template #body-cell-taxablebase="{ row }">
                     <QTd shrink>
                         <VnInputNumber
@@ -340,7 +321,6 @@ function setCursor(ref) {
                         </QTd>
                         <QTd />
                         <QTd />
-                        <QTd />
                         <QTd>
                             {{ toCurrency(taxRateTotal) }}
                         </QTd>

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -7,7 +7,6 @@ import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { dateRange } from 'src/filters';
 import { date } from 'quasar';
 import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
-import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
 defineProps({ dataKey: { type: String, required: true } });
 const dateFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZ';
@@ -40,13 +39,17 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInputDate
                         :label="$t('globals.from')"
                         v-model="params.from"
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate :label="$t('globals.to')" v-model="params.to" filled />
+                    <VnInputDate
+                        :label="$t('globals.to')"
+                        v-model="params.to"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -54,7 +57,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInputNumber
                         :label="$t('globals.daysAgo')"
                         v-model="params.daysAgo"
-                        filled
+                        is-outlined
                         :step="0"
                         @update:model-value="(val) => handleDaysAgo(params, val)"
                         @remove="(val) => handleDaysAgo(params, val)"
@@ -63,7 +66,12 @@ function handleDaysAgo(params, daysAgo) {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectSupplier v-model="params.supplierFk" dense filled />
+                    <VnSelectSupplier
+                        v-model="params.supplierFk"
+                        dense
+                        outlined
+                        rounded
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -71,7 +79,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('supplierRef')"
                         v-model="params.supplierRef"
-                        filled
+                        is-outlined
                         lazy-rules
                     />
                 </QItemSection>
@@ -81,7 +89,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('fi')"
                         v-model="params.fi"
-                        filled
+                        is-outlined
                         lazy-rules
                     />
                 </QItemSection>
@@ -91,7 +99,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('serial')"
                         v-model="params.serial"
-                        filled
+                        is-outlined
                         lazy-rules
                     />
                 </QItemSection>
@@ -101,7 +109,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('account')"
                         v-model="params.account"
-                        filled
+                        is-outlined
                         lazy-rules
                     />
                 </QItemSection>
@@ -111,7 +119,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('globals.params.awbCode')"
                         v-model="params.awbCode"
-                        filled
+                        is-outlined
                         lazy-rules
                     />
                 </QItemSection>
@@ -121,7 +129,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInputNumber
                         :label="$t('globals.amount')"
                         v-model="params.amount"
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
@@ -133,19 +141,19 @@ function handleDaysAgo(params, daysAgo) {
                         url="Companies"
                         option-label="code"
                         :fields="['id', 'code']"
-                        filled
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnCheckbox
+                    <QCheckbox
                         :label="$t('invoiceIn.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate
                     />
-                    <VnCheckbox
+                    <QCheckbox
                         :label="getLocale('params.correctingFk')"
                         v-model="params.correctingFk"
                         @update:model-value="searchFn()"

src/pages/InvoiceIn/InvoiceInList.vue

@@ -119,7 +119,7 @@ const cols = computed(() => [
                 icon: 'preview',
                 type: 'submit',
                 isPrimary: true,
-                action: (row) => viewSummary(row.id, InvoiceInSummary, 'lg-width'),
+                action: (row) => viewSummary(row.id, InvoiceInSummary),
             },
             {
                 title: t('globals.download'),
@@ -156,7 +156,7 @@ const cols = computed(() => [
                 :create="{
                     urlCreate: 'InvoiceIns',
                     title: t('globals.createInvoiceIn'),
-                    onDataSaved: ({ id }) => tableRef.redirect(`${id}/basic-data`),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
                     formInitialData: { companyFk: user.companyFk, issued: Date.vnNew() },
                 }"
                 redirect="invoice-in"

src/pages/InvoiceIn/InvoiceInToBook.vue

@@ -4,7 +4,7 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import { useArrayData } from 'src/composables/useArrayData';
-
+import qs from 'qs';
 const { notify, dialog } = useQuasar();
 const { t } = useI18n();
 
@@ -56,21 +56,22 @@ async function checkToBook(id) {
             componentProps: {
                 title: t('Are you sure you want to book this invoice?'),
                 message: messages.reduce((acc, msg) => `${acc}<p>${msg}</p>`, ''),
-                promise: () => toBook(id),
             },
-        });
+        }).onOk(() => toBook(id));
 }
 
 async function toBook(id) {
-    let err = false;
+    let type = 'positive';
+    let message = t('globals.dataSaved');
+
     try {
         await axios.post(`InvoiceIns/${id}/toBook`);
         store.data.isBooked = true;
     } catch (e) {
-        err = true;
+        type = 'negative';
-        throw e;
+        message = t('It was not able to book the invoice');
     } finally {
-        if (!err) notify({ type: 'positive', message: t('globals.dataSaved') });
+        notify({ type, message });
     }
 }
 </script>

src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue

@@ -25,7 +25,8 @@ const { t } = useI18n();
                     <VnInputNumber
                         v-model="params.daysAgo"
                         :label="t('params.daysAgo')"
-                        filled
+                        outlined
+                        rounded
                         dense
                     />
                 </QItemSection>
@@ -35,7 +36,8 @@ const { t } = useI18n();
                     <VnInput
                         v-model="params.serial"
                         :label="t('params.serial')"
-                        filled
+                        outlined
+                        rounded
                         dense
                     />
                 </QItemSection>

src/pages/InvoiceIn/locale/en.yml

@@ -4,7 +4,6 @@ invoiceIn:
     serial: Serial
     isBooked: Is booked
     supplierRef: Invoice nº
-    isDeductible: Deductible
     list:
         ref: Reference
         supplier: Supplier
@@ -15,7 +14,6 @@ invoiceIn:
         amount: Amount
     descriptor:
         ticketList: Ticket list
-        invoices: Supplier invoices
     descriptorMenu:
         book: Book
         unbook: Unbook
@@ -59,6 +57,7 @@ invoiceIn:
         bank: Bank
         foreignValue: Foreign value
         dueTotal: Due day
+        noMatch: Do not match
         code: Code
         net: Net
         stems: Stems
@@ -69,4 +68,3 @@ invoiceIn:
         isBooked: Is booked
         account: Ledger account
         correctingFk: Rectificative
-    noMatch: No match with the vat({totalTaxableBase})

src/pages/InvoiceIn/locale/es.yml

@@ -4,7 +4,6 @@ invoiceIn:
     serial: Serie
     isBooked: Contabilizada
     supplierRef: Nº factura
-    isDeductible: Deducible
     list:
         ref: Referencia
         supplier: Proveedor
@@ -14,7 +13,7 @@ invoiceIn:
         awb: AWB
         amount: Importe
     descriptor:
-        invoices: Facturas de proveedor
+        ticketList: Listado de tickets
     descriptorMenu:
         book: Contabilizar
         unbook: Descontabilizar
@@ -67,4 +66,3 @@ invoiceIn:
         isBooked: Contabilizada
         account: Cuenta contable
         correctingFk: Rectificativa
-    noMatch: No cuadra con el iva({totalTaxableBase})

src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue

@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
@@ -34,7 +34,7 @@ function ticketFilter(invoice) {
 </script>
 
 <template>
-    <EntityDescriptor
+    <CardDescriptor
         ref="descriptor"
         :url="`InvoiceOuts/${entityId}`"
         :filter="filter"
@@ -93,5 +93,5 @@ function ticketFilter(invoice) {
                 </QBtn>
             </QCardActions>
         </template>
-    </EntityDescriptor>
+    </CardDescriptor>
 </template>