From 658bd015caa50faaa47cca00c0f3767de21f5e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Fri, 14 Feb 2025 12:41:11 +0100
Subject: [PATCH 01/47] feat: refs #8529 invoiceIn move deductible field from
 head to lines

---
 .../InvoiceIn/Card/InvoiceInBasicData.vue     | 28 ++++---------------
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue |  4 ---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue     | 15 ++++++++++
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 905ddebb2b0..9fe365a3850 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -143,20 +143,12 @@ function deleteFile(dmsFk) {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('Undeductible VAT')"
-                    v-model="data.deductibleExpenseFk"
-                    :options="expenses"
+                    :label="t('invoiceIn.summary.sage')"
+                    v-model="data.withholdingSageFk"
+                    :options="sageWithholdings"
                     option-value="id"
-                    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>
+                    option-label="withholding"
+                />
 
                 <div class="row no-wrap">
                     <VnInput
@@ -253,15 +245,6 @@ function deleteFile(dmsFk) {
                     option-label="code"
                 />
             </VnRow>
-            <VnRow>
-                <VnSelect
-                    :label="t('invoiceIn.summary.sage')"
-                    v-model="data.withholdingSageFk"
-                    :options="sageWithholdings"
-                    option-value="id"
-                    option-label="withholding"
-                />
-            </VnRow>
         </template>
     </FormModel>
     <QDialog v-model="documentDialogRef.show">
@@ -313,7 +296,6 @@ 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
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index d358601d316..f2393a56d4c 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -272,10 +272,6 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :label="t('invoiceIn.summary.sage')"
                     :value="entity.sageWithholding?.withholding"
                 />
-                <VnLv
-                    :label="t('invoiceIn.summary.vat')"
-                    :value="entity.expenseDeductible?.name"
-                />
                 <VnLv
                     :label="t('invoiceIn.card.company')"
                     :value="entity.company?.code"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index e77453bc084..e3ed617c6f3 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -53,6 +53,13 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
     },
+    {
+        name: 'isDeductible',
+        label: t('Deductible'),
+        field: (row) => row.isDeductible,
+        model: 'isDeductible',
+        align: 'center',
+    },
     {
         name: 'sageiva',
         label: t('Sage iva'),
@@ -119,6 +126,7 @@ const filter = {
         'foreignValue',
         'taxTypeSageFk',
         'transactionTypeSageFk',
+        'isDeductible',
     ],
     where: {
         invoiceInFk: route.params.id,
@@ -227,6 +235,11 @@ function setCursor(ref) {
                         </VnSelectDialog>
                     </QTd>
                 </template>
+                <template #body-cell-isDeductible="{ row }">
+                    <QTd align="center">
+                        <QCheckbox v-model="row.isDeductible" />
+                    </QTd>
+                </template>
                 <template #body-cell-taxablebase="{ row }">
                     <QTd shrink>
                         <VnInputNumber
@@ -321,6 +334,7 @@ function setCursor(ref) {
                         </QTd>
                         <QTd />
                         <QTd />
+                        <QTd />
                         <QTd>
                             {{ toCurrency(taxRateTotal) }}
                         </QTd>
@@ -491,6 +505,7 @@ es:
     Create a new expense: Crear nuevo gasto
     Add tax: Crear gasto
     Taxable base: Base imp.
+    Deductible: Deducible
     Sage tax: Sage iva
     Sage transaction: Sage transacción
     Rate: Tasa

From ee3ebc51f1866efd0fc5b7db8facb3250c1bfc29 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Tue, 25 Feb 2025 15:27:01 +0100
Subject: [PATCH 02/47] test: refs #8621 add e2e tests for cmrList

---
 .../integration/route/cmr/cmrList.spec.js     | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 test/cypress/integration/route/cmr/cmrList.spec.js

diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js
new file mode 100644
index 00000000000..fc437f21809
--- /dev/null
+++ b/test/cypress/integration/route/cmr/cmrList.spec.js
@@ -0,0 +1,87 @@
+describe('Cmr list', () => {
+    const getLinkSelector = (colField) =>
+        `tr:first-child > [data-col-field="${colField}"] > .no-padding > .link`;
+
+    const selectors = {
+        ticket: getLinkSelector('ticketFk'),
+        client: getLinkSelector('clientFk'),
+        lastRowSelectCheckBox:
+            '.q-virtual-scroll__content > tr:last-child > :nth-child(1) > .q-checkbox',
+        downloadBtn: '#subToolbar > .q-btn',
+        viewCmr: 'tableAction-0',
+        summaryPopupBtn: '.header > :nth-child(2) > .q-btn__content > .q-icon',
+        summaryPopupHeader: '.summaryHeader > :nth-child(2)',
+        summaryHeader: '.summaryHeader',
+        descriptorId: '.q-item > .q-item__label',
+        descriptorTitle: '.q-item__label--header > .title > span',
+        summaryGoToSummaryBtn: '.header > .q-icon',
+        descriptorGoToSummaryBtn: '.descriptor > .header > a[href] > .q-btn',
+    };
+
+    const data = {
+        ticket: '2',
+        client: 'Bruce Wayne',
+    };
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit('/#/route/cmr');
+        cy.typeSearchbar('{enter}');
+    });
+
+    it('Should download selected cmr', () => {
+        const downloadsFolder = Cypress.config('downloadsFolder');
+        cy.get(selectors.lastRowSelectCheckBox).click();
+        cy.get(selectors.downloadBtn).click();
+        cy.wait(3000);
+
+        const fileName = 'cmrs.zip';
+        cy.readFile(`${downloadsFolder}/${fileName}`).should('exist');
+    });
+
+    it('Should open selected cmr pdf', () => {
+        cy.window().then((win) => {
+            cy.stub(win, 'open').as('windowOpen');
+        });
+        cy.get(selectors.lastRowSelectCheckBox).click();
+        cy.dataCy(selectors.viewCmr).last().click();
+        cy.get('@windowOpen').should('be.calledWithMatch', '\/api\/Cmrs\/3');
+    });
+
+    describe('Ticket pop-ups', () => {
+        it('Should redirect to the ticket summary from the ticket descriptor pop-up', () => {
+            cy.get(selectors.ticket).click();
+            cy.get(selectors.descriptorId).should('contain', data.ticket);
+            cy.get(selectors.descriptorGoToSummaryBtn).click();
+            cy.get(selectors.summaryHeader).should('contain', data.client);
+        });
+
+        it('Should redirect to the ticket summary from summary pop-up from the ticket descriptor pop-up', () => {
+            cy.get(selectors.ticket).click();
+            cy.get(selectors.descriptorId).should('contain', data.ticket);
+            cy.get(selectors.summaryPopupBtn).click();
+            cy.get(selectors.summaryPopupHeader).should('contain', data.client);
+            cy.get(selectors.summaryGoToSummaryBtn).click();
+            cy.get(selectors.summaryHeader).should('contain', data.client);
+        });
+    });
+
+    describe('Client pop-ups', () => {
+        it('Should redirect to the client summary from the client descriptor pop-up', () => {
+            cy.get(selectors.client).click();
+            cy.get(selectors.descriptorTitle).should('contain', data.client);
+            cy.get(selectors.descriptorGoToSummaryBtn).click();
+            cy.get(selectors.summaryHeader).should('contain', data.client);
+        });
+
+        it('Should redirect to the client summary from summary pop-up from the client descriptor pop-up', () => {
+            cy.get(selectors.client).click();
+            cy.get(selectors.descriptorTitle).should('contain', data.client);
+            cy.get(selectors.summaryPopupBtn).click();
+            cy.get(selectors.summaryHeader).should('contain', data.client);
+            cy.get(selectors.summaryGoToSummaryBtn).click();
+            cy.get(selectors.summaryHeader).should('contain', data.client);
+        });
+    });
+});

From 083e68c291d97d83fe9f08e1fe028c9db6fd5dd9 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 26 Feb 2025 09:09:19 +0100
Subject: [PATCH 03/47] test: refs #8621 add functionality to remove filters in
 cmrList e2e tests

---
 test/cypress/integration/route/cmr/cmrList.spec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js
index fc437f21809..6bcbfc84205 100644
--- a/test/cypress/integration/route/cmr/cmrList.spec.js
+++ b/test/cypress/integration/route/cmr/cmrList.spec.js
@@ -16,6 +16,7 @@ describe('Cmr list', () => {
         descriptorTitle: '.q-item__label--header > .title > span',
         summaryGoToSummaryBtn: '.header > .q-icon',
         descriptorGoToSummaryBtn: '.descriptor > .header > a[href] > .q-btn',
+        removeFilter: '.q-chip__icon--remove',
     };
 
     const data = {
@@ -28,6 +29,7 @@ describe('Cmr list', () => {
         cy.login('developer');
         cy.visit('/#/route/cmr');
         cy.typeSearchbar('{enter}');
+        cy.get(selectors.removeFilter).click();
     });
 
     it('Should download selected cmr', () => {

From 15e44174badf8fcd351dfff19747589c579f9b39 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 26 Feb 2025 12:08:40 +0100
Subject: [PATCH 04/47] refactor: refs #8621 update column names in RouteList
 and add formatting for agency and vehicle fields

---
 src/pages/Route/RouteList.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 9dad8ba22b5..899b3b8c356 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -56,8 +56,9 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'agencyName',
+        name: 'agencyModeFk',
         label: t('route.Agency'),
+        format: (row) => row?.agencyName,
         cardVisible: true,
         component: 'select',
         attrs: {
@@ -74,8 +75,9 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'vehiclePlateNumber',
+        name: 'vehicleFk',
         label: t('route.Vehicle'),
+        format: (row) => row?.vehiclePlateNumber,
         cardVisible: true,
         component: 'select',
         attrs: {
@@ -155,6 +157,7 @@ const columns = computed(() => [
         <template #body>
             <VnTable
                 :data-key
+                ref="tableRef"
                 :columns="columns"
                 :right-search="false"
                 redirect="route"
@@ -175,4 +178,4 @@ const columns = computed(() => [
             </VnTable>
         </template>
     </VnSection>
-</template>
+</template>
\ No newline at end of file

From 0bfb1344dc5f5d104bb5c9d6ac806c0ab8bb27b3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 28 Feb 2025 12:03:23 +0100
Subject: [PATCH 05/47] feat: refs #8326 wip added new style

---
 src/components/ui/VnLv.vue                    |   3 +-
 src/css/app.scss                              |  23 ++
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 205 ++++++++--------
 src/pages/Order/Card/OrderSummary.vue         | 114 ++++-----
 src/pages/Ticket/Card/TicketSummary.vue       | 224 +++++++++---------
 src/pages/Travel/Card/TravelSummary.vue       | 126 +++++-----
 src/pages/Worker/Card/WorkerSummary.vue       | 147 ++++++------
 src/pages/Zone/Card/ZoneSummary.vue           |  35 ++-
 8 files changed, 461 insertions(+), 416 deletions(-)

diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index a198c9c05c3..93c2b9963ed 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -35,6 +35,7 @@ const val = computed(() => $props.value);
             :label="label"
             disable
             dense
+            size="sm"
         />
         <template v-else>
             <div v-if="label || $slots.label" class="label">
@@ -44,7 +45,7 @@ const val = computed(() => $props.value);
             </div>
             <div class="value">
                 <slot name="value">
-                    <span :title="value">
+                    <span :title="value" style="text-overflow: ellipsis">
                         {{ dash ? dashIfEmpty(value) : value }}
                     </span>
                 </slot>
diff --git a/src/css/app.scss b/src/css/app.scss
index 994ae7ff112..97097cebfca 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -339,3 +339,26 @@ input::-webkit-inner-spin-button {
 .containerShrinked {
     width: 80%;
 }
+
+.vn-card-group {
+    display: flex;
+    flex-direction: column;
+}
+
+.vn-card-content {
+    display: flex;
+    flex-direction: column;
+    text-overflow: ellipsis;
+    > div {
+        max-height: 80px;
+    }
+}
+
+@media (min-width: 1010px) {
+    .vn-card-group {
+        flex-direction: row;
+    }
+    .vn-card-content {
+        flex: 1;
+    }
+}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index d358601d316..3515e3bce81 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -205,113 +205,106 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             <InvoiceInDescriptorMenu :invoice="entity" />
         </template>
         <template #body="{ entity }">
-            <!--Basic Data-->
-            <QCard class="vn-one">
-                <QCardSection class="q-pa-none">
-                    <VnTitle
-                        :url="getLink('basic-data')"
-                        :text="t('globals.pageTitles.basicData')"
-                    />
-                </QCardSection>
-                <VnLv
-                    :label="t('invoiceIn.list.supplier')"
-                    :value="entity.supplier?.name"
-                >
-                    <template #value>
-                        <span class="link">
-                            {{ entity.supplier?.name }}
-                            <SupplierDescriptorProxy :id="entity.supplierFk" />
-                        </span>
-                    </template>
-                </VnLv>
-                <VnLv :label="t('invoiceIn.supplierRef')" :value="entity.supplierRef" />
-                <VnLv
-                    :label="t('invoiceIn.summary.currency')"
-                    :value="entity.currency?.code"
+            <QCard class="max-width">
+                <VnTitle
+                    :url="getLink('basic-data')"
+                    :text="t('globals.pageTitles.basicData')"
                 />
-                <VnLv :label="t('invoiceIn.serial')" :value="`${entity.serial}`" />
-                <VnLv
-                    :label="t('globals.country')"
-                    :value="entity.supplier?.country?.code"
-                />
-            </QCard>
-            <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')"
-                    :value="toDate(entity.issued)"
-                />
-                <VnLv
-                    :label="t('invoiceIn.summary.operated')"
-                    :value="toDate(entity.operated)"
-                />
-                <VnLv
-                    :label="t('invoiceIn.summary.bookEntried')"
-                    :value="toDate(entity.bookEntried)"
-                />
-                <VnLv
-                    :label="t('invoiceIn.summary.bookedDate')"
-                    :value="toDate(entity.booked)"
-                />
-                <VnLv :label="t('globals.isVies')" :value="entity.supplier?.isVies" />
-            </QCard>
-            <QCard class="vn-one">
-                <QCardSection class="q-pa-none">
-                    <VnTitle
-                        :url="getLink('basic-data')"
-                        :text="t('globals.pageTitles.basicData')"
-                    />
-                </QCardSection>
-                <VnLv
-                    :label="t('invoiceIn.summary.sage')"
-                    :value="entity.sageWithholding?.withholding"
-                />
-                <VnLv
-                    :label="t('invoiceIn.summary.vat')"
-                    :value="entity.expenseDeductible?.name"
-                />
-                <VnLv
-                    :label="t('invoiceIn.card.company')"
-                    :value="entity.company?.code"
-                />
-                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
-            </QCard>
-            <QCard class="vn-one">
-                <QCardSection class="q-pa-none">
-                    <VnTitle
-                        :url="getLink('basic-data')"
-                        :text="t('globals.pageTitles.basicData')"
-                    />
-                </QCardSection>
-                <QCardSection class="q-pa-none">
-                    <VnLv
-                        :label="t('invoiceIn.summary.taxableBase')"
-                        :value="toCurrency(entity.totals.totalTaxableBase)"
-                    />
-                    <VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
-                    <VnLv :label="t('invoiceIn.summary.dueTotal')">
-                        <template #value>
-                            <QChip
-                                dense
-                                class="q-pa-xs"
-                                :color="amountsNotMatch ? 'negative' : 'transparent'"
-                                :title="
-                                    amountsNotMatch
-                                        ? t('invoiceIn.summary.noMatch')
-                                        : t('invoiceIn.summary.dueTotal')
-                                "
-                            >
-                                {{ toCurrency(entity.totals.totalDueDay) }}
-                            </QChip>
-                        </template>
-                    </VnLv>
-                </QCardSection>
+                <div class="vn-card-group">
+                    <div class="vn-card-content">
+                        <VnLv
+                            :label="t('invoiceIn.list.supplier')"
+                            :value="entity.supplier?.name"
+                        >
+                            <template #value>
+                                <span class="link">
+                                    {{ entity.supplier?.name }}
+                                    <SupplierDescriptorProxy :id="entity.supplierFk" />
+                                </span>
+                            </template>
+                        </VnLv>
+                        <VnLv
+                            :label="t('invoiceIn.supplierRef')"
+                            :value="entity.supplierRef"
+                        />
+                        <VnLv
+                            :label="t('invoiceIn.summary.currency')"
+                            :value="entity.currency?.code"
+                        />
+                        <VnLv
+                            :label="t('invoiceIn.serial')"
+                            :value="`${entity.serial}`"
+                        />
+                        <VnLv
+                            :label="t('globals.country')"
+                            :value="entity.supplier?.country?.code"
+                        />
+                    </div>
+                    <div class="vn-card-content">
+                        <VnLv
+                            :ellipsis-value="false"
+                            :label="t('invoiceIn.summary.issued')"
+                            :value="toDate(entity.issued)"
+                        />
+                        <VnLv
+                            :label="t('invoiceIn.summary.operated')"
+                            :value="toDate(entity.operated)"
+                        />
+                        <VnLv
+                            :label="t('invoiceIn.summary.bookEntried')"
+                            :value="toDate(entity.bookEntried)"
+                        />
+                        <VnLv
+                            :label="t('invoiceIn.summary.bookedDate')"
+                            :value="toDate(entity.booked)"
+                        />
+                        <VnLv
+                            :label="t('globals.isVies')"
+                            :value="entity.supplier?.isVies"
+                        />
+                    </div>
+                    <div class="vn-card-content">
+                        <VnLv
+                            :label="t('invoiceIn.summary.sage')"
+                            :value="entity.sageWithholding?.withholding"
+                        />
+                        <VnLv
+                            :label="t('invoiceIn.summary.vat')"
+                            :value="entity.expenseDeductible?.name"
+                        />
+                        <VnLv
+                            :label="t('invoiceIn.card.company')"
+                            :value="entity.company?.code"
+                        />
+                        <VnLv
+                            :label="t('invoiceIn.isBooked')"
+                            :value="invoiceIn?.isBooked"
+                        />
+                    </div>
+                    <div class="vn-card-content">
+                        <VnLv
+                            :label="t('invoiceIn.summary.taxableBase')"
+                            :value="toCurrency(entity.totals.totalTaxableBase)"
+                        />
+                        <VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
+                        <VnLv :label="t('invoiceIn.summary.dueTotal')">
+                            <template #value>
+                                <QChip
+                                    dense
+                                    class="q-pa-xs"
+                                    :color="amountsNotMatch ? 'negative' : 'transparent'"
+                                    :title="
+                                        amountsNotMatch
+                                            ? t('invoiceIn.summary.noMatch')
+                                            : t('invoiceIn.summary.dueTotal')
+                                    "
+                                >
+                                    {{ toCurrency(entity.totals.totalDueDay) }}
+                                </QChip>
+                            </template>
+                        </VnLv>
+                    </div>
+                </div>
             </QCard>
             <!--Vat-->
             <QCard v-if="entity.invoiceInTax.length" class="vat">
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index a4bdb288102..55c309cf582 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -96,67 +96,67 @@ async function handleConfirm() {
                 <OrderDescriptorMenu :order="entity" />
             </template>
             <template #body="{ entity }">
-                <QCard class="vn-one">
+                <QCard class="vn-two">
                     <VnTitle
                         :url="`#/order/${entity.id}/basic-data`"
                         :text="t('globals.pageTitles.basicData')"
                     />
-                    <VnLv label="ID" :value="entity.id" />
-                    <VnLv :label="t('globals.alias')" dash>
-                        <template #value>
-                            <span class="link">
-                                {{ dashIfEmpty(entity?.address?.nickname) }}
-                                <CustomerDescriptorProxy :id="entity?.clientFk" />
-                            </span>
-                        </template>
-                    </VnLv>
-                    <VnLv
-                        :label="t('globals.company')"
-                        :value="entity?.address?.companyFk"
-                    />
-                    <VnLv
-                        :label="t('globals.confirmed')"
-                        :value="Boolean(entity?.isConfirmed)"
-                    />
-                </QCard>
-                <QCard class="vn-one">
-                    <VnTitle
-                        :url="`#/order/${entity.id}/basic-data`"
-                        :text="t('globals.pageTitles.basicData')"
-                    />
-                    <VnLv
-                        :label="t('order.summary.created')"
-                        :value="toDateHourMinSec(entity?.created)"
-                    />
-                    <VnLv
-                        :label="t('globals.confirmed')"
-                        :value="toDateHourMinSec(entity?.confirmed)"
-                    />
-                    <VnLv
-                        :label="t('globals.landed')"
-                        :value="toDateHourMinSec(entity?.landed)"
-                    />
-                    <VnLv :label="t('globals.phone')">
-                        <template #value>
-                            {{ dashIfEmpty(entity?.address?.phone) }}
-                            <a
-                                v-if="entity?.address?.phone"
-                                :href="`tel:${entity?.address?.phone}`"
-                                class="text-primary"
-                            >
-                                <QIcon name="phone" />
-                            </a>
-                        </template>
-                    </VnLv>
-                    <VnLv
-                        :label="t('order.summary.createdFrom')"
-                        :value="entity?.sourceApp"
-                    />
-                    <VnLv
-                        :label="t('order.summary.address')"
-                        :value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
-                        class="order-summary-address"
-                    />
+                    <div class="vn-card-group">
+                        <div class="vn-card-content">
+                            <VnLv label="ID" :value="entity.id" />
+                            <VnLv :label="t('globals.alias')" dash>
+                                <template #value>
+                                    <span class="link">
+                                        {{ dashIfEmpty(entity?.address?.nickname) }}
+                                        <CustomerDescriptorProxy :id="entity?.clientFk" />
+                                    </span>
+                                </template>
+                            </VnLv>
+                            <VnLv
+                                :label="t('globals.company')"
+                                :value="entity?.address?.companyFk"
+                            />
+                            <VnLv
+                                :label="t('globals.confirmed')"
+                                :value="Boolean(entity?.isConfirmed)"
+                            />
+                        </div>
+                        <div class="vn-card-content">
+                            <VnLv
+                                :label="t('order.summary.created')"
+                                :value="toDateHourMinSec(entity?.created)"
+                            />
+                            <VnLv
+                                :label="t('globals.confirmed')"
+                                :value="toDateHourMinSec(entity?.confirmed)"
+                            />
+                            <VnLv
+                                :label="t('globals.landed')"
+                                :value="toDateHourMinSec(entity?.landed)"
+                            />
+                            <VnLv :label="t('globals.phone')">
+                                <template #value>
+                                    {{ dashIfEmpty(entity?.address?.phone) }}
+                                    <a
+                                        v-if="entity?.address?.phone"
+                                        :href="`tel:${entity?.address?.phone}`"
+                                        class="text-primary"
+                                    >
+                                        <QIcon name="phone" />
+                                    </a>
+                                </template>
+                            </VnLv>
+                            <VnLv
+                                :label="t('order.summary.createdFrom')"
+                                :value="entity?.sourceApp"
+                            />
+                            <VnLv
+                                :label="t('order.summary.address')"
+                                :value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
+                                class="order-summary-address"
+                            />
+                        </div>
+                    </div>
                 </QCard>
                 <QCard class="vn-one">
                     <VnTitle :text="t('globals.pageTitles.notes')" />
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 5838efa8803..52454ccf1ae 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -137,118 +137,130 @@ onMounted(async () => {
             <TicketDescriptorMenu :ticket="entity" />
         </template>
         <template #body="{ entity }">
-            <QCard class="vn-one">
+            <QCard class="vn-two">
                 <VnTitle
                     :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
-                <VnLv v-if="entity.ticketState" :label="t('globals.state')">
-                    <template #value>
-                        <QBadge
-                            text-color="black"
-                            :color="entity.ticketState.state.classColor"
-                        >
-                            {{ entity.ticketState.state.name }}
-                        </QBadge>
-                    </template>
-                </VnLv>
-                <VnLv :label="t('globals.salesPerson')">
-                    <template #value>
-                        <VnUserLink
-                            :name="entity.client?.salesPersonUser?.name"
-                            :worker-id="entity.client?.salesPersonFk"
+                <div class="vn-card-group">
+                    <div class="vn-card-content">
+                        <VnLv v-if="entity.ticketState" :label="t('globals.state')">
+                            <template #value>
+                                <QBadge
+                                    text-color="black"
+                                    :color="entity.ticketState.state.classColor"
+                                >
+                                    {{ entity.ticketState.state.name }}
+                                </QBadge>
+                            </template>
+                        </VnLv>
+                        <VnLv :label="t('globals.salesPerson')">
+                            <template #value>
+                                <VnUserLink
+                                    :name="entity.client?.salesPersonUser?.name"
+                                    :worker-id="entity.client?.salesPersonFk"
+                                />
+                            </template>
+                        </VnLv>
+                        <VnLv
+                            :label="t('globals.agency')"
+                            :value="entity.agencyMode?.name"
                         />
-                    </template>
-                </VnLv>
-                <VnLv :label="t('globals.agency')" :value="entity.agencyMode?.name" />
-                <VnLv :label="t('ticket.summary.zone')">
-                    <template #value>
-                        <span class="link" @click.stop>
-                            {{ entity?.zone?.name }}
-                            <ZoneDescriptorProxy :id="entity.zoneFk" />
-                        </span>
-                    </template>
-                </VnLv>
-                <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
-                <VnLv
-                    v-if="ticket?.ticketCollections?.length > 0"
-                    :label="t('ticket.summary.collection')"
-                    :value="ticket?.ticketCollections[0]?.collectionFk"
-                >
-                    <template #value>
-                        <a
-                            :href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${entity.ticketCollections[0]?.collectionFk}`"
-                            target="_blank"
-                            class="grafana"
+                        <VnLv :label="t('ticket.summary.zone')">
+                            <template #value>
+                                <span class="link" @click.stop>
+                                    {{ entity?.zone?.name }}
+                                    <ZoneDescriptorProxy :id="entity.zoneFk" />
+                                </span>
+                            </template>
+                        </VnLv>
+                        <VnLv
+                            :label="t('globals.warehouse')"
+                            :value="entity.warehouse?.name"
+                        />
+                        <VnLv
+                            v-if="ticket?.ticketCollections?.length > 0"
+                            :label="t('ticket.summary.collection')"
+                            :value="ticket?.ticketCollections[0]?.collectionFk"
                         >
-                            {{ entity.ticketCollections[0]?.collectionFk }}
-                        </a>
-                    </template>
-                </VnLv>
-                <VnLv :label="t('ticket.summary.route')">
-                    <template #value>
-                        <span class="link">
-                            {{ entity.routeFk }}
-                            <RouteDescriptorProxy :id="entity.routeFk" />
-                        </span>
-                    </template>
-                </VnLv>
-                <VnLv :label="t('ticket.summary.invoice')">
-                    <template #value>
-                        <span :class="{ link: entity.refFk }">
-                            {{ dashIfEmpty(entity.refFk) }}
-                            <InvoiceOutDescriptorProxy
-                                :id="entity.invoiceOut.id"
-                                v-if="entity.refFk"
-                            />
-                        </span>
-                    </template>
-                </VnLv>
-                <VnLv :label="t('globals.weight')" :value="dashIfEmpty(entity.weight)" />
-            </QCard>
-            <QCard class="vn-one">
-                <VnTitle
-                    :url="toTicketUrl('basic-data')"
-                    :text="t('globals.summary.basicData')"
-                />
-                <VnLv
-                    :label="t('ticket.summary.shipped')"
-                    :value="toDate(entity.shipped)"
-                />
-                <VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
-                <VnLv :label="t('globals.packages')" :value="entity.packages" />
-                <VnLv :value="entity.address.phone">
-                    <template #label>
-                        {{ t('ticket.summary.consigneePhone') }}
-                        <VnLinkPhone :phone-number="entity.address.phone" />
-                    </template>
-                </VnLv>
-                <VnLv :value="entity.address.mobile">
-                    <template #label>
-                        {{ t('ticket.summary.consigneeMobile') }}
-                        <VnLinkPhone :phone-number="entity.address.mobile" />
-                    </template>
-                </VnLv>
-                <VnLv :value="entity.client.phone">
-                    <template #label>
-                        {{ t('ticket.summary.clientPhone') }}
-                        <VnLinkPhone :phone-number="entity.client.phone" />
-                    </template>
-                </VnLv>
-                <VnLv :value="entity.client.mobile">
-                    <template #label>
-                        {{ t('ticket.summary.clientMobile') }}
-                        <VnLinkPhone :phone-number="entity.client.mobile" />
-                    </template>
-                </VnLv>
-                <VnLv
-                    :label="t('ticket.summary.consignee')"
-                    :value="`${entity.address?.nickname} #${entity.address?.id}`"
-                />
-                <VnLv
-                    :label="t('ticket.summary.consigneeStreet')"
-                    :value="formattedAddress"
-                />
+                            <template #value>
+                                <a
+                                    :href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${entity.ticketCollections[0]?.collectionFk}`"
+                                    target="_blank"
+                                    class="grafana"
+                                >
+                                    {{ entity.ticketCollections[0]?.collectionFk }}
+                                </a>
+                            </template>
+                        </VnLv>
+                        <VnLv :label="t('ticket.summary.route')">
+                            <template #value>
+                                <span class="link">
+                                    {{ entity.routeFk }}
+                                    <RouteDescriptorProxy :id="entity.routeFk" />
+                                </span>
+                            </template>
+                        </VnLv>
+                        <VnLv :label="t('ticket.summary.invoice')">
+                            <template #value>
+                                <span :class="{ link: entity.refFk }">
+                                    {{ dashIfEmpty(entity.refFk) }}
+                                    <InvoiceOutDescriptorProxy
+                                        :id="entity.invoiceOut.id"
+                                        v-if="entity.refFk"
+                                    />
+                                </span>
+                            </template>
+                        </VnLv>
+                        <VnLv
+                            :label="t('globals.weight')"
+                            :value="dashIfEmpty(entity.weight)"
+                        />
+                    </div>
+                    <div class="vn-card-content">
+                        <VnLv
+                            :label="t('ticket.summary.shipped')"
+                            :value="toDate(entity.shipped)"
+                        />
+                        <VnLv
+                            :label="t('globals.landed')"
+                            :value="toDate(entity.landed)"
+                        />
+                        <VnLv :label="t('globals.packages')" :value="entity.packages" />
+                        <VnLv :value="entity.address.phone">
+                            <template #label>
+                                {{ t('ticket.summary.consigneePhone') }}
+                                <VnLinkPhone :phone-number="entity.address.phone" />
+                            </template>
+                        </VnLv>
+                        <VnLv :value="entity.address.mobile">
+                            <template #label>
+                                {{ t('ticket.summary.consigneeMobile') }}
+                                <VnLinkPhone :phone-number="entity.address.mobile" />
+                            </template>
+                        </VnLv>
+                        <VnLv :value="entity.client.phone">
+                            <template #label>
+                                {{ t('ticket.summary.clientPhone') }}
+                                <VnLinkPhone :phone-number="entity.client.phone" />
+                            </template>
+                        </VnLv>
+                        <VnLv :value="entity.client.mobile">
+                            <template #label>
+                                {{ t('ticket.summary.clientMobile') }}
+                                <VnLinkPhone :phone-number="entity.client.mobile" />
+                            </template>
+                        </VnLv>
+                        <VnLv
+                            :label="t('ticket.summary.consignee')"
+                            :value="`${entity.address?.nickname} #${entity.address?.id}`"
+                        />
+                        <VnLv
+                            :label="t('ticket.summary.consigneeStreet')"
+                            :value="formattedAddress"
+                        />
+                    </div>
+                </div>
             </QCard>
             <QCard class="vn-one" v-if="entity.notes.length">
                 <VnTitle
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 9f955261181..68af3647498 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -275,72 +275,68 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
             <TravelDescriptorMenuItems :travel="entity" />
         </template>
         <template #body>
-            <QCard class="vn-one">
-                <QCardSection class="q-pa-none">
-                    <VnTitle
-                        :url="getLink('basic-data')"
-                        :text="t('globals.pageTitles.basicData')"
-                    />
-                </QCardSection>
-                <VnLv :label="t('globals.shipped')" :value="toDate(travel.shipped)" />
-                <VnLv
-                    :label="t('globals.warehouseOut')"
-                    :value="travel.warehouseOut?.name"
-                />
-                <VnRow>
-                    <QCheckbox
-                        :label="t('travel.basicData.isRaid')"
-                        v-model="travel.isRaid"
-                        :disable="true"
-                    />
-                </VnRow>
-                <VnRow>
-                    <QCheckbox
-                        :label="t('travel.summary.delivered')"
-                        v-model="travel.isDelivered"
-                        :disable="true"
-                    />
-                </VnRow>
-            </QCard>
-            <QCard class="vn-one">
-                <QCardSection class="q-pa-none">
-                    <VnTitle
-                        :url="getLink('basic-data')"
-                        :text="t('globals.pageTitles.basicData')"
-                    />
-                </QCardSection>
-                <VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" />
-                <VnLv
-                    :label="t('globals.warehouseIn')"
-                    :value="travel.warehouseIn?.name"
-                />
-                <VnLv
-                    :label="t('travel.basicData.daysInForward')"
-                    :value="travel?.daysInForward"
-                />
-                <QCheckbox
-                    :label="t('travel.summary.received')"
-                    v-model="travel.isReceived"
-                    :disable="true"
-                />
-            </QCard>
-            <QCard class="vn-one">
-                <QCardSection class="q-pa-none">
-                    <VnTitle
-                        :url="getLink('basic-data')"
-                        :text="t('globals.pageTitles.basicData')"
-                    />
-                </QCardSection>
-                <VnLv :label="t('globals.agency')" :value="travel.agency?.name" />
-                <VnLv :label="t('globals.reference')" :value="travel.ref" />
-                <VnLv label="m³" :value="travel.m3" />
-                <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
-                <VnLv
-                    :label="t('travel.summary.availabled')"
-                    :value="
-                        dashIfEmpty(toDateTimeFormat(travel.availabled))
-                    "
+            <QCard class="full-width">
+                <VnTitle
+                    :url="getLink('basic-data')"
+                    :text="t('globals.pageTitles.basicData')"
                 />
+                <div class="vn-card-group">
+                    <div class="vn-card-content">
+                        <VnLv
+                            :label="t('globals.shipped')"
+                            :value="toDate(travel.shipped)"
+                        />
+                        <VnLv
+                            :label="t('globals.warehouseOut')"
+                            :value="travel.warehouseOut?.name"
+                        />
+                        <QCheckbox
+                            :label="t('travel.basicData.isRaid')"
+                            v-model="travel.isRaid"
+                            :disable="true"
+                            size="sm"
+                        />
+                        <QCheckbox
+                            :label="t('travel.summary.delivered')"
+                            v-model="travel.isDelivered"
+                            :disable="true"
+                            size="sm"
+                        />
+                    </div>
+                    <div class="vn-card-content">
+                        <VnLv
+                            :label="t('globals.landed')"
+                            :value="toDate(travel.landed)"
+                        />
+                        <VnLv
+                            :label="t('globals.warehouseIn')"
+                            :value="travel.warehouseIn?.name"
+                        />
+                        <VnLv
+                            :label="t('travel.basicData.daysInForward')"
+                            :value="travel?.daysInForward"
+                        />
+                        <QCheckbox
+                            :label="t('travel.summary.received')"
+                            v-model="travel.isReceived"
+                            :disable="true"
+                            size="sm"
+                        />
+                    </div>
+                    <div class="vn-card-content">
+                        <VnLv :label="t('globals.agency')" :value="travel.agency?.name" />
+                        <VnLv :label="t('globals.reference')" :value="travel.ref" />
+                        <VnLv label="m³" :value="travel.m3" />
+                        <VnLv
+                            :label="t('globals.totalEntries')"
+                            :value="travel.totalEntries"
+                        />
+                        <VnLv
+                            :label="t('travel.summary.availabled')"
+                            :value="dashIfEmpty(toDateTimeFormat(travel.availabled))"
+                        />
+                    </div>
+                </div>
             </QCard>
             <QCard class="full-width">
                 <VnTitle :text="t('travel.summary.entries')" />
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 78c5dfd82b3..1f7584389c1 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -47,77 +47,88 @@ onBeforeMount(async () => {
             <WorkerDescriptorMenu :worker="entity" :is-excluded="workerExcluded" />
         </template>
         <template #body="{ entity: worker }">
-            <QCard class="vn-one">
+            <QCard class="vn-two">
                 <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
-                <VnLv :label="t('globals.name')" :value="worker.user?.nickname" />
-                <VnLv :label="t('worker.list.department')">
-                    <template #value>
-                        <span class="link" v-text="worker.department?.department?.name" />
-                        <DepartmentDescriptorProxy
-                            :id="worker.department?.department?.id"
+                <div class="vn-card-group">
+                    <div class="vn-card-content">
+                        <VnLv :label="t('globals.name')" :value="worker.user?.nickname" />
+                        <VnLv :label="t('worker.list.department')">
+                            <template #value>
+                                <span
+                                    class="link"
+                                    v-text="worker.department?.department?.name"
+                                />
+                                <DepartmentDescriptorProxy
+                                    :id="worker.department?.department?.id"
+                                />
+                            </template>
+                        </VnLv>
+                        <VnLv :label="t('worker.summary.boss')" link>
+                            <template #value>
+                                <VnUserLink
+                                    v-if="worker.boss"
+                                    :name="dashIfEmpty(worker.boss?.name)"
+                                    :worker-id="worker.bossFk"
+                                />
+                            </template>
+                        </VnLv>
+                        <VnLv :value="worker.mobileExtension">
+                            <template #label>
+                                {{ t('worker.summary.phoneExtension') }}
+                                <VnLinkPhone :phone-number="worker.mobileExtension" />
+                            </template>
+                        </VnLv>
+                        <VnLv :value="worker.phone">
+                            <template #label>
+                                {{ t('worker.summary.entPhone') }}
+                                <VnLinkPhone :phone-number="worker.phone" />
+                            </template>
+                        </VnLv>
+                        <VnLv :value="advancedSummary?.client?.phone">
+                            <template #label>
+                                {{ t('worker.summary.personalPhone') }}
+                                <VnLinkPhone
+                                    :phone-number="advancedSummary?.client?.phone"
+                                />
+                            </template>
+                        </VnLv>
+                    </div>
+                    <div class="vn-card-content">
+                        <VnLv
+                            :label="t('worker.summary.fiDueDate')"
+                            :value="toDate(advancedSummary.fiDueDate)"
                         />
-                    </template>
-                </VnLv>
-                <VnLv :label="t('worker.summary.boss')" link>
-                    <template #value>
-                        <VnUserLink
-                            v-if="worker.boss"
-                            :name="dashIfEmpty(worker.boss?.name)"
-                            :worker-id="worker.bossFk"
+                        <VnLv :label="t('worker.summary.sex')" :value="worker.sex" />
+                        <VnLv
+                            :label="t('worker.summary.seniority')"
+                            :value="toDate(advancedSummary.seniority)"
                         />
-                    </template>
-                </VnLv>
-                <VnLv :value="worker.mobileExtension">
-                    <template #label>
-                        {{ t('worker.summary.phoneExtension') }}
-                        <VnLinkPhone :phone-number="worker.mobileExtension" />
-                    </template>
-                </VnLv>
-                <VnLv :value="worker.phone">
-                    <template #label>
-                        {{ t('worker.summary.entPhone') }}
-                        <VnLinkPhone :phone-number="worker.phone" />
-                    </template>
-                </VnLv>
-                <VnLv :value="advancedSummary?.client?.phone">
-                    <template #label>
-                        {{ t('worker.summary.personalPhone') }}
-                        <VnLinkPhone :phone-number="advancedSummary?.client?.phone" />
-                    </template>
-                </VnLv>
-            </QCard>
-            <QCard class="vn-one" v-if="advancedSummary">
-                <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
-                <VnLv
-                    :label="t('worker.summary.fiDueDate')"
-                    :value="toDate(advancedSummary.fiDueDate)"
-                />
-                <VnLv :label="t('worker.summary.sex')" :value="worker.sex" />
-                <VnLv
-                    :label="t('worker.summary.seniority')"
-                    :value="toDate(advancedSummary.seniority)"
-                />
-                <VnLv :label="t('worker.summary.fi')" :value="advancedSummary.fi" />
-                <VnLv
-                    :label="t('worker.summary.birth')"
-                    :value="toDate(advancedSummary.birth)"
-                />
-                <VnLv
-                    :label="t('worker.summary.isFreelance')"
-                    :value="advancedSummary.isFreelance"
-                />
-                <VnLv
-                    :label="t('worker.summary.isSsDiscounted')"
-                    :value="advancedSummary.isSsDiscounted"
-                />
-                <VnLv
-                    :label="t('worker.summary.hasMachineryAuthorized')"
-                    :value="advancedSummary.hasMachineryAuthorized"
-                />
-                <VnLv
-                    :label="t('worker.summary.isDisable')"
-                    :value="advancedSummary.isDisable"
-                />
+                        <VnLv
+                            :label="t('worker.summary.fi')"
+                            :value="advancedSummary.fi"
+                        />
+                        <VnLv
+                            :label="t('worker.summary.birth')"
+                            :value="toDate(advancedSummary.birth)"
+                        />
+                        <VnLv
+                            :label="t('worker.summary.isFreelance')"
+                            :value="advancedSummary.isFreelance"
+                        />
+                        <VnLv
+                            :label="t('worker.summary.isSsDiscounted')"
+                            :value="advancedSummary.isSsDiscounted"
+                        />
+                        <VnLv
+                            :label="t('worker.summary.hasMachineryAuthorized')"
+                            :value="advancedSummary.hasMachineryAuthorized"
+                        />
+                        <VnLv
+                            :label="t('worker.summary.isDisable')"
+                            :value="advancedSummary.isDisable"
+                        />
+                    </div>
+                </div>
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('worker.summary.userData')" />
diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index 5b29b495b06..04ba14ce48a 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -74,21 +74,30 @@ onMounted(async () => {
         <template #body="{ entity: zone }">
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
-                <VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
-                <VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
-                <VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
+                <div class="vn-card-group">
+                    <div class="vn-card-content">
+                        <VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
+                        <VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
+                        <VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
+                    </div>
+                    <div class="vn-card-content">
+                        <VnLv
+                            :label="t('summary.closeHour')"
+                            :value="toTimeFormat(zone.hour)"
+                        />
+                        <VnLv
+                            :label="t('zone.travelingDays')"
+                            :value="zone.travelingDays"
+                        />
+                        <QCheckbox
+                            :label="t('zone.volumetric')"
+                            v-model="zone.isVolumetric"
+                            :disable="true"
+                        />
+                    </div>
+                </div>
             </QCard>
             <QCard class="vn-one">
-                <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
-                <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(zone.hour)" />
-                <VnLv :label="t('zone.travelingDays')" :value="zone.travelingDays" />
-                <QCheckbox
-                    :label="t('zone.volumetric')"
-                    v-model="zone.isVolumetric"
-                    :disable="true"
-                />
-            </QCard>
-            <QCard class="full-width">
                 <VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
                 <QTable
                     :columns="columns"

From a07afe3a94bc7e1911576a1fc6f2ce2bf7cdc4c6 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Fri, 28 Feb 2025 13:44:14 +0100
Subject: [PATCH 06/47] refactor: refs #8683 enhance sorting logic in VnSelect
 component

---
 src/components/common/VnSelect.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index d111780bdd5..eb387fe6113 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -152,6 +152,10 @@ const value = computed({
     },
 });
 
+const computedSortBy = computed(() => {
+    return $props.sortBy || $props.optionLabel;
+});
+
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -186,7 +190,7 @@ function findKeyInOptions() {
 }
 
 function setOptions(data) {
-    data = dataByOrder(data, $props.sortBy);
+    data = dataByOrder(data, computedSortBy.value);
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
     emit('update:options', data);

From 816a6197c72bd11b3e44a10d700569738491e937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 3 Mar 2025 18:05:19 +0100
Subject: [PATCH 07/47] feat: refs #8529 enhance InvoiceInVat component with
 data-cy attribute for isDeductible checkbox

---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue           |  5 ++++-
 .../invoiceIn/invoiceInBasicData.spec.js            |  6 +-----
 .../invoiceIn/invoiceInDescriptor.spec.js           |  4 ++--
 .../integration/invoiceIn/invoiceInVat.spec.js      | 13 ++++++++++++-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 0f8f9a6c540..7077c9a59bf 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -237,7 +237,10 @@ function setCursor(ref) {
                 </template>
                 <template #body-cell-isDeductible="{ row }">
                     <QTd align="center">
-                        <QCheckbox v-model="row.isDeductible" />
+                        <QCheckbox
+                            v-model="row.isDeductible"
+                            data-cy="isDeductible_checkbox"
+                        />
                     </QTd>
                 </template>
                 <template #body-cell-taxablebase="{ row }">
diff --git a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
index 11ca1bb59be..5b6836784f6 100644
--- a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
@@ -11,13 +11,9 @@ describe('InvoiceInBasicData', () => {
     });
 
     it('should edit the provideer and supplier ref', () => {
-        cy.dataCy('UnDeductibleVatSelect').type('4751000000');
-        cy.get('.q-menu .q-item').contains('4751000000').click();
-        cy.get(resetBtn).click();
-
         cy.waitForElement('#formModel').within(() => {
             cy.dataCy('vnSupplierSelect').type('Bros nick');
-        })
+        });
         cy.get('.q-menu .q-item').contains('Bros nick').click();
         cy.saveCard();
         cy.get(`${firstFormSelect} input`).invoke('val').should('eq', 'Bros nick');
diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
index 97a9fe976a2..fed90c517c1 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
@@ -1,7 +1,7 @@
 describe('InvoiceInDescriptor', () => {
     const book = '.summaryHeader > .no-wrap > .q-btn';
-    const firstDescritorOpt = '.q-menu > .q-list > :nth-child(5) > .q-item__section';
-    const checkbox = ':nth-child(5) > .q-checkbox';
+    const firstDescritorOpt = '.q-menu > .q-list > :nth-child(4) > .q-item__section';
+    const checkbox = ':nth-child(4) > .q-checkbox';
 
     it('should booking and unbooking the invoice properly', () => {
         cy.viewport(1280, 720);
diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index 1e7ce1003b7..2693ac41055 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 describe('InvoiceInVat', () => {
     const thirdRow = 'tbody > :nth-child(3)';
-    const firstLineVat = 'tbody > :nth-child(1) > :nth-child(4)';
+    const firstLineVat = 'tbody > :nth-child(1) ';
     const vats = '[data-cy="vat-sageiva"]';
     const dialogInputs = '.q-dialog label input';
     const addBtn = 'tbody tr:nth-child(1) td:nth-child(2) .--add-icon';
@@ -20,6 +20,17 @@ describe('InvoiceInVat', () => {
         cy.get(vats).eq(0).should('have.value', '8: H.P. IVA 21% CEE');
     });
 
+    it('should mark the line as deductible VAT', () => {
+        cy.get(`${firstLineVat}  [data-cy="isDeductible_checkbox"]`).click();
+
+        cy.saveCard();
+
+        cy.get(`${firstLineVat}  [data-cy="isDeductible_checkbox"]`)
+
+            .click();
+        cy.saveCard();
+    });
+
     it('should add a new row', () => {
         cy.addRow();
         cy.fillRow(thirdRow, [true, 2000000001, 30, 'H.P. IVA 10']);

From d893505cd6bd660813ac867db0db61f9ac9f79a1 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Fri, 7 Mar 2025 09:14:18 +0100
Subject: [PATCH 08/47] fix: refs #8683 update fetchFilter to use computed
 sortBy value

---
 src/components/common/VnSelect.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 37bb55ca458..9405baa4f3a 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -220,7 +220,8 @@ function filter(val, options) {
 async function fetchFilter(val) {
     if (!$props.url) return;
 
-    const { fields, include, sortBy, limit } = $props;
+    const { fields, include, limit } = $props;
+    const sortBy = computedSortBy.value;
     const key =
         optionFilterValue.value ??
         (new RegExp(/\d/g).test(val)

From 68af7a50fa7410cedb20b67b14e4faa21b7b5498 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Fri, 7 Mar 2025 11:59:22 +0100
Subject: [PATCH 09/47] fix: refs #8683 update computedSortBy to append ' ASC'
 to optionLabel

---
 src/components/common/VnSelect.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 9405baa4f3a..296a212e72b 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -153,7 +153,7 @@ const value = computed({
 });
 
 const computedSortBy = computed(() => {
-    return $props.sortBy || $props.optionLabel;
+    return $props.sortBy || $props.optionLabel + ' ASC';
 });
 
 watch(options, (newValue) => {

From 37f1882530043f0ddcdb4a73ad3e9facf2ef5c03 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Mon, 10 Mar 2025 13:55:36 +0100
Subject: [PATCH 10/47] test(UserPanel): refs #8683 update initial values and
 options in user selection

---
 test/cypress/integration/vnComponent/UserPanel.spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/vnComponent/UserPanel.spec.js b/test/cypress/integration/vnComponent/UserPanel.spec.js
index 25724e87392..216797dfaf1 100644
--- a/test/cypress/integration/vnComponent/UserPanel.spec.js
+++ b/test/cypress/integration/vnComponent/UserPanel.spec.js
@@ -15,7 +15,7 @@ describe('UserPanel', () => {
         cy.openUserPanel();
 
         // Compruebo la opcion inicial
-        cy.get(userWarehouse).should('have.value', 'VNL').click();
+        cy.get(userWarehouse).should('have.value', 'ORN').click();
 
         // Actualizo la opción
         cy.getOption(3);
@@ -36,14 +36,14 @@ describe('UserPanel', () => {
         cy.openUserPanel();
 
         // Compruebo la opcion inicial
-        cy.get(userCompany).should('have.value', 'Warehouse One').click();
+        cy.get(userCompany).should('have.value', 'Inventory').click();
 
         //Actualizo la opción
-        cy.getOption(2);
+        cy.getOption(3);
 
         //Compruebo la notificación
         cy.get('.q-notification').should('be.visible');
-        cy.get(userCompany).should('have.value', 'Warehouse Two');
+        cy.get(userCompany).should('have.value', 'TestingWarehouse');
 
         //Restauro el valor
         cy.get(userCompany).click();

From 6a48ff93269fee8d7da4f557cf2399514035aea3 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Mon, 10 Mar 2025 14:14:22 +0100
Subject: [PATCH 11/47] test(UserPanel): refs #8683 update initial value in
 user selection

---
 test/cypress/integration/vnComponent/UserPanel.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/vnComponent/UserPanel.spec.js b/test/cypress/integration/vnComponent/UserPanel.spec.js
index 216797dfaf1..ec6774f5813 100644
--- a/test/cypress/integration/vnComponent/UserPanel.spec.js
+++ b/test/cypress/integration/vnComponent/UserPanel.spec.js
@@ -36,7 +36,7 @@ describe('UserPanel', () => {
         cy.openUserPanel();
 
         // Compruebo la opcion inicial
-        cy.get(userCompany).should('have.value', 'Inventory').click();
+        cy.get(userCompany).should('have.value', 'Algemesi').click();
 
         //Actualizo la opción
         cy.getOption(3);

From 781c8050a88d7a757db7492e7419d1739e98baa6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 11 Mar 2025 11:56:50 +0100
Subject: [PATCH 12/47] refactor: refs #8326 modified sumaryDialog width

---
 src/pages/InvoiceIn/InvoiceInList.vue   |   2 +-
 src/pages/Order/Card/OrderSummary.vue   | 338 ++++++++++++------------
 src/pages/Order/OrderList.vue           |   2 +-
 src/pages/Ticket/TicketList.vue         |   2 +-
 src/pages/Travel/Card/TravelSummary.vue |  18 +-
 src/pages/Travel/TravelList.vue         |   2 +-
 src/pages/Worker/WorkerList.vue         |   2 +-
 7 files changed, 179 insertions(+), 187 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 0960d0d6cef..9b62fdf6a00 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -119,7 +119,7 @@ const cols = computed(() => [
                 icon: 'preview',
                 type: 'submit',
                 isPrimary: true,
-                action: (row) => viewSummary(row.id, InvoiceInSummary),
+                action: (row) => viewSummary(row.id, InvoiceInSummary, 'lg-width'),
             },
             {
                 title: t('globals.download'),
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 55c309cf582..10a458bfb32 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -71,180 +71,174 @@ async function handleConfirm() {
 </script>
 
 <template>
-    <div class="q-pa-md">
-        <CardSummary
-            ref="summary"
-            :url="`Orders/${entityId}/summary`"
-            data-key="OrderSummary"
-        >
-            <template #header="{ entity }">
-                {{ t('order.summary.basket') }} #{{ entity?.id }} -
-                {{ entity?.client?.name }} ({{ entity?.clientFk }})
-            </template>
-            <template #header-right>
-                <QBtn
-                    flat
-                    text-color="white"
-                    :disabled="isConfirmed"
-                    :label="t('order.summary.confirm')"
-                    @click="handleConfirm()"
-                >
-                    <QTooltip>{{ t('order.summary.confirmLines') }}</QTooltip>
-                </QBtn>
-            </template>
-            <template #menu="{ entity }">
-                <OrderDescriptorMenu :order="entity" />
-            </template>
-            <template #body="{ entity }">
-                <QCard class="vn-two">
-                    <VnTitle
-                        :url="`#/order/${entity.id}/basic-data`"
-                        :text="t('globals.pageTitles.basicData')"
-                    />
-                    <div class="vn-card-group">
-                        <div class="vn-card-content">
-                            <VnLv label="ID" :value="entity.id" />
-                            <VnLv :label="t('globals.alias')" dash>
-                                <template #value>
-                                    <span class="link">
-                                        {{ dashIfEmpty(entity?.address?.nickname) }}
-                                        <CustomerDescriptorProxy :id="entity?.clientFk" />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('globals.company')"
-                                :value="entity?.address?.companyFk"
-                            />
-                            <VnLv
-                                :label="t('globals.confirmed')"
-                                :value="Boolean(entity?.isConfirmed)"
-                            />
-                        </div>
-                        <div class="vn-card-content">
-                            <VnLv
-                                :label="t('order.summary.created')"
-                                :value="toDateHourMinSec(entity?.created)"
-                            />
-                            <VnLv
-                                :label="t('globals.confirmed')"
-                                :value="toDateHourMinSec(entity?.confirmed)"
-                            />
-                            <VnLv
-                                :label="t('globals.landed')"
-                                :value="toDateHourMinSec(entity?.landed)"
-                            />
-                            <VnLv :label="t('globals.phone')">
-                                <template #value>
-                                    {{ dashIfEmpty(entity?.address?.phone) }}
-                                    <a
-                                        v-if="entity?.address?.phone"
-                                        :href="`tel:${entity?.address?.phone}`"
-                                        class="text-primary"
-                                    >
-                                        <QIcon name="phone" />
-                                    </a>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('order.summary.createdFrom')"
-                                :value="entity?.sourceApp"
-                            />
-                            <VnLv
-                                :label="t('order.summary.address')"
-                                :value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
-                                class="order-summary-address"
-                            />
-                        </div>
+    <CardSummary
+        ref="summary"
+        :url="`Orders/${entityId}/summary`"
+        data-key="OrderSummary"
+    >
+        <template #header="{ entity }">
+            {{ t('order.summary.basket') }} #{{ entity?.id }} -
+            {{ entity?.client?.name }} ({{ entity?.clientFk }})
+        </template>
+        <template #header-right>
+            <QBtn
+                flat
+                text-color="white"
+                :disabled="isConfirmed"
+                :label="t('order.summary.confirm')"
+                @click="handleConfirm()"
+            >
+                <QTooltip>{{ t('order.summary.confirmLines') }}</QTooltip>
+            </QBtn>
+        </template>
+        <template #menu="{ entity }">
+            <OrderDescriptorMenu :order="entity" />
+        </template>
+        <template #body="{ entity }">
+            <QCard class="vn-two">
+                <VnTitle
+                    :url="`#/order/${entity.id}/basic-data`"
+                    :text="t('globals.pageTitles.basicData')"
+                />
+                <div class="vn-card-group">
+                    <div class="vn-card-content">
+                        <VnLv label="ID" :value="entity.id" />
+                        <VnLv :label="t('globals.alias')" dash>
+                            <template #value>
+                                <span class="link">
+                                    {{ dashIfEmpty(entity?.address?.nickname) }}
+                                    <CustomerDescriptorProxy :id="entity?.clientFk" />
+                                </span>
+                            </template>
+                        </VnLv>
+                        <VnLv
+                            :label="t('globals.company')"
+                            :value="entity?.address?.companyFk"
+                        />
+                        <VnLv
+                            :label="t('globals.confirmed')"
+                            :value="Boolean(entity?.isConfirmed)"
+                        />
                     </div>
-                </QCard>
-                <QCard class="vn-one">
-                    <VnTitle :text="t('globals.pageTitles.notes')" />
-                    <p v-if="entity?.note" class="no-margin">
-                        {{ entity?.note }}
-                    </p>
-                </QCard>
-                <QCard class="vn-one">
-                    <VnTitle :text="t('order.summary.total')" />
-                    <VnLv>
-                        <template #label>
-                            <span class="text-h6">{{ t('globals.subtotal') }}</span>
-                        </template>
-                        <template #value>
-                            <span class="text-h6">{{
-                                toCurrency(entity?.subTotal)
-                            }}</span>
-                        </template>
-                    </VnLv>
-                    <VnLv>
-                        <template #label>
-                            <span class="text-h6">{{ t('globals.vat') }}</span>
-                        </template>
-                        <template #value>
-                            <span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
-                        </template>
-                    </VnLv>
-                    <VnLv>
-                        <template #label>
-                            <span class="text-h6">{{ t('order.summary.total') }}</span>
-                        </template>
-                        <template #value>
-                            <span class="text-h6">{{ toCurrency(entity?.total) }}</span>
-                        </template>
-                    </VnLv>
-                </QCard>
-                <QCard>
-                    <VnTitle :text="t('globals.details')" />
-                    <QTable :columns="detailsColumns" :rows="entity?.rows" flat>
-                        <template #header="props">
-                            <QTr :props="props">
-                                <QTh auto-width>{{ t('globals.item') }}</QTh>
-                                <QTh>{{ t('globals.description') }}</QTh>
-                                <QTh auto-width>{{ t('globals.quantity') }}</QTh>
-                                <QTh auto-width>{{ t('globals.price') }}</QTh>
-                                <QTh auto-width>{{ t('order.summary.amount') }}</QTh>
-                            </QTr>
-                        </template>
-                        <template #body="props">
-                            <QTr :props="props">
-                                <QTd key="item" :props="props" class="item">
-                                    <span class="link">
-                                        {{ props.row.item?.id }}
-                                        <ItemDescriptorProxy :id="props.row.item?.id" />
-                                    </span>
-                                </QTd>
-                                <QTd key="description" :props="props">
-                                    <div class="description">
-                                        <div class="name">
-                                            {{ props.row.item.name }}
-                                            <span
-                                                v-if="props.row.item.subName"
-                                                class="subName"
-                                            >
-                                                {{ props.row.item.subName }}
-                                            </span>
-                                        </div>
+                    <div class="vn-card-content">
+                        <VnLv
+                            :label="t('order.summary.created')"
+                            :value="toDateHourMinSec(entity?.created)"
+                        />
+                        <VnLv
+                            :label="t('globals.confirmed')"
+                            :value="toDateHourMinSec(entity?.confirmed)"
+                        />
+                        <VnLv
+                            :label="t('globals.landed')"
+                            :value="toDateHourMinSec(entity?.landed)"
+                        />
+                        <VnLv :label="t('globals.phone')">
+                            <template #value>
+                                {{ dashIfEmpty(entity?.address?.phone) }}
+                                <a
+                                    v-if="entity?.address?.phone"
+                                    :href="`tel:${entity?.address?.phone}`"
+                                    class="text-primary"
+                                >
+                                    <QIcon name="phone" />
+                                </a>
+                            </template>
+                        </VnLv>
+                        <VnLv
+                            :label="t('order.summary.createdFrom')"
+                            :value="entity?.sourceApp"
+                        />
+                        <VnLv
+                            :label="t('order.summary.address')"
+                            :value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
+                            class="order-summary-address"
+                        />
+                    </div>
+                </div>
+            </QCard>
+            <QCard class="vn-one">
+                <VnTitle :text="t('globals.pageTitles.notes')" />
+                <p v-if="entity?.note" class="no-margin">
+                    {{ entity?.note }}
+                </p>
+            </QCard>
+            <QCard class="vn-one">
+                <VnTitle :text="t('order.summary.total')" />
+                <VnLv>
+                    <template #label>
+                        <span class="text-h6">{{ t('globals.subtotal') }}</span>
+                    </template>
+                    <template #value>
+                        <span class="text-h6">{{ toCurrency(entity?.subTotal) }}</span>
+                    </template>
+                </VnLv>
+                <VnLv>
+                    <template #label>
+                        <span class="text-h6">{{ t('globals.vat') }}</span>
+                    </template>
+                    <template #value>
+                        <span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
+                    </template>
+                </VnLv>
+                <VnLv>
+                    <template #label>
+                        <span class="text-h6">{{ t('order.summary.total') }}</span>
+                    </template>
+                    <template #value>
+                        <span class="text-h6">{{ toCurrency(entity?.total) }}</span>
+                    </template>
+                </VnLv>
+            </QCard>
+            <QCard>
+                <VnTitle :text="t('globals.details')" />
+                <QTable :columns="detailsColumns" :rows="entity?.rows" flat>
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh auto-width>{{ t('globals.item') }}</QTh>
+                            <QTh>{{ t('globals.description') }}</QTh>
+                            <QTh auto-width>{{ t('globals.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('globals.price') }}</QTh>
+                            <QTh auto-width>{{ t('order.summary.amount') }}</QTh>
+                        </QTr>
+                    </template>
+                    <template #body="props">
+                        <QTr :props="props">
+                            <QTd key="item" :props="props" class="item">
+                                <span class="link">
+                                    {{ props.row.item?.id }}
+                                    <ItemDescriptorProxy :id="props.row.item?.id" />
+                                </span>
+                            </QTd>
+                            <QTd key="description" :props="props">
+                                <div class="description">
+                                    <div class="name">
+                                        {{ props.row.item.name }}
+                                        <span
+                                            v-if="props.row.item.subName"
+                                            class="subName"
+                                        >
+                                            {{ props.row.item.subName }}
+                                        </span>
                                     </div>
-                                    <FetchedTags :item="props.row.item" :columns="3" />
-                                </QTd>
-                                <QTd key="quantity" :props="props">
-                                    {{ props.row.quantity }}
-                                </QTd>
-                                <QTd key="price" :props="props">
-                                    {{ toCurrency(props.row.price) }}
-                                </QTd>
-                                <QTd key="amount" :props="props">
-                                    {{
-                                        toCurrency(props.row?.quantity * props.row?.price)
-                                    }}
-                                </QTd>
-                            </QTr>
-                        </template>
-                    </QTable>
-                </QCard>
-            </template>
-        </CardSummary>
-    </div>
+                                </div>
+                                <FetchedTags :item="props.row.item" :columns="3" />
+                            </QTd>
+                            <QTd key="quantity" :props="props">
+                                {{ props.row.quantity }}
+                            </QTd>
+                            <QTd key="price" :props="props">
+                                {{ toCurrency(props.row.price) }}
+                            </QTd>
+                            <QTd key="amount" :props="props">
+                                {{ toCurrency(props.row?.quantity * props.row?.price) }}
+                            </QTd>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
+        </template>
+    </CardSummary>
 </template>
 <style lang="scss">
 .cardSummary .summaryBody .vn-label-value.order-summary-address {
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 2a1997f2101..42f90c33a9b 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -147,7 +147,7 @@ const columns = computed(() => [
             {
                 title: t('globals.pageTitles.summary'),
                 icon: 'preview',
-                action: (row) => viewSummary(row.id, OrderSummary),
+                action: (row) => viewSummary(row.id, OrderSummary, 'lg-width'),
                 isPrimary: true,
             },
         ],
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index dfaabc84840..fa4e3c89ffa 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -253,7 +253,7 @@ const columns = computed(() => [
                             name: 'TicketCard',
                         }).href;
                         window.open(url, '_blank');
-                    } else viewSummary(row.id, TicketSummary);
+                    } else viewSummary(row.id, TicketSummary, 'lg-width');
                 },
             },
         ],
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 68af3647498..af6db630406 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -7,8 +7,6 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
-import FetchData from 'src/components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import { toDate, toCurrency, toCelsius } from 'src/filters';
 import { toDateTimeFormat } from 'src/filters/date.js';
 import { dashIfEmpty } from 'src/filters';
@@ -252,16 +250,16 @@ async function setTravelData(travelData) {
 }
 
 const getLink = (param) => `#/travel/${entityId.value}/${param}`;
+
+onMounted(async () => {
+    const { data } = await axios.get('Warehouses', {
+        params: { fields: ['id', 'name'] },
+    });
+    warehouses.value = data;
+});
 </script>
 
 <template>
-    <FetchData
-        url="Warehouses"
-        :filter="{ fields: ['id', 'name'] }"
-        order="name"
-        @on-fetch="(data) => (warehouses = data)"
-        auto-load
-    />
     <CardSummary
         ref="summaryRef"
         :url="`Travels/${entityId}/getTravel`"
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index b227afcb213..32ddc639a18 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -201,7 +201,7 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
-                action: (row) => viewSummary(row.id, TravelSummary),
+                action: (row) => viewSummary(row.id, TravelSummary, 'lg-width'),
                 isPrimary: true,
             },
         ],
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index b767900752e..cb722a139cc 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -105,7 +105,7 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
-                action: (row) => viewSummary(row.id, WorkerSummary),
+                action: (row) => viewSummary(row.id, WorkerSummary, 'lg-width'),
                 isPrimary: true,
             },
         ],

From d82369a62cd726d2d9b54254fb48cada64e28c8a Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Tue, 11 Mar 2025 13:10:13 +0100
Subject: [PATCH 13/47] fix(UserPanel): refs #8683 update initial values for
 user warehouse and company selections

---
 test/cypress/integration/vnComponent/UserPanel.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/vnComponent/UserPanel.spec.js b/test/cypress/integration/vnComponent/UserPanel.spec.js
index ec6774f5813..8722fe37e46 100644
--- a/test/cypress/integration/vnComponent/UserPanel.spec.js
+++ b/test/cypress/integration/vnComponent/UserPanel.spec.js
@@ -15,7 +15,7 @@ describe('UserPanel', () => {
         cy.openUserPanel();
 
         // Compruebo la opcion inicial
-        cy.get(userWarehouse).should('have.value', 'ORN').click();
+        cy.get(userWarehouse).should('have.value', 'VNL').click();
 
         // Actualizo la opción
         cy.getOption(3);
@@ -36,7 +36,7 @@ describe('UserPanel', () => {
         cy.openUserPanel();
 
         // Compruebo la opcion inicial
-        cy.get(userCompany).should('have.value', 'Algemesi').click();
+        cy.get(userCompany).should('have.value', 'Warehouse One').click();
 
         //Actualizo la opción
         cy.getOption(3);

From 13cf7c6031bd093cc5962b8507201b020bc7489f Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Tue, 11 Mar 2025 13:17:36 +0100
Subject: [PATCH 14/47] fix(VnLog): refs #8683 update validation content for
 entity filter test

---
 test/cypress/integration/vnComponent/VnLog.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/vnComponent/VnLog.spec.js b/test/cypress/integration/vnComponent/VnLog.spec.js
index 80b9d07dfd0..782fb9fbea9 100644
--- a/test/cypress/integration/vnComponent/VnLog.spec.js
+++ b/test/cypress/integration/vnComponent/VnLog.spec.js
@@ -20,6 +20,6 @@ describe('VnLog', () => {
     it('should filter by entity', () => {
         cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim');
         cy.get('.q-page').click();
-        cy.validateContent(chips[0], 'Claim');
+        cy.validateContent(chips[0], 'Beginning');
     });
 });

From 6a0c58631c4e8d997b93f9f7ebaecdfd7bb53ff5 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 12 Mar 2025 12:34:03 +0100
Subject: [PATCH 15/47] fix: refs #8621 test for date input selector

---
 src/pages/Route/RouteList.vue                 | 30 +++++++------------
 .../route/routeExtendedList.spec.js           |  2 +-
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index db52dcf6d98..f8234c7db84 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -39,28 +39,24 @@ const columns = computed(() => [
         width: '25px',
     },
     {
-        name: 'workerFk',
-        label: t('gloabls.worker'),
-        component: markRaw(VnSelectWorker),
-        create: true,
-        format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
-        columnFilter: false,
-        width: '100px',
-    },
-    {
+        align: 'left',
         name: 'workerFk',
         label: t('globals.worker'),
-        visible: false,
+        component: markRaw(VnSelectWorker),
+        create: true,
         cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
+        columnFilter: false,
     },
     {
-        name: 'agencyName',
+        align: 'left',
+        name: 'agencyModeFk',
         label: t('globals.agency'),
-        visible: false,
+        format: (row) => row?.agencyName,
         cardVisible: true,
     },
     {
-        label: t('globals.Agency'),
+        label: t('globals.agency'),
         name: 'agencyModeFk',
         component: 'select',
         attrs: {
@@ -78,17 +74,13 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'vehicleFk',
-        label: t('route.Vehicle'),
+        label: t('globals.vehicle'),
         format: (row) => row?.vehiclePlateNumber,
         cardVisible: true,
     },
-    {
-        name: 'vehiclePlateNumber',
-        label: t('globals.vehicle'),
-    },
     {
         name: 'vehicleFk',
-        label: t('globals.Vehicle'),
+        label: t('globals.vehicle'),
         cardVisible: true,
         component: 'select',
         attrs: {
diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
index 237729107de..b46ce3ba257 100644
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -120,7 +120,7 @@ describe('Route extended list', () => {
     it('Should clone selected route', () => {
         cy.get(selectors.lastRowSelectCheckBox).click();
         cy.get(selectors.cloneBtn).click();
-        cy.dataCy('route.Starting date_inputDate').type('10-05-2001');
+        cy.dataCy('Starting date_inputDate').type('10-05-2001');
         cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click();
         cy.validateContent(selectors.date, '05/10/2001');
     });

From c50d6d884ec86786ad4831269b76277e348317d6 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 13 Mar 2025 09:02:41 +0100
Subject: [PATCH 16/47] test: refs #8621 add data-cy attributes for summary
 navigation buttons in CMR list tests

---
 src/components/ui/VnToSummary.vue             |  1 +
 .../integration/route/cmr/cmrList.spec.js     | 77 ++++++++++++++-----
 2 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/src/components/ui/VnToSummary.vue b/src/components/ui/VnToSummary.vue
index 305d65e02f3..853d2623056 100644
--- a/src/components/ui/VnToSummary.vue
+++ b/src/components/ui/VnToSummary.vue
@@ -26,6 +26,7 @@ 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>
diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js
index 6bcbfc84205..5c71132de3b 100644
--- a/test/cypress/integration/route/cmr/cmrList.spec.js
+++ b/test/cypress/integration/route/cmr/cmrList.spec.js
@@ -9,13 +9,12 @@ describe('Cmr list', () => {
             '.q-virtual-scroll__content > tr:last-child > :nth-child(1) > .q-checkbox',
         downloadBtn: '#subToolbar > .q-btn',
         viewCmr: 'tableAction-0',
-        summaryPopupBtn: '.header > :nth-child(2) > .q-btn__content > .q-icon',
-        summaryPopupHeader: '.summaryHeader > :nth-child(2)',
-        summaryHeader: '.summaryHeader',
-        descriptorId: '.q-item > .q-item__label',
-        descriptorTitle: '.q-item__label--header > .title > span',
-        summaryGoToSummaryBtn: '.header > .q-icon',
-        descriptorGoToSummaryBtn: '.descriptor > .header > a[href] > .q-btn',
+        descriptorOpenSummaryBtn: '.descriptor [data-cy="openSummaryBtn"]',
+        summaryTitle: '.summaryHeader',
+        descriptorId: '.descriptor .subtitle',
+        descriptorTitle: '.descriptor .title',
+        summaryGoToSummaryBtn: '.summaryHeader [data-cy="goToSummaryBtn"]',
+        descriptorGoToSummaryBtn: '.descriptor [data-cy="goToSummaryBtn"]',
         removeFilter: '.q-chip__icon--remove',
     };
 
@@ -54,36 +53,76 @@ describe('Cmr list', () => {
     describe('Ticket pop-ups', () => {
         it('Should redirect to the ticket summary from the ticket descriptor pop-up', () => {
             cy.get(selectors.ticket).click();
-            cy.get(selectors.descriptorId).should('contain', data.ticket);
+            cy.get(selectors.descriptorId)
+                .invoke('text')
+                .then((text) => {
+                    expect(text).to.include(data.ticket);
+                });
             cy.get(selectors.descriptorGoToSummaryBtn).click();
-            cy.get(selectors.summaryHeader).should('contain', data.client);
+            cy.get(selectors.summaryTitle)
+                .invoke('text')
+                .then((text) => {
+                    expect(text).to.include(data.client);
+                });
         });
 
         it('Should redirect to the ticket summary from summary pop-up from the ticket descriptor pop-up', () => {
             cy.get(selectors.ticket).click();
-            cy.get(selectors.descriptorId).should('contain', data.ticket);
-            cy.get(selectors.summaryPopupBtn).click();
-            cy.get(selectors.summaryPopupHeader).should('contain', data.client);
+            cy.get(selectors.descriptorId)
+                .invoke('text')
+                .then((text) => {
+                    expect(text).to.include(data.ticket);
+                });
+            cy.get(selectors.descriptorOpenSummaryBtn).click();
+            cy.get(selectors.summaryTitle)
+                .invoke('text')
+                .then((text) => {
+                    expect(text).to.include(data.client);
+                });
             cy.get(selectors.summaryGoToSummaryBtn).click();
-            cy.get(selectors.summaryHeader).should('contain', data.client);
+            cy.get(selectors.summaryTitle)
+                .invoke('text')
+                .then((text) => {
+                    expect(text).to.include(data.client);
+                });
         });
     });
 
     describe('Client pop-ups', () => {
         it('Should redirect to the client summary from the client descriptor pop-up', () => {
             cy.get(selectors.client).click();
-            cy.get(selectors.descriptorTitle).should('contain', data.client);
+            cy.get(selectors.descriptorTitle)
+                .invoke('text')
+                .then((text) => {
+                    expect(text).to.include(data.client);
+                });
             cy.get(selectors.descriptorGoToSummaryBtn).click();
-            cy.get(selectors.summaryHeader).should('contain', data.client);
+            cy.get(selectors.summaryTitle)
+                .invoke('text')
+                .then((text) => {
+                    expect(text).to.include(data.client);
+                });
         });
 
         it('Should redirect to the client summary from summary pop-up from the client descriptor pop-up', () => {
             cy.get(selectors.client).click();
-            cy.get(selectors.descriptorTitle).should('contain', data.client);
-            cy.get(selectors.summaryPopupBtn).click();
-            cy.get(selectors.summaryHeader).should('contain', data.client);
+            cy.get(selectors.descriptorTitle)
+                .invoke('text')
+                .then((text) => {
+                    expect(text).to.include(data.client);
+                });
+            cy.get(selectors.descriptorOpenSummaryBtn).click();
+            cy.get(selectors.summaryTitle)
+                .invoke('text')
+                .then((text) => {
+                    expect(text).to.include(data.client);
+                });
             cy.get(selectors.summaryGoToSummaryBtn).click();
-            cy.get(selectors.summaryHeader).should('contain', data.client);
+            cy.get(selectors.summaryTitle)
+                .invoke('text')
+                .then((text) => {
+                    expect(text).to.include(data.client);
+                });
         });
     });
 });

From 911097dae46d6ab1e287f9bee3a250d3a7a7659a Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 14 Mar 2025 07:25:58 +0100
Subject: [PATCH 17/47] test: refs #8621 remove unnecessary checkbox click in
 CMR list test

---
 test/cypress/integration/route/cmr/cmrList.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js
index 5c71132de3b..8d9299ce7d9 100644
--- a/test/cypress/integration/route/cmr/cmrList.spec.js
+++ b/test/cypress/integration/route/cmr/cmrList.spec.js
@@ -45,7 +45,6 @@ describe('Cmr list', () => {
         cy.window().then((win) => {
             cy.stub(win, 'open').as('windowOpen');
         });
-        cy.get(selectors.lastRowSelectCheckBox).click();
         cy.dataCy(selectors.viewCmr).last().click();
         cy.get('@windowOpen').should('be.calledWithMatch', '\/api\/Cmrs\/3');
     });

From 7e74ab58da553e24a46586a6fe86fde41bd71f85 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 17 Mar 2025 12:03:26 +0100
Subject: [PATCH 18/47] fix: refs #8621 intermittent test

---
 src/pages/Route/Cmr/CmrList.vue               |  2 +-
 .../integration/route/cmr/cmrList.spec.js     | 66 +++++--------------
 test/cypress/support/commands.js              |  8 +++
 3 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index d0683e48194..170f73bc051 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -28,7 +28,6 @@ const userParams = {
     shipped: null,
 };
 
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -175,6 +174,7 @@ function downloadPdfs() {
         :data-key
         url="Cmrs/filter"
         :columns="columns"
+        :order="['shipped DESC', 'cmrFk ASC']"
         :user-params="userParams"
         default-mode="table"
         v-model:selected="selectedRows"
diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js
index 8d9299ce7d9..b3561708d95 100644
--- a/test/cypress/integration/route/cmr/cmrList.spec.js
+++ b/test/cypress/integration/route/cmr/cmrList.spec.js
@@ -19,7 +19,7 @@ describe('Cmr list', () => {
     };
 
     const data = {
-        ticket: '2',
+        ticket: '1',
         client: 'Bruce Wayne',
     };
 
@@ -52,76 +52,40 @@ describe('Cmr list', () => {
     describe('Ticket pop-ups', () => {
         it('Should redirect to the ticket summary from the ticket descriptor pop-up', () => {
             cy.get(selectors.ticket).click();
-            cy.get(selectors.descriptorId)
-                .invoke('text')
-                .then((text) => {
-                    expect(text).to.include(data.ticket);
-                });
+            cy.containContent(selectors.descriptorId, data.ticket);
             cy.get(selectors.descriptorGoToSummaryBtn).click();
-            cy.get(selectors.summaryTitle)
-                .invoke('text')
-                .then((text) => {
-                    expect(text).to.include(data.client);
-                });
+            cy.url().should('include', '/ticket/1/summary');
+            cy.containContent(selectors.summaryTitle, data.client);
         });
 
         it('Should redirect to the ticket summary from summary pop-up from the ticket descriptor pop-up', () => {
             cy.get(selectors.ticket).click();
-            cy.get(selectors.descriptorId)
-                .invoke('text')
-                .then((text) => {
-                    expect(text).to.include(data.ticket);
-                });
+            cy.containContent(selectors.descriptorId, data.ticket);
             cy.get(selectors.descriptorOpenSummaryBtn).click();
-            cy.get(selectors.summaryTitle)
-                .invoke('text')
-                .then((text) => {
-                    expect(text).to.include(data.client);
-                });
+            cy.containContent(selectors.summaryTitle, data.client);
             cy.get(selectors.summaryGoToSummaryBtn).click();
-            cy.get(selectors.summaryTitle)
-                .invoke('text')
-                .then((text) => {
-                    expect(text).to.include(data.client);
-                });
+            cy.url().should('include', '/ticket/1/summary');
+            cy.containContent(selectors.summaryTitle, data.client);
         });
     });
 
     describe('Client pop-ups', () => {
         it('Should redirect to the client summary from the client descriptor pop-up', () => {
             cy.get(selectors.client).click();
-            cy.get(selectors.descriptorTitle)
-                .invoke('text')
-                .then((text) => {
-                    expect(text).to.include(data.client);
-                });
+            cy.containContent(selectors.descriptorTitle, data.client);
             cy.get(selectors.descriptorGoToSummaryBtn).click();
-            cy.get(selectors.summaryTitle)
-                .invoke('text')
-                .then((text) => {
-                    expect(text).to.include(data.client);
-                });
+            cy.url().should('include', '/customer/1101/summary');
+            cy.containContent(selectors.summaryTitle, data.client);
         });
 
         it('Should redirect to the client summary from summary pop-up from the client descriptor pop-up', () => {
             cy.get(selectors.client).click();
-            cy.get(selectors.descriptorTitle)
-                .invoke('text')
-                .then((text) => {
-                    expect(text).to.include(data.client);
-                });
+            cy.containContent(selectors.descriptorTitle, data.client);
             cy.get(selectors.descriptorOpenSummaryBtn).click();
-            cy.get(selectors.summaryTitle)
-                .invoke('text')
-                .then((text) => {
-                    expect(text).to.include(data.client);
-                });
+            cy.containContent(selectors.summaryTitle, data.client);
             cy.get(selectors.summaryGoToSummaryBtn).click();
-            cy.get(selectors.summaryTitle)
-                .invoke('text')
-                .then((text) => {
-                    expect(text).to.include(data.client);
-                });
+            cy.url().should('include', '/customer/1101/summary');
+            cy.containContent(selectors.summaryTitle, data.client);
         });
     });
 });
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 105d021addc..7d9f7634936 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -322,6 +322,14 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
     cy.get(selector).should('have.text', expectedValue);
 });
 
+Cypress.Commands.add('containContent', (selector, expectedValue) => {
+    cy.get(selector)
+        .invoke('text')
+        .then((text) => {
+            expect(text).to.include(expectedValue);
+        });
+});
+
 Cypress.Commands.add('openActionDescriptor', (opt) => {
     cy.openActionsDescriptor();
     const listItem = '[role="menu"] .q-list .q-item';

From 93b5be7628a8aa334e072ed8b8d7a4d1ed17a18f Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 17 Mar 2025 14:09:14 +0100
Subject: [PATCH 19/47] test: refs #8621 ensure elements are visible before
 interaction in cmrList tests

---
 .../integration/route/cmr/cmrList.spec.js     | 24 +++++++++----------
 test/cypress/support/commands.js              |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js
index b3561708d95..d33508e3a33 100644
--- a/test/cypress/integration/route/cmr/cmrList.spec.js
+++ b/test/cypress/integration/route/cmr/cmrList.spec.js
@@ -33,8 +33,8 @@ describe('Cmr list', () => {
 
     it('Should download selected cmr', () => {
         const downloadsFolder = Cypress.config('downloadsFolder');
-        cy.get(selectors.lastRowSelectCheckBox).click();
-        cy.get(selectors.downloadBtn).click();
+        cy.get(selectors.lastRowSelectCheckBox).should('be.visible').click();
+        cy.get(selectors.downloadBtn).should('be.visible').click();
         cy.wait(3000);
 
         const fileName = 'cmrs.zip';
@@ -51,19 +51,19 @@ describe('Cmr list', () => {
 
     describe('Ticket pop-ups', () => {
         it('Should redirect to the ticket summary from the ticket descriptor pop-up', () => {
-            cy.get(selectors.ticket).click();
+            cy.get(selectors.ticket).should('be.visible').click();
             cy.containContent(selectors.descriptorId, data.ticket);
-            cy.get(selectors.descriptorGoToSummaryBtn).click();
+            cy.get(selectors.descriptorGoToSummaryBtn).should('be.visible').click();
             cy.url().should('include', '/ticket/1/summary');
             cy.containContent(selectors.summaryTitle, data.client);
         });
 
         it('Should redirect to the ticket summary from summary pop-up from the ticket descriptor pop-up', () => {
-            cy.get(selectors.ticket).click();
+            cy.get(selectors.ticket).should('be.visible').click();
             cy.containContent(selectors.descriptorId, data.ticket);
-            cy.get(selectors.descriptorOpenSummaryBtn).click();
+            cy.get(selectors.descriptorOpenSummaryBtn).should('be.visible').click();
             cy.containContent(selectors.summaryTitle, data.client);
-            cy.get(selectors.summaryGoToSummaryBtn).click();
+            cy.get(selectors.summaryGoToSummaryBtn).should('be.visible').click();
             cy.url().should('include', '/ticket/1/summary');
             cy.containContent(selectors.summaryTitle, data.client);
         });
@@ -71,19 +71,19 @@ describe('Cmr list', () => {
 
     describe('Client pop-ups', () => {
         it('Should redirect to the client summary from the client descriptor pop-up', () => {
-            cy.get(selectors.client).click();
+            cy.get(selectors.client).should('be.visible').click();
             cy.containContent(selectors.descriptorTitle, data.client);
-            cy.get(selectors.descriptorGoToSummaryBtn).click();
+            cy.get(selectors.descriptorGoToSummaryBtn).should('be.visible').click();
             cy.url().should('include', '/customer/1101/summary');
             cy.containContent(selectors.summaryTitle, data.client);
         });
 
         it('Should redirect to the client summary from summary pop-up from the client descriptor pop-up', () => {
-            cy.get(selectors.client).click();
+            cy.get(selectors.client).should('be.visible').click();
             cy.containContent(selectors.descriptorTitle, data.client);
-            cy.get(selectors.descriptorOpenSummaryBtn).click();
+            cy.get(selectors.descriptorOpenSummaryBtn).should('be.visible').click();
             cy.containContent(selectors.summaryTitle, data.client);
-            cy.get(selectors.summaryGoToSummaryBtn).click();
+            cy.get(selectors.summaryGoToSummaryBtn).should('be.visible').click();
             cy.url().should('include', '/customer/1101/summary');
             cy.containContent(selectors.summaryTitle, data.client);
         });
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 90e7e08df1f..c8fccbd5d49 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -324,6 +324,7 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
 
 Cypress.Commands.add('containContent', (selector, expectedValue) => {
     cy.get(selector)
+        .should('be.visible')
         .invoke('text')
         .then((text) => {
             expect(text).to.include(expectedValue);

From 489fcda41057d4546ea3be5e06e1ddc5e5e09913 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Thu, 20 Mar 2025 12:59:33 +0100
Subject: [PATCH 20/47] fix: refs #8683 update Cypress parallel test execution
 to run with a single instance

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7f4144a5485..05ef34791be 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -126,7 +126,7 @@ pipeline {
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
 
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 2'
+                                sh 'sh test/cypress/cypressParallel.sh 1'
                             }
                         }
                     }

From 767511cec080356dceeef617a423c39a2fdbab22 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 21 Mar 2025 09:13:34 +0100
Subject: [PATCH 21/47] fix: refs #8326 e2e

---
 .../integration/invoiceIn/invoiceInList.spec.js  |  6 +++---
 .../integration/ticket/ticketDescriptor.spec.js  |  4 ++--
 .../integration/worker/workerSummary.spec.js     | 16 +++++++---------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index 44a61609e5f..6b5d28c706e 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -4,7 +4,7 @@ describe('InvoiceInList', () => {
     const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
     const firstId = `${firstRow} > td:nth-child(2) span`;
     const firstDetailBtn = `${firstRow} .q-btn:nth-child(1)`;
-    const summaryHeaders = '.summaryBody .header-link';
+    const summaryHeaders = (opt) => `.summaryBody > .${opt} > .q-pb-lg > .header-link`;
     const mockInvoiceRef = `createMockInvoice${Math.floor(Math.random() * 100)}`;
     const mock = {
         vnSupplierSelect: { val: 'farmer king', type: 'select' },
@@ -32,8 +32,8 @@ describe('InvoiceInList', () => {
 
     it('should open the details', () => {
         cy.get(firstDetailBtn).click();
-        cy.get(summaryHeaders).eq(1).contains('Basic data');
-        cy.get(summaryHeaders).eq(4).contains('Vat');
+        cy.get(summaryHeaders('max-width')).contains('Basic data');
+        cy.get(summaryHeaders('vat')).contains('Vat');
     });
 
     it('should create a new Invoice', () => {
diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 0ba2723a250..b5c95c4632c 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -3,10 +3,10 @@ describe('Ticket descriptor', () => {
     const listItem = '[role="menu"] .q-list .q-item';
     const toCloneOpt = 'To clone ticket';
     const setWeightOpt = 'Set weight';
-    const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
+    const warehouseValue = ':nth-child(1) > [data-cy="vnLvWarehouse"]';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;
-    const weightValue = '.summaryBody.row :nth-child(1) > :nth-child(9) > .value > span';
+    const weightValue = '[data-cy="vnLvWeight"]';
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
diff --git a/test/cypress/integration/worker/workerSummary.spec.js b/test/cypress/integration/worker/workerSummary.spec.js
index c50b2c9431e..6071c4cdf11 100644
--- a/test/cypress/integration/worker/workerSummary.spec.js
+++ b/test/cypress/integration/worker/workerSummary.spec.js
@@ -1,27 +1,25 @@
 describe('WorkerSummary', () => {
-    const departmentDescriptor = ':nth-child(1) > :nth-child(3) > .value > .link';
-    const roleDescriptor = ':nth-child(3) > :nth-child(4) > .value > .link';
+    const department = ':nth-child(1) > [data-cy="vnLvDepartment"] > .value';
+    const role = '[data-cy="vnLvRole"] > .value';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('/#/worker/19/summary');
     });
 
-    it('should load worker summary', () => {
+    it('should load worker summary and show the department', () => {
         cy.waitForElement('.summaryHeader');
         cy.get('.summaryHeader > div').should('have.text', '19 - salesboss salesboss');
-        cy.get(':nth-child(1) > :nth-child(2) > .value > span').should(
-            'have.text',
-            'salesBossNick',
-        );
+        cy.get(department).should('have.text', 'VENTAS');
     });
 
     it('should try descriptors', () => {
         cy.waitForElement('.summaryHeader');
-        cy.get(departmentDescriptor).click();
+        cy.get(department).click();
         cy.get('.descriptor').should('be.visible');
         cy.get('.q-item > .q-item__label').should('include.text', '43');
-        cy.get(roleDescriptor).click();
+        cy.get('.summaryBody').click();
+        cy.get(role).click();
         cy.get('.descriptor').should('be.visible');
         cy.get('.q-item > .q-item__label').should('include.text', '19');
     });

From 4ed1021a67c3c714807ee3fbf233d073e727769c Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 21 Mar 2025 13:19:43 +0100
Subject: [PATCH 22/47] feat: refs #8638 add AWB field to travel and entry
 forms, update translations and styles

---
 src/components/VnTable/VnTable.vue            |   2 +-
 src/components/common/VnDmsInput.vue          | 166 ++++++++++++++++++
 src/css/app.scss                              |   1 -
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 src/pages/Entry/Card/EntryBasicData.vue       |  47 +++--
 src/pages/Entry/Card/EntryBuys.vue            |  64 ++++++-
 src/pages/Entry/Card/EntryDescriptor.vue      |   4 +-
 src/pages/Entry/Card/EntrySummary.vue         |   6 +-
 src/pages/Entry/EntryStockBought.vue          |  15 +-
 src/pages/Entry/locale/es.yml                 |  11 +-
 .../InvoiceIn/Card/InvoiceInBasicData.vue     | 122 +------------
 src/pages/Travel/Card/TravelBasicData.vue     |   7 +-
 src/pages/Travel/Card/TravelFilter.js         |   1 +
 14 files changed, 290 insertions(+), 158 deletions(-)
 create mode 100644 src/components/common/VnDmsInput.vue

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6a547d95dbc..9ad032ee5c0 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -1154,7 +1154,7 @@ es:
 
 .grid-create {
     display: grid;
-    grid-template-columns: 1fr 1fr;
+    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
     max-width: 100%;
     grid-gap: 20px;
     margin: 0 auto;
diff --git a/src/components/common/VnDmsInput.vue b/src/components/common/VnDmsInput.vue
new file mode 100644
index 00000000000..25d625d5d8f
--- /dev/null
+++ b/src/components/common/VnDmsInput.vue
@@ -0,0 +1,166 @@
+<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>
diff --git a/src/css/app.scss b/src/css/app.scss
index 5befd150b0d..b299973d1d9 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -325,7 +325,6 @@ 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;
         }
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index c1286267c7e..594722b96d0 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -816,6 +816,7 @@ travel:
     search: Search travel
     searchInfo: You can search by travel id or name
     id: Id
+    awbFk: AWB
     travelList:
         tableVisibleColumns:
             ref: Reference
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 681781d1137..a0eb3835d4d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -899,6 +899,7 @@ travel:
     search: Buscar envío
     searchInfo: Buscar envío por id o nombre
     id: Id
+    awbFk: Guía aérea
     travelList:
         tableVisibleColumns:
             ref: Referencia
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 34e4a0f9ca3..f6d15a977d6 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -14,6 +14,8 @@ 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();
@@ -24,6 +26,7 @@ const user = state.getUser().fn();
 
 const companiesOptions = ref([]);
 const currenciesOptions = ref([]);
+const entryRef = ref({});
 
 onMounted(() => {
     checkEntryLock(route.params.id, user.id);
@@ -48,10 +51,11 @@ onMounted(() => {
         auto-load
     />
     <FormModel
-        :url-update="`Entries/${route.params.id}`"
+        ref="entryRef"
         model="Entry"
-        auto-load
+        :url-update="`Entries/${route.params.id}`"
         :clear-store-on-unmount="false"
+        auto-load
     >
         <template #form="{ data }">
             <VnRow class="q-py-sm">
@@ -67,11 +71,18 @@ onMounted(() => {
                 />
             </VnRow>
             <VnRow class="q-py-sm">
-                <VnInput v-model="data.reference" :label="t('globals.reference')" />
-                <VnInputNumber
-                    v-model="data.invoiceAmount"
-                    :label="t('entry.summary.invoiceAmount')"
-                    :positive="false"
+                <VnInput
+                    v-model="data.reference"
+                    :label="t('entry.list.tableVisibleColumns.reference')"
+                />
+                <VnSelect
+                    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">
@@ -113,7 +124,6 @@ onMounted(() => {
                     name="initialTemperature"
                     :label="t('entry.basicData.initialTemperature')"
                     :step="0.5"
-                    :decimal-places="2"
                     :positive="false"
                 />
                 <VnInputNumber
@@ -121,20 +131,21 @@ 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">
-                <QInput
+                <VnInputNumber
+                    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"
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 3990fde19c6..85da5cf1dba 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -18,6 +18,7 @@ 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: {
@@ -44,6 +45,8 @@ 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',
@@ -250,6 +253,7 @@ const columns = [
         component: 'number',
         attrs: {
             positive: false,
+            decimalPlaces: 3,
         },
         cellEvent: {
             'update:modelValue': async (value, oldValue, row) => {
@@ -497,6 +501,23 @@ 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);
@@ -571,6 +592,45 @@ onMounted(() => {
                     </QItem>
                 </QList>
             </QBtnDropdown>
+            <QBtn
+                icon="move_group"
+                color="primary"
+                :title="t('Transfer buys')"
+                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="transfer-buy-entry"
+                        />
+                    </QCardSection>
+                    <QCardSection>
+                        <QCardActions>
+                            <QBtn
+                                label="Cancel"
+                                flat
+                                color="primary"
+                                @click="dialogRef = false"
+                            />
+                            <QBtn
+                                label="Transfer"
+                                flat
+                                color="primary"
+                                @click="transferBuys(selectedRows, newEntryRef)"
+                            />
+                        </QCardActions>
+                    </QCardSection>
+                </QCard>
+            </QDialog>
         </QBtnGroup>
     </Teleport>
     <FetchData
@@ -620,7 +680,7 @@ onMounted(() => {
             },
             columnGridStyle: {
                 'max-width': '50%',
-                'margin-right': '30px',
+                'margin-right': '5%',
                 flex: 1,
             },
             previousStyle: {
@@ -816,6 +876,8 @@ 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 {
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 313ed3d728b..784f6e8a342 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -92,7 +92,7 @@ const getEntryRedirectionFilter = (entry) => {
 };
 
 function showEntryReport() {
-    openReport(`Entries/${entityId.value}/entry-order-pdf`);
+    openReport(`Entries/${entityId.value}/entry-order-pdf`, {}, true);
 }
 
 function showNotification(type, message) {
@@ -147,7 +147,7 @@ async function deleteEntry() {
 <template>
     <CardDescriptor
         :url="`Entries/${entityId}`"
-        :filter="entryFilter"
+        :user-filter="entryFilter"
         title="supplier.nickname"
         data-key="Entry"
         width="lg-width"
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 53967e66f07..37a28968c5b 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -84,7 +84,10 @@ onMounted(async () => {
                             :label="t('globals.company')"
                             :value="entry?.company?.code"
                         />
-                        <VnLv :label="t('globals.reference')" :value="entry?.reference" />
+                        <VnLv
+                            :label="t('entry.list.tableVisibleColumns.reference')"
+                            :value="entry?.reference"
+                        />
                         <VnLv
                             :label="t('entry.summary.invoiceNumber')"
                             :value="entry?.invoiceNumber"
@@ -159,6 +162,7 @@ onMounted(async () => {
                         />
                     </div>
                     <div class="card-content">
+                        <VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
                         <VnCheckbox
                             :label="t('entry.summary.travelDelivered')"
                             v-model="entry.travel.isDelivered"
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 5da51d5a652..6168f073708 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -162,8 +162,8 @@ async function beforeSave(data, getChanges) {
     }
 
     await Promise.all(patchPromises);
-    const filteredChanges = changes.filter((change) => change?.isReal !== false);
-    data.creates = filteredChanges;
+    data.creates = [];
+    return data;
 }
 </script>
 <template>
@@ -203,7 +203,7 @@ async function beforeSave(data, getChanges) {
             </VnRow>
         </template>
     </VnSubToolbar>
-    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
+    <QDialog v-model="travelDialogRef" :class="['vn-row', 'wrap']">
         <FormModelPopup
             :url-update="`Travels/${travel?.id}`"
             model="travel"
@@ -252,12 +252,15 @@ async function beforeSave(data, getChanges) {
                     </span>
                 </template>
                 <template #column-footer-reserve>
-                    <span>
+                    <span class="q-pr-xs">
                         {{ round(footer.reserve) }}
                     </span>
                 </template>
                 <template #column-footer-bought>
-                    <span :style="boughtStyle(footer?.bought, footer?.reserve)">
+                    <span
+                        :style="boughtStyle(footer?.bought, footer?.reserve)"
+                        class="q-pr-xs"
+                    >
                         {{ round(footer.bought) }}
                     </span>
                 </template>
@@ -275,7 +278,7 @@ async function beforeSave(data, getChanges) {
 }
 .column {
     min-width: 35%;
-    margin-top: 5%;
+    margin-top: 1%;
 }
 .text-negative {
     color: $negative !important;
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 10d863ea29d..2c80299bc22 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -25,7 +25,7 @@ entry:
             entryTypeDescription: Tipo entrada
             invoiceAmount: Importe
             dated: Fecha
-        inventoryEntry: Es inventario
+            inventoryEntry: Es inventario
     summary:
         commission: Comisión
         currency: Moneda
@@ -33,7 +33,8 @@ entry:
         invoiceAmount: Importe
         ordered: Pedida
         booked: Contabilizada
-        excludedFromAvailable: Excluido
+        excludedFromAvailable: Excluir del disponible
+        isConfirmed: Lista para etiquetar
         travelReference: Referencia
         travelAgency: Agencia
         travelShipped: F. envio
@@ -56,7 +57,7 @@ entry:
         observation: Observación
         commission: Comisión
         booked: Contabilizada
-        excludedFromAvailable: Excluido
+        excludedFromAvailable: Excluir del disponible
         initialTemperature: Ini °C
         finalTemperature: Fin °C
     buys:
@@ -119,9 +120,9 @@ entry:
         supplierName: Proveedor
 entryFilter:
     params:
-        isExcludedFromAvailable: Excluido
+        isExcludedFromAvailable: Excluir del disponible
         isOrdered: Pedida
-        isConfirmed: Confirmado
+        isConfirmed: Lista para etiquetar
         isReceived: Recibida
         isRaid: Raid
         landed: Fecha
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 905ddebb2b0..0995b75b933 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -2,24 +2,18 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
-import { downloadFile } from 'src/composables/downloadFile';
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnDms from 'src/components/common/VnDms.vue';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
-import axios from 'axios';
 import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
+import VnDmsInput from 'src/components/common/VnDmsInput.vue';
 
 const { t } = useI18n();
 
 const route = useRoute();
-const quasar = useQuasar();
-const editDownloadDisabled = ref(false);
 const userConfig = ref(null);
 const invoiceId = computed(() => +route.params.id);
 
@@ -37,24 +31,6 @@ const allowedContentTypes = ref([]);
 const sageWithholdings = ref([]);
 const documentDialogRef = ref({});
 const invoiceInRef = ref({});
-
-function deleteFile(dmsFk) {
-    quasar
-        .dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('globals.confirmDeletion'),
-                message: t('globals.confirmDeletionMessage'),
-            },
-        })
-        .onOk(async () => {
-            await axios.post(`dms/${dmsFk}/removeFile`);
-            invoiceInRef.value.formData.dmsFk = null;
-            invoiceInRef.value.formData.dms = undefined;
-            invoiceInRef.value.hasChanges = true;
-            invoiceInRef.value.save();
-        });
-}
 </script>
 <template>
     <FetchData
@@ -157,78 +133,7 @@ function deleteFile(dmsFk) {
                         </QItem>
                     </template>
                 </VnSelect>
-
-                <div class="row no-wrap">
-                    <VnInput
-                        :label="t('Document')"
-                        v-model="data.dmsFk"
-                        clearable
-                        clear-icon="close"
-                        class="full-width"
-                        :disable="true"
-                    />
-                    <div
-                        v-if="data.dmsFk"
-                        class="row no-wrap q-pa-xs q-gutter-x-xs"
-                        data-cy="dms-buttons"
-                    >
-                        <QBtn
-                            :class="{
-                                'no-pointer-events': editDownloadDisabled,
-                            }"
-                            :disable="editDownloadDisabled"
-                            icon="cloud_download"
-                            :title="t('Download file')"
-                            padding="xs"
-                            round
-                            @click="downloadFile(data.dmsFk)"
-                        />
-                        <QBtn
-                            :class="{
-                                'no-pointer-events': editDownloadDisabled,
-                            }"
-                            :disable="editDownloadDisabled"
-                            icon="edit"
-                            round
-                            padding="xs"
-                            @click="
-                                () => {
-                                    documentDialogRef.show = true;
-                                    documentDialogRef.dms = data.dms;
-                                }
-                            "
-                        >
-                            <QTooltip>{{ t('Edit document') }}</QTooltip>
-                        </QBtn>
-                        <QBtn
-                            :class="{
-                                'no-pointer-events': editDownloadDisabled,
-                            }"
-                            :disable="editDownloadDisabled"
-                            icon="delete"
-                            :title="t('Delete file')"
-                            padding="xs"
-                            round
-                            @click="deleteFile(data.dmsFk)"
-                        />
-                    </div>
-                    <QBtn
-                        v-else
-                        icon="add_circle"
-                        round
-                        v-shortcut="'+'"
-                        padding="xs"
-                        @click="
-                            () => {
-                                documentDialogRef.show = true;
-                                delete documentDialogRef.dms;
-                            }
-                        "
-                        data-cy="dms-create"
-                    >
-                        <QTooltip>{{ t('Create document') }}</QTooltip>
-                    </QBtn>
-                </div>
+                <VnDmsInput :data="data" :formRef="invoiceInRef" />
             </VnRow>
             <VnRow>
                 <VnSelect
@@ -264,29 +169,6 @@ function deleteFile(dmsFk) {
             </VnRow>
         </template>
     </FormModel>
-    <QDialog v-model="documentDialogRef.show">
-        <VnDms
-            model="dms"
-            default-dms-code="invoiceIn"
-            :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];
-                    invoiceInRef.formData.dmsFk = dmsData.id;
-                    invoiceInRef.formData.dms = dmsData;
-                    invoiceInRef.hasChanges = true;
-                    invoiceInRef.save();
-                }
-            "
-        />
-    </QDialog>
 </template>
 <style lang="scss" scoped>
 @media (max-width: $breakpoint-xs) {
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index b1adc812622..a6ef8ad195b 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -36,7 +36,7 @@ const warehousesOptionsIn = ref([]);
         auto-load
         :filter="{ where: { isDestiny: TRUE } }"
     />
-    <FormModel :url-update="`Travels/${route.params.id}`" model="Travel" auto-load>
+    <FormModel :url-update="`Travels/${route.params.id}`" model="Travel">
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.ref" :label="t('globals.reference')" />
@@ -57,8 +57,8 @@ const warehousesOptionsIn = ref([]);
             <VnRow>
                 <VnInputDate
                     v-model="data.availabled"
-                    :label="t('travel.summary.availabled')" 
-                    />
+                    :label="t('travel.summary.availabled')"
+                />
                 <VnInputTime
                     v-model="data.availabled"
                     :label="t('travel.summary.availabledHour')"
@@ -96,6 +96,7 @@ const warehousesOptionsIn = ref([]);
                         </QIcon>
                     </template>
                 </VnInput>
+                <VnInput v-model="data.awbFk" :label="t('travel.awbFk')" />
             </VnRow>
             <VnRow>
                 <QCheckbox v-model="data.isRaid" :label="t('travel.basicData.isRaid')" />
diff --git a/src/pages/Travel/Card/TravelFilter.js b/src/pages/Travel/Card/TravelFilter.js
index 05436834ffb..0799e449c4c 100644
--- a/src/pages/Travel/Card/TravelFilter.js
+++ b/src/pages/Travel/Card/TravelFilter.js
@@ -12,6 +12,7 @@ export default {
         'isRaid',
         'daysInForward',
         'availabled',
+        'awbFk',
     ],
     include: [
         {

From a39f648da045428d1eec2b371d9fc54c9b511fcb Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 21 Mar 2025 13:25:17 +0100
Subject: [PATCH 23/47] fix: refs #8638 update comment formatting in
 VnTable.vue

---
 src/components/VnTable/VnTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9ad032ee5c0..8f64dc8571a 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -895,7 +895,7 @@ const rowCtrlClickFunction = computed(() => {
                                         {{ row[splittedColumns.title.name] }}
                                     </span>
                                 </QCardSection>
-                                <!-- Fields -->
+                                <!-- Fields  -->
                                 <QCardSection
                                     class="q-pl-sm q-py-xs"
                                     :class="$props.cardClass"

From eb6046f3382b9500563fd3676669931247babb25 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 21 Mar 2025 13:28:22 +0100
Subject: [PATCH 24/47] fix: refs #8638 restore invoiceInBasicData

---
 .../InvoiceIn/Card/InvoiceInBasicData.vue     | 122 +++++++++++++++++-
 1 file changed, 120 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 0995b75b933..905ddebb2b0 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -2,18 +2,24 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+import { downloadFile } from 'src/composables/downloadFile';
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnDms from 'src/components/common/VnDms.vue';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import axios from 'axios';
 import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
-import VnDmsInput from 'src/components/common/VnDmsInput.vue';
 
 const { t } = useI18n();
 
 const route = useRoute();
+const quasar = useQuasar();
+const editDownloadDisabled = ref(false);
 const userConfig = ref(null);
 const invoiceId = computed(() => +route.params.id);
 
@@ -31,6 +37,24 @@ const allowedContentTypes = ref([]);
 const sageWithholdings = ref([]);
 const documentDialogRef = ref({});
 const invoiceInRef = ref({});
+
+function deleteFile(dmsFk) {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('globals.confirmDeletion'),
+                message: t('globals.confirmDeletionMessage'),
+            },
+        })
+        .onOk(async () => {
+            await axios.post(`dms/${dmsFk}/removeFile`);
+            invoiceInRef.value.formData.dmsFk = null;
+            invoiceInRef.value.formData.dms = undefined;
+            invoiceInRef.value.hasChanges = true;
+            invoiceInRef.value.save();
+        });
+}
 </script>
 <template>
     <FetchData
@@ -133,7 +157,78 @@ const invoiceInRef = ref({});
                         </QItem>
                     </template>
                 </VnSelect>
-                <VnDmsInput :data="data" :formRef="invoiceInRef" />
+
+                <div class="row no-wrap">
+                    <VnInput
+                        :label="t('Document')"
+                        v-model="data.dmsFk"
+                        clearable
+                        clear-icon="close"
+                        class="full-width"
+                        :disable="true"
+                    />
+                    <div
+                        v-if="data.dmsFk"
+                        class="row no-wrap q-pa-xs q-gutter-x-xs"
+                        data-cy="dms-buttons"
+                    >
+                        <QBtn
+                            :class="{
+                                'no-pointer-events': editDownloadDisabled,
+                            }"
+                            :disable="editDownloadDisabled"
+                            icon="cloud_download"
+                            :title="t('Download file')"
+                            padding="xs"
+                            round
+                            @click="downloadFile(data.dmsFk)"
+                        />
+                        <QBtn
+                            :class="{
+                                'no-pointer-events': editDownloadDisabled,
+                            }"
+                            :disable="editDownloadDisabled"
+                            icon="edit"
+                            round
+                            padding="xs"
+                            @click="
+                                () => {
+                                    documentDialogRef.show = true;
+                                    documentDialogRef.dms = data.dms;
+                                }
+                            "
+                        >
+                            <QTooltip>{{ t('Edit document') }}</QTooltip>
+                        </QBtn>
+                        <QBtn
+                            :class="{
+                                'no-pointer-events': editDownloadDisabled,
+                            }"
+                            :disable="editDownloadDisabled"
+                            icon="delete"
+                            :title="t('Delete file')"
+                            padding="xs"
+                            round
+                            @click="deleteFile(data.dmsFk)"
+                        />
+                    </div>
+                    <QBtn
+                        v-else
+                        icon="add_circle"
+                        round
+                        v-shortcut="'+'"
+                        padding="xs"
+                        @click="
+                            () => {
+                                documentDialogRef.show = true;
+                                delete documentDialogRef.dms;
+                            }
+                        "
+                        data-cy="dms-create"
+                    >
+                        <QTooltip>{{ t('Create document') }}</QTooltip>
+                    </QBtn>
+                </div>
             </VnRow>
             <VnRow>
                 <VnSelect
@@ -169,6 +264,29 @@ const invoiceInRef = ref({});
             </VnRow>
         </template>
     </FormModel>
+    <QDialog v-model="documentDialogRef.show">
+        <VnDms
+            model="dms"
+            default-dms-code="invoiceIn"
+            :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];
+                    invoiceInRef.formData.dmsFk = dmsData.id;
+                    invoiceInRef.formData.dms = dmsData;
+                    invoiceInRef.hasChanges = true;
+                    invoiceInRef.save();
+                }
+            "
+        />
+    </QDialog>
 </template>
 <style lang="scss" scoped>
 @media (max-width: $breakpoint-xs) {

From c5e1ebec82478f5298fa707f17bcaecdfeda46e2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 21 Mar 2025 13:51:05 +0100
Subject: [PATCH 25/47] fix: refs #8638 update null check for maxlength
 validation in VnInput.vue

---
 src/components/common/VnInput.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 9821992cbf2..474d681165c 100644
--- a/src/components/common/VnInput.vue
+++ b/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;

From bfa375bacd0a8c5efff6831e555d9a58dcfe7270 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 24 Mar 2025 08:22:13 +0100
Subject: [PATCH 26/47] feat: refs #8638 add data attributes for transfer buys
 functionality in EntryBuys.vue and corresponding tests

---
 src/pages/Entry/Card/EntryBuys.vue                         | 4 +++-
 test/cypress/integration/entry/entryCard/entryBuys.spec.js | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 85da5cf1dba..67f97e09d1b 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -596,6 +596,7 @@ onMounted(() => {
                 icon="move_group"
                 color="primary"
                 :title="t('Transfer buys')"
+                data-cy="transferBuys"
                 flat
                 @click="dialogRef = true"
                 :disable="!selectedRows.length"
@@ -610,7 +611,7 @@ onMounted(() => {
                             v-model="newEntryRef"
                             :label="t('Entry')"
                             type="number"
-                            data-cy="transfer-buy-entry"
+                            data-cy="entryDestinyInput"
                         />
                     </QCardSection>
                     <QCardSection>
@@ -623,6 +624,7 @@ onMounted(() => {
                             />
                             <QBtn
                                 label="Transfer"
+                                data-cy="transferBuysBtn"
                                 flat
                                 color="primary"
                                 @click="transferBuys(selectedRows, newEntryRef)"
diff --git a/test/cypress/integration/entry/entryCard/entryBuys.spec.js b/test/cypress/integration/entry/entryCard/entryBuys.spec.js
index f8f5e6b80da..b5e185a8e51 100644
--- a/test/cypress/integration/entry/entryCard/entryBuys.spec.js
+++ b/test/cypress/integration/entry/entryCard/entryBuys.spec.js
@@ -80,6 +80,11 @@ describe('EntryBuys', () => {
         checkColor('amount', COLORS.positive);
         cy.saveCard();
 
+        cy.get('tbody > tr [tabindex="0"][role="checkbox"]').click();
+        cy.dataCy('transferBuys').should('be.enabled').click();
+        cy.dataCy('entryDestinyInput').should('be.visible').type('100');
+        cy.dataCy('transferBuysBtn').click();
+
         cy.deleteEntry();
     });
 

From 933736e06be2d26328599954c7e2878c5cd574a4 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Mon, 24 Mar 2025 09:22:51 +0100
Subject: [PATCH 27/47] feat: refs #8237 changed observation type to be
 SalesPerson by default

---
 src/components/ui/VnNotes.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 6ce28254d34..a0621dc1dda 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -154,6 +154,7 @@ function fetchData([data]) {
                     filled
                     size="lg"
                     autogrow
+                    autofocus
                     @keyup.enter.stop="handleClick"
                     :required="isRequired"
                     clearable
@@ -189,7 +190,7 @@ function fetchData([data]) {
         :search-url="false"
         @on-fetch="
             newNote.text = '';
-            newNote.observationTypeFk = null;
+            newNote.observationTypeFk = 4;
         "
     >
         <template #body="{ rows }">

From 2bdebc1e0d2a0f14fab2f5f4fa2c43782a783de9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Mar 2025 09:27:35 +0100
Subject: [PATCH 28/47] test: waitSpinner() when load dialog

---
 test/cypress/integration/ticket/ticketList.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index a3d8fe90840..5613a5854d6 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -35,7 +35,7 @@ describe('TicketList', () => {
         cy.get('.summaryBody').should('exist');
     });
 
-    it.skip('filter client and create ticket', () => {
+    it('filter client and create ticket', () => {
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
         searchResults();
         cy.wait('@ticketSearchbar');
@@ -44,6 +44,7 @@ describe('TicketList', () => {
         cy.dataCy('Customer ID_input').type('1101{enter}');
 
         cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
+        cy.waitSpinner();
         cy.dataCy('Customer_select').should('have.value', 'Bruce Wayne');
         cy.dataCy('Address_select').click();
 

From 4caca33606660668202034b6c89c817c67ed2c90 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 24 Mar 2025 10:44:01 +0100
Subject: [PATCH 29/47] fix: refs #8581 update invoiceInSerial test to
 correctly compare totals after filtering

---
 .../invoiceIn/invoiceInSerial.spec.js            | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInSerial.spec.js b/test/cypress/integration/invoiceIn/invoiceInSerial.spec.js
index faad22f1254..3750f8f06dc 100644
--- a/test/cypress/integration/invoiceIn/invoiceInSerial.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInSerial.spec.js
@@ -10,14 +10,16 @@ describe('InvoiceInSerial', () => {
     });
 
     it('should filter by last days ', () => {
-        let before;
         cy.dataCy('vnTableCell_total')
             .invoke('text')
-            .then((total) => (before = +total));
-
-        cy.dataCy('Last days_input').type('{selectall}1{enter}');
-        cy.dataCy('vnTableCell_total')
-            .invoke('text')
-            .then((total) => expect(+total).to.be.lessThan(before));
+            .then((before) => {
+                cy.dataCy('Last days_input')
+                    .type('{selectall}1{enter}')
+                    .then(() => {
+                        cy.dataCy('vnTableCell_total')
+                            .invoke('text')
+                            .then((after) => expect(+after).to.be.lessThan(+before));
+                    });
+            });
     });
 });

From 53f6f5278f154e6e7ccb55492be84230efcbf6ad Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 24 Mar 2025 12:08:24 +0100
Subject: [PATCH 30/47] refactor: refs #8326 requested changes

---
 src/components/ui/CardSummary.vue     |  23 +++++
 src/css/app.scss                      |  23 -----
 src/pages/Route/Card/RouteSummary.vue | 141 +++++++++++++-------------
 src/pages/Zone/Card/ZoneSummary.vue   |  18 +++-
 4 files changed, 111 insertions(+), 94 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 05bfed9985a..2ec6bea78db 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -201,6 +201,29 @@ async function fetch() {
         }
     }
 }
+
+.vn-card-group {
+    display: flex;
+    flex-direction: column;
+}
+
+.vn-card-content {
+    display: flex;
+    flex-direction: column;
+    text-overflow: ellipsis;
+    > div {
+        max-height: 70px;
+    }
+}
+
+@media (min-width: 1010px) {
+    .vn-card-group {
+        flex-direction: row;
+    }
+    .vn-card-content {
+        flex: 1;
+    }
+}
 </style>
 <style lang="scss" scoped>
 .summaryHeader .vn-label-value {
diff --git a/src/css/app.scss b/src/css/app.scss
index 6a0ce8fb047..5befd150b0d 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -341,26 +341,3 @@ input::-webkit-inner-spin-button {
 .containerShrinked {
     width: 70%;
 }
-
-.vn-card-group {
-    display: flex;
-    flex-direction: column;
-}
-
-.vn-card-content {
-    display: flex;
-    flex-direction: column;
-    text-overflow: ellipsis;
-    > div {
-        max-height: 80px;
-    }
-}
-
-@media (min-width: 1010px) {
-    .vn-card-group {
-        flex-direction: row;
-    }
-    .vn-card-content {
-        flex: 1;
-    }
-}
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index f6862809527..86bdbb5c5be 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -138,74 +138,79 @@ const ticketColumns = ref([
                         :url="`#/${route.meta.moduleName.toLowerCase()}/${entityId}/basic-data`"
                         :text="t('globals.pageTitles.basicData')"
                     />
-                </QCard>
-
-                <QCard class="vn-one">
-                    <VnLv
-                        :label="t('route.summary.date')"
-                        :value="toDate(entity?.route.dated)"
-                    />
-                    <VnLv
-                        :label="t('route.summary.agency')"
-                        :value="entity?.route?.agencyMode?.name"
-                    />
-                    <VnLv
-                        :label="t('route.summary.vehicle')"
-                        :value="entity.route?.vehicle?.numberPlate"
-                    />
-                    <VnLv :label="t('route.summary.driver')">
-                        <template #value>
-                            <span class="link">
-                                {{ dashIfEmpty(entity?.route?.worker?.user?.name) }}
-                                <WorkerDescriptorProxy :id="entity.route?.workerFk" />
-                            </span>
-                        </template>
-                    </VnLv>
-                    <VnLv
-                        :label="t('route.summary.cost')"
-                        :value="toCurrency(entity.route?.cost)"
-                    />
-                    <VnLv
-                        :label="t('route.summary.volume')"
-                        :value="`${dashIfEmpty(entity?.route?.m3)} / ${dashIfEmpty(
-                            entity?.route?.vehicle?.m3,
-                        )} m³`"
-                    />
-                    <VnLv
-                        :label="t('route.summary.packages')"
-                        :value="getTotalPackages(entity.tickets)"
-                    />
-                    <QCheckbox
-                        :label="
-                            entity.route.isOk
-                                ? t('route.summary.closed')
-                                : t('route.summary.open')
-                        "
-                        v-model="entity.route.isOk"
-                        :disable="true"
-                    />
-                </QCard>
-                <QCard class="vn-one">
-                    <VnLv
-                        :label="t('route.summary.started')"
-                        :value="toHour(entity?.route.started)"
-                    />
-                    <VnLv
-                        :label="t('route.summary.finished')"
-                        :value="toHour(entity?.route.finished)"
-                    />
-                    <VnLv
-                        :label="t('route.summary.kmStart')"
-                        :value="dashIfEmpty(entity?.route?.kmStart)"
-                    />
-                    <VnLv
-                        :label="t('route.summary.kmEnd')"
-                        :value="dashIfEmpty(entity?.route?.kmEnd)"
-                    />
-                    <VnLv
-                        :label="t('globals.description')"
-                        :value="dashIfEmpty(entity?.route?.description)"
-                    />
+                    <div class="vn-card-group">
+                        <div class="vn-card-content">
+                            <VnLv
+                                :label="t('route.summary.date')"
+                                :value="toDate(entity?.route.dated)"
+                            />
+                            <VnLv
+                                :label="t('route.summary.agency')"
+                                :value="entity?.route?.agencyMode?.name"
+                            />
+                            <VnLv
+                                :label="t('route.summary.vehicle')"
+                                :value="entity.route?.vehicle?.numberPlate"
+                            />
+                            <VnLv :label="t('route.summary.driver')">
+                                <template #value>
+                                    <span class="link">
+                                        {{
+                                            dashIfEmpty(entity?.route?.worker?.user?.name)
+                                        }}
+                                        <WorkerDescriptorProxy
+                                            :id="entity.route?.workerFk"
+                                        />
+                                    </span>
+                                </template>
+                            </VnLv>
+                            <VnLv
+                                :label="t('route.summary.cost')"
+                                :value="toCurrency(entity.route?.cost)"
+                            />
+                            <VnLv
+                                :label="t('route.summary.volume')"
+                                :value="`${dashIfEmpty(entity?.route?.m3)} / ${dashIfEmpty(
+                                    entity?.route?.vehicle?.m3,
+                                )} m³`"
+                            />
+                            <VnLv
+                                :label="t('route.summary.packages')"
+                                :value="getTotalPackages(entity.tickets)"
+                            />
+                            <QCheckbox
+                                :label="
+                                    entity.route.isOk
+                                        ? t('route.summary.closed')
+                                        : t('route.summary.open')
+                                "
+                                v-model="entity.route.isOk"
+                                :disable="true"
+                            />
+                        </div>
+                        <div class="vn-card-content">
+                            <VnLv
+                                :label="t('route.summary.started')"
+                                :value="toHour(entity?.route.started)"
+                            />
+                            <VnLv
+                                :label="t('route.summary.finished')"
+                                :value="toHour(entity?.route.finished)"
+                            />
+                            <VnLv
+                                :label="t('route.summary.kmStart')"
+                                :value="dashIfEmpty(entity?.route?.kmStart)"
+                            />
+                            <VnLv
+                                :label="t('route.summary.kmEnd')"
+                                :value="dashIfEmpty(entity?.route?.kmEnd)"
+                            />
+                            <VnLv
+                                :label="t('globals.description')"
+                                :value="dashIfEmpty(entity?.route?.description)"
+                            />
+                        </div>
+                    </div>
                 </QCard>
                 <QCard class="vn-max">
                     <VnTitle
diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index cd5a80ba258..61475b1f6c5 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -75,13 +75,13 @@ onMounted(async () => {
         <template #body="{ entity: zone }">
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
-                <div class="vn-card-group">
-                    <div class="vn-card-content">
+                <div class="card-group">
+                    <div class="card-content">
                         <VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
                         <VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
                         <VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
                     </div>
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv
                             :label="t('summary.closeHour')"
                             :value="toTimeFormat(zone.hour)"
@@ -109,3 +109,15 @@ onMounted(async () => {
         </template>
     </CardSummary>
 </template>
+
+<style lang="scss" scoped>
+.card-group {
+    display: flex;
+    flex-direction: column;
+}
+
+.card-content {
+    display: flex;
+    flex-direction: column;
+}
+</style>

From 798371682c6eede4de615913b50227f33b8db78e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 24 Mar 2025 12:39:40 +0100
Subject: [PATCH 31/47] feat: refs #6919 enhance filter in AccountSummary
 component to include entity ID

---
 src/pages/Account/Card/AccountSummary.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue
index f7a16e8c355..0b108807e11 100644
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@@ -17,7 +17,7 @@ const entityId = computed(() => $props.id || route.params.id);
         data-key="Account"
         ref="AccountSummary"
         url="VnUsers/preview"
-        :filter="filter"
+        :filter="{ ...filter, where: { id: entityId } }"
     >
         <template #header="{ entity }">{{ entity.id }} - {{ entity.nickname }}</template>
         <template #menu>

From e1ef6f87f3f4c334d3e7f65cb6fc8617bf67dc24 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 24 Mar 2025 14:01:43 +0100
Subject: [PATCH 32/47] feat: implement onBeforeSave function to handle form
 data updates

---
 src/pages/Claim/Card/ClaimBasicData.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 43941d1dcf3..7e7d42ae83f 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -2,6 +2,7 @@
 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';
@@ -9,12 +10,18 @@ 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
@@ -27,6 +34,7 @@ const workersOptions = ref([]);
     <FormModel
         model="Claim"
         :url-update="`Claims/updateClaim/${route.params.id}`"
+        :mapper="onBeforeSave"
         auto-load
     >
         <template #form="{ data, validate }">

From 293d51b7413b70e2f95bfe103b2059b86bf62b18 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Mon, 24 Mar 2025 14:06:38 +0100
Subject: [PATCH 33/47] feat: refs #8237 #8237 modified fetch to find default
 select value by "code"

---
 src/components/ui/VnNotes.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index a0621dc1dda..b7e6ccbecd5 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -40,6 +40,11 @@ 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) {
@@ -111,14 +116,22 @@ 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'] }"
+        :filter="{ fields: ['id', 'description', 'code'] }"
         auto-load
-        @on-fetch="(data) => (observationTypes = data)"
+        @on-fetch="handleObservationTypes"
     />
     <FetchData
         v-if="justInput"
@@ -190,7 +203,6 @@ function fetchData([data]) {
         :search-url="false"
         @on-fetch="
             newNote.text = '';
-            newNote.observationTypeFk = 4;
         "
     >
         <template #body="{ rows }">

From 2a560e9548dffc848dfce5594c5490f328be00aa Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Mon, 24 Mar 2025 14:07:02 +0100
Subject: [PATCH 34/47] Merge branch '8237-defaultObservationType' of https:
 refs #8237//gitea.verdnatura.es/verdnatura/salix-front into
 8237-defaultObservationType

---
 src/components/ItemsFilterPanel.vue           |  10 +-
 src/components/VnTable/VnTable.vue            |   1 +
 src/components/common/VnCard.vue              |  26 +-
 src/components/common/VnLog.vue               |   9 +-
 .../common/__tests__/VnDmsList.spec.js        |  46 +-
 src/components/ui/CardDescriptor.vue          | 383 +----------------
 src/components/ui/EntityDescriptor.vue        |  78 ++++
 src/components/ui/VnDescriptor.vue            | 318 ++++++++++++++
 .../__tests__/downloadFile.spec.js            |  11 +-
 src/composables/downloadFile.js               |  20 +-
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 src/pages/Account/AccountFilter.vue           |   7 +-
 src/pages/Account/Acls/AclFilter.vue          |  14 +-
 .../Account/Alias/Card/AliasDescriptor.vue    |   6 +-
 src/pages/Account/Card/AccountDescriptor.vue  |   6 +-
 src/pages/Account/Role/AccountRolesFilter.vue |   4 +-
 .../Account/Role/Card/RoleDescriptor.vue      |   6 +-
 src/pages/Claim/Card/ClaimDescriptor.vue      |   6 +-
 src/pages/Claim/ClaimFilter.vue               |  25 +-
 .../Customer/Card/CustomerDescriptor.vue      |   6 +-
 src/pages/Customer/CustomerFilter.vue         |  27 +-
 .../Defaulter/CustomerDefaulterFilter.vue     |  22 +-
 .../Payments/CustomerPaymentsFilter.vue       |  18 +-
 src/pages/Entry/Card/EntryDescriptor.vue      |   6 +-
 src/pages/Entry/EntryFilter.vue               |  34 +-
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    |   6 +-
 src/pages/InvoiceIn/InvoiceInFilter.vue       |  31 +-
 .../Serial/InvoiceInSerialFilter.vue          |   6 +-
 .../InvoiceOut/Card/InvoiceOutDescriptor.vue  |   6 +-
 src/pages/InvoiceOut/InvoiceOutFilter.vue     |  23 +-
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue |  22 +-
 .../InvoiceOutNegativeBasesFilter.vue         |  22 +-
 src/pages/Item/Card/ItemDescriptor.vue        |   6 +-
 src/pages/Item/ItemFixedPriceFilter.vue       |  11 +-
 src/pages/Item/ItemListFilter.vue             |  31 +-
 src/pages/Item/ItemRequestFilter.vue          |  36 +-
 .../Item/ItemType/Card/ItemTypeDescriptor.vue |   6 +-
 .../Monitor/Ticket/MonitorTicketFilter.vue    |  45 +-
 .../Order/Card/CatalogFilterValueDialog.vue   |  10 +-
 src/pages/Order/Card/OrderCard.vue            |   4 +-
 src/pages/Order/Card/OrderCatalogFilter.vue   |  12 +-
 src/pages/Order/Card/OrderDescriptor.vue      |  18 +-
 src/pages/Order/Card/OrderDescriptorProxy.vue |   7 +-
 src/pages/Order/Card/OrderFilter.vue          |  25 +-
 .../Route/Agency/Card/AgencyDescriptor.vue    |   6 +-
 .../Route/Card/RouteAutonomousFilter.vue      |  35 +-
 src/pages/Route/Card/RouteDescriptor.vue      |   7 +-
 src/pages/Route/Card/RouteFilter.vue          |  22 +-
 src/pages/Route/Roadmap/RoadmapDescriptor.vue |   6 +-
 src/pages/Route/Roadmap/RoadmapFilter.vue     |  17 +-
 .../Route/Vehicle/Card/VehicleDescriptor.vue  |   6 +-
 .../Shelving/Card/ShelvingDescriptor.vue      |   6 +-
 src/pages/Shelving/Card/ShelvingFilter.vue    |   5 +-
 .../Parking/Card/ParkingDescriptor.vue        |   6 +-
 src/pages/Shelving/Parking/ParkingFilter.vue  |   9 +-
 .../Supplier/Card/SupplierBalanceFilter.vue   |   8 +-
 .../Card/SupplierConsumptionFilter.vue        |  25 +-
 .../Supplier/Card/SupplierDescriptor.vue      |   6 +-
 src/pages/Ticket/Card/TicketDescriptor.vue    |   6 +-
 .../Ticket/Negative/TicketLackFilter.vue      |  14 +-
 src/pages/Ticket/TicketAdvanceFilter.vue      |  18 +-
 src/pages/Ticket/TicketFilter.vue             |  50 +--
 src/pages/Ticket/TicketFutureFilter.vue       |  23 +-
 src/pages/Travel/Card/TravelDescriptor.vue    |   6 +-
 src/pages/Travel/ExtraCommunityFilter.vue     |  32 +-
 src/pages/Travel/TravelFilter.vue             |  34 +-
 .../Worker/Card/WorkerCalendarFilter.vue      |   8 +-
 src/pages/Worker/Card/WorkerDescriptor.vue    |   6 +-
 src/pages/Worker/Card/WorkerPda.vue           | 401 +++++++++++-------
 .../Department/Card/DepartmentDescriptor.vue  |   6 +-
 src/pages/Worker/WorkerFilter.vue             |  31 +-
 src/pages/Zone/Card/ZoneDescriptor.vue        |   6 +-
 src/pages/Zone/ZoneDeliveryPanel.vue          |   7 +-
 .../integration/vnComponent/VnLog.spec.js     |   2 +-
 .../integration/worker/workerPda.spec.js      |  83 +++-
 test/cypress/support/commands.js              |  10 +-
 77 files changed, 1178 insertions(+), 1147 deletions(-)
 create mode 100644 src/components/ui/EntityDescriptor.vue
 create mode 100644 src/components/ui/VnDescriptor.vue

diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index f73753a6bcc..0f1e3f1ebed 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -198,8 +198,7 @@ const setCategoryList = (data) => {
                         v-model="params.typeFk"
                         :options="itemTypesOptions"
                         dense
-                        outlined
-                        rounded
+                        filled
                         use-input
                         :disable="!selectedCategoryFk"
                         @update:model-value="
@@ -235,8 +234,7 @@ const setCategoryList = (data) => {
                         v-model="value.selectedTag"
                         :options="tagOptions"
                         dense
-                        outlined
-                        rounded
+                        filled
                         :emit-value="false"
                         use-input
                         :is-clearable="false"
@@ -252,8 +250,7 @@ const setCategoryList = (data) => {
                         option-value="value"
                         option-label="value"
                         dense
-                        outlined
-                        rounded
+                        filled
                         emit-value
                         use-input
                         :disable="!value"
@@ -265,7 +262,6 @@ const setCategoryList = (data) => {
                         v-model="value.value"
                         :label="t('components.itemsFilterPanel.value')"
                         :disable="!value"
-                        is-outlined
                         :is-clearable="false"
                         @keyup.enter="applyTags(params, searchFn)"
                     />
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index c6421719833..e8dd1b5263d 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -633,6 +633,7 @@ const rowCtrlClickFunction = computed(() => {
                 :data-key="$attrs['data-key']"
                 :columns="columns"
                 :redirect="redirect"
+                v-bind="$attrs?.['table-filter']"
             >
                 <template
                     v-for="(_, slotName) in $slots"
diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 620dc2ad2cb..21cdc9df5aa 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -1,12 +1,15 @@
 <script setup>
-import { onBeforeMount } from 'vue';
-import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
+import { onBeforeMount, computed } from 'vue';
+import { useRoute, 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 },
@@ -16,10 +19,13 @@ 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, {
     url: props.url,
     userFilter: props.filter,
@@ -35,7 +41,7 @@ onBeforeMount(async () => {
 
     const route = router.currentRoute.value;
     try {
-        await fetch(route.params.id);
+        await fetch(entityId.value);
     } catch {
         const { matched: matches } = route;
         const { path } = matches.at(-1);
@@ -51,8 +57,7 @@ onBeforeRouteUpdate(async (to, from) => {
             router.push({ name, params: to.params });
         }
     }
-    const id = to.params.id;
-    if (id !== from.params.id) await fetch(id, true);
+    if (entityId.value !== to.params.id) await fetch(to.params.id, true);
 });
 
 async function fetch(id, append = false) {
@@ -61,14 +66,17 @@ async function fetch(id, append = false) {
     else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${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);
 }
 </script>
 <template>
-    <VnSubToolbar />
-    <div :class="[useCardSize(), $attrs.class]">
-        <RouterView :key="$route.path" />
-    </div>
+    <template v-if="visual">
+        <VnSubToolbar />
+        <div :class="[useCardSize(), $attrs.class]">
+            <RouterView :key="$route.path" />
+        </div>
+    </template>
 </template>
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 136dbf2a438..a05da264be5 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -708,6 +708,7 @@ watch(
                         v-model="searchInput"
                         class="full-width"
                         clearable
+                        filled
                         clear-icon="close"
                         @keyup.enter="() => selectFilter('search')"
                         @focusout="() => selectFilter('search')"
@@ -727,6 +728,7 @@ watch(
                         v-model="selectedFilters.changedModel"
                         option-label="locale"
                         option-value="value"
+                        filled
                         :options="actions"
                         @update:model-value="selectFilter('action')"
                         hide-selected
@@ -752,8 +754,7 @@ watch(
                             class="full-width"
                             :label="t('globals.user')"
                             v-model="userSelect"
-                            option-label="name"
-                            option-value="id"
+                            filled
                             :url="`${model}Logs/${route.params.id}/editors`"
                             :fields="['id', 'nickname', 'name', 'image']"
                             sort-by="nickname"
@@ -782,6 +783,7 @@ watch(
                         :label="t('globals.changes')"
                         v-model="changeInput"
                         class="full-width"
+                        filled
                         clearable
                         clear-icon="close"
                         @keyup.enter="selectFilter('change')"
@@ -818,6 +820,7 @@ watch(
                         @clear="selectFilter('date', 'to')"
                         v-model="dateFrom"
                         clearable
+                        filled
                         clear-icon="close"
                     />
                 </QItem>
@@ -830,6 +833,7 @@ watch(
                         @clear="selectFilter('date', 'from')"
                         v-model="dateTo"
                         clearable
+                        filled
                         clear-icon="close"
                     />
                 </QItem>
@@ -843,6 +847,7 @@ watch(
             dense
             flat
             minimal
+            filled
             @update:model-value="
                 (value) => {
                     dateFromDialog = false;
diff --git a/src/components/common/__tests__/VnDmsList.spec.js b/src/components/common/__tests__/VnDmsList.spec.js
index 9649943a237..22101239e44 100644
--- a/src/components/common/__tests__/VnDmsList.spec.js
+++ b/src/components/common/__tests__/VnDmsList.spec.js
@@ -4,12 +4,15 @@ import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe('VnDmsList', () => {
     let vm;
-    const dms = { 
-        userFk: 1, 
-        name: 'DMS 1' 
+    const dms = {
+        userFk: 1,
+        name: 'DMS 1',
     };
-    
+
     beforeAll(() => {
+        vi.mock('src/composables/getUrl', () => ({
+            getUrl: vi.fn().mockResolvedValue(''),
+        }));
         vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         vm = createWrapper(VnDmsList, {
             props: {
@@ -18,8 +21,8 @@ describe('VnDmsList', () => {
                 filter: 'wd.workerFk',
                 updateModel: 'Workers',
                 deleteModel: 'WorkerDms',
-                downloadModel: 'WorkerDms' 
-            }
+                downloadModel: 'WorkerDms',
+            },
         }).vm;
     });
 
@@ -29,46 +32,45 @@ describe('VnDmsList', () => {
 
     describe('setData()', () => {
         const data = [
-            { 
-                userFk: 1, 
+            {
+                userFk: 1,
                 name: 'Jessica',
                 lastName: 'Jones',
                 file: '4.jpg',
-                created: '2021-07-28 21:00:00'
+                created: '2021-07-28 21:00:00',
             },
-            { 
-                userFk: 2, 
+            {
+                userFk: 2,
                 name: 'Bruce',
                 lastName: 'Banner',
                 created: '2022-07-28 21:00:00',
                 dms: {
-                    userFk: 2, 
+                    userFk: 2,
                     name: 'Bruce',
                     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);
             expect(parsedDms).toEqual(resultDms);
@@ -76,12 +78,12 @@ 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);
             expect(vm.formDialog.show).toEqual(true);
             expect(vm.formDialog.dms).toEqual(resultDms);
         });
     });
-});	
\ No newline at end of file
+});
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index b7d03127cc3..5f9a89d648f 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,375 +1,38 @@
 <script setup>
-import { onBeforeMount, watch, computed, ref } from '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';
+import { ref } from 'vue';
+import VnDescriptor from './VnDescriptor.vue';
 
 const $props = defineProps({
-    url: {
-        type: String,
-        default: '',
-    },
-    filter: {
-        type: Object,
-        default: null,
-    },
-    title: {
-        type: String,
-        default: '',
-    },
-    subtitle: {
+    id: {
         type: Number,
-        default: null,
+        default: false,
     },
-    dataKey: {
-        type: String,
-        default: null,
-    },
-    summary: {
+    card: {
         type: Object,
         default: null,
     },
-    width: {
-        type: String,
-        default: 'md-width',
-    },
-    toModule: {
-        type: String,
-        default: null,
-    },
 });
 
-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 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;
-    }
-});
+const entity = ref();
 </script>
 
 <template>
-    <div class="descriptor" data-cy="cardDescriptor">
-        <template v-if="entity && !isLoading">
-            <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, $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>
-                </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)"
-                                :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_title`"
-                            >
-                                {{ getValueFromPath(title) ?? $props.title }}
-                            </span>
-                            <slot v-else name="description" :entity="entity">
-                                <span
-                                    :title="entity.name"
-                                    :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_description`"
-                                    v-text="entity.name"
-                                />
-                            </slot>
-                        </div>
-                    </QItemLabel>
-                    <QItem>
-                        <QItemLabel
-                            class="subtitle"
-                            :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_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'] ?? 'cardDescriptor'}_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 || 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: ':';
+    <component
+        :is="card"
+        :id
+        :visual="false"
+        v-bind="$attrs"
+        @on-fetch="
+            (data) => {
+                entity = data;
+                emit('onFetch', data);
             }
-        }
-        .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>
+        "
+    />
+    <VnDescriptor v-model="entity" v-bind="$attrs">
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+        </template>
+    </VnDescriptor>
+</template>
diff --git a/src/components/ui/EntityDescriptor.vue b/src/components/ui/EntityDescriptor.vue
new file mode 100644
index 00000000000..a5dced55130
--- /dev/null
+++ b/src/components/ui/EntityDescriptor.vue
@@ -0,0 +1,78 @@
+<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>
diff --git a/src/components/ui/VnDescriptor.vue b/src/components/ui/VnDescriptor.vue
new file mode 100644
index 00000000000..47da98d74a2
--- /dev/null
+++ b/src/components/ui/VnDescriptor.vue
@@ -0,0 +1,318 @@
+<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: String,
+        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: ':';
+            }
+        }
+        .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>
diff --git a/src/composables/__tests__/downloadFile.spec.js b/src/composables/__tests__/downloadFile.spec.js
index f53b56b3e3d..f83a973b028 100644
--- a/src/composables/__tests__/downloadFile.spec.js
+++ b/src/composables/__tests__/downloadFile.spec.js
@@ -6,10 +6,12 @@ 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');
     });
@@ -22,15 +24,14 @@ describe('downloadFile', () => {
             headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
         };
         vi.spyOn(axios, 'get').mockImplementation((url) => {
-            if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
-            else if (url.includes('downloadFile')) return Promise.resolve(res);
+            if (url.includes('downloadFile')) return Promise.resolve(res);
         });
 
         await downloadFile(1);
 
         expect(axios.get).toHaveBeenCalledWith(
-            `${baseUrl}/api/dms/1/downloadFile?access_token=${token}`,
-            { responseType: 'blob' }
+            `/api/dms/1/downloadFile?access_token=${token}`,
+            { responseType: 'blob' },
         );
     });
 });
diff --git a/src/composables/downloadFile.js b/src/composables/downloadFile.js
index 4588265a2fd..302836e09e9 100644
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@@ -5,20 +5,30 @@ import { exportFile } from 'quasar';
 
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
+const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
-    const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
     const response = await axios.get(
         url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
         { responseType: 'blob' }
     );
 
+    download(response);
+}
+
+export async function downloadDocuware(url, params) {
+    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 != null && matches[1]
-            ? matches[1].replace(/['"]/g, '')
-            : 'downloaded-file';
+    const filename = matches?.[1] ? matches[1].replace(/['"]/g, '') : 'downloaded-file';
 
     exportFile(filename, response.data);
 }
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 6be11b5ed54..7374cda68d5 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -646,6 +646,7 @@ worker:
         model: Model
         serialNumber: Serial number
         removePDA: Deallocate PDA
+        sendToTablet: Send to tablet
     create:
         lastName: Last name
         birth: Birth
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 55e5abd95e3..f0ce53e37b9 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -731,6 +731,7 @@ worker:
         model: Modelo
         serialNumber: Número de serie
         removePDA: Desasignar PDA
+        sendToTablet: Enviar a la tablet
     create:
         lastName: Apellido
         birth: Fecha de nacimiento
diff --git a/src/pages/Account/AccountFilter.vue b/src/pages/Account/AccountFilter.vue
index 50c3ee1acf1..732e92f771a 100644
--- a/src/pages/Account/AccountFilter.vue
+++ b/src/pages/Account/AccountFilter.vue
@@ -47,7 +47,7 @@ const rolesOptions = ref([]);
                         :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -57,7 +57,7 @@ const rolesOptions = ref([]);
                         :label="t('account.card.alias')"
                         v-model="params.nickname"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -75,8 +75,7 @@ const rolesOptions = ref([]);
                         use-input
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                         :input-debounce="0"
                     />
                 </QItemSection>
diff --git a/src/pages/Account/Acls/AclFilter.vue b/src/pages/Account/Acls/AclFilter.vue
index 8035f92b88d..222fe5b7737 100644
--- a/src/pages/Account/Acls/AclFilter.vue
+++ b/src/pages/Account/Acls/AclFilter.vue
@@ -56,8 +56,7 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -72,8 +71,7 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -83,7 +81,7 @@ onBeforeMount(() => {
                         :label="t('acls.aclFilter.property')"
                         v-model="params.property"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -98,8 +96,7 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -114,8 +111,7 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
index 7f6992bf03e..957047cc3bc 100644
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/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 CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import axios from 'axios';
@@ -48,7 +48,7 @@ const removeAlias = () => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         ref="descriptor"
         :url="`MailAliases/${entityId}`"
         data-key="Alias"
@@ -63,7 +63,7 @@ const removeAlias = () => {
         <template #body="{ entity }">
             <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 49328fe87eb..eb0a9013cc2 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.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>
-    <CardDescriptor
+    <EntityDescriptor
         ref="descriptor"
         :url="`VnUsers/preview`"
         :filter="{ ...filter, where: { id: entityId } }"
@@ -78,7 +78,7 @@ onMounted(async () => {
                 </QIcon>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <style scoped>
 .q-item__label {
diff --git a/src/pages/Account/Role/AccountRolesFilter.vue b/src/pages/Account/Role/AccountRolesFilter.vue
index cbe7a70c866..1358236c6d5 100644
--- a/src/pages/Account/Role/AccountRolesFilter.vue
+++ b/src/pages/Account/Role/AccountRolesFilter.vue
@@ -27,7 +27,7 @@ const props = defineProps({
                         :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -37,7 +37,7 @@ const props = defineProps({
                         :label="t('role.description')"
                         v-model="params.description"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index 051359702c4..698bea4fae9 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/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 CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -32,7 +32,7 @@ const removeRole = async () => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         url="VnRoles"
         :filter="{ where: { id: entityId } }"
         data-key="Role"
@@ -47,7 +47,7 @@ const removeRole = async () => {
         <template #body="{ entity }">
             <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <style scoped>
 .q-item__label {
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index d789b63d325..76ede81edee 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/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 CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.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>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Claims/${entityId}`"
         :filter="filter"
         title="client.name"
@@ -147,7 +147,7 @@ onMounted(async () => {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <style scoped>
 .q-item__label {
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index 37146865c6b..51460f7e4e1 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -33,7 +33,7 @@ const props = defineProps({
                     :label="t('claim.customerId')"
                     v-model="params.clientFk"
                     lazy-rules
-                    is-outlined
+                    filled
                 >
                     <template #prepend> <QIcon name="badge" size="xs" /></template>
                 </VnInput>
@@ -41,12 +41,11 @@ const props = defineProps({
                     :label="t('Client Name')"
                     v-model="params.clientName"
                     lazy-rules
-                    is-outlined
+                    filled
                 />
                 <VnSelect
-                    outlined
                     dense
-                    rounded
+                    filled
                     :label="t('globals.params.departmentFk')"
                     v-model="params.departmentFk"
                     option-value="id"
@@ -61,8 +60,7 @@ const props = defineProps({
                     :use-like="false"
                     option-filter="firstName"
                     dense
-                    outlined
-                    rounded
+                    filled
                 />
                 <VnSelect
                     :label="t('claim.state')"
@@ -70,14 +68,12 @@ const props = defineProps({
                     :options="states"
                     option-label="description"
                     dense
-                    outlined
-                    rounded
+                    filled
                 />
                 <VnInputDate
                     v-model="params.created"
                     :label="t('claim.created')"
-                    outlined
-                    rounded
+                    filled
                     dense
                 />
                 <VnSelect
@@ -86,8 +82,7 @@ const props = defineProps({
                     url="Items/withName"
                     :use-like="false"
                     sort-by="id DESC"
-                    outlined
-                    rounded
+                    filled
                     dense
                 />
                 <VnSelect
@@ -98,15 +93,13 @@ const props = defineProps({
                     :use-like="false"
                     option-filter="firstName"
                     dense
-                    outlined
-                    rounded
+                    filled
                 />
                 <VnSelect
                     :label="t('claim.zone')"
                     v-model="params.zoneFk"
                     url="Zones"
-                    outlined
-                    rounded
+                    filled
                     dense
                 />
                 <QCheckbox
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 8978c00f117..cd18cf2c958 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -7,7 +7,7 @@ import { toCurrency, toDate } from 'src/filters';
 
 import useCardDescription from 'src/composables/useCardDescription';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.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>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Clients/${entityId}/getCard`"
         :summary="$props.summary"
         data-key="Customer"
@@ -232,7 +232,7 @@ const debtWarning = computed(() => {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 2ace6dd02a1..55a7f565efc 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/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" is-outlined>
+                    <VnInput :label="t('FI')" v-model="params.fi" filled>
                         <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" is-outlined />
+                    <VnInput :label="t('Name')" v-model="params.name" filled />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
@@ -58,16 +58,15 @@ const exprBuilder = (param, value) => {
                     <VnInput
                         :label="t('customer.summary.socialName')"
                         v-model="params.socialName"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
                         option-value="id"
@@ -89,8 +88,7 @@ const exprBuilder = (param, value) => {
                         map-options
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                         auto-load
                         :input-debounce="0"
                     />
@@ -98,12 +96,12 @@ const exprBuilder = (param, value) => {
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('City')" v-model="params.city" is-outlined />
+                    <VnInput :label="t('City')" v-model="params.city" filled />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
+                    <VnInput :label="t('Phone')" v-model="params.phone" filled>
                         <template #prepend>
                             <QIcon name="phone" size="xs" />
                         </template>
@@ -112,7 +110,7 @@ const exprBuilder = (param, value) => {
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('Email')" v-model="params.email" is-outlined>
+                    <VnInput :label="t('Email')" v-model="params.email" filled>
                         <template #prepend>
                             <QIcon name="email" size="sm" />
                         </template>
@@ -132,19 +130,14 @@ const exprBuilder = (param, value) => {
                         map-options
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                         auto-load
                         sortBy="name ASC"
                 /></QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput
-                        :label="t('Postcode')"
-                        v-model="params.postcode"
-                        is-outlined
-                    />
+                    <VnInput :label="t('Postcode')" v-model="params.postcode" filled />
                 </QItemSection>
             </QItem>
         </template>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 0eab7b7c557..64e3baeb5bb 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -45,8 +45,7 @@ const departments = ref();
                     dense
                     option-label="name"
                     option-value="id"
-                    outlined
-                    rounded
+                    filled
                     emit-value
                     hide-selected
                     map-options
@@ -67,8 +66,7 @@ const departments = ref();
                         map-options
                         option-label="name"
                         option-value="id"
-                        outlined
-                        rounded
+                        filled
                         use-input
                         v-model="params.departmentFk"
                         @update:model-value="searchFn()"
@@ -91,8 +89,7 @@ const departments = ref();
                         map-options
                         option-label="name"
                         option-value="id"
-                        outlined
-                        rounded
+                        filled
                         use-input
                         v-model="params.countryFk"
                         @update:model-value="searchFn()"
@@ -108,7 +105,7 @@ const departments = ref();
                     <VnInput
                         :label="t('P. Method')"
                         clearable
-                        is-outlined
+                        filled
                         v-model="params.paymentMethod"
                     />
                 </QItemSection>
@@ -119,7 +116,7 @@ const departments = ref();
                     <VnInput
                         :label="t('Balance D.')"
                         clearable
-                        is-outlined
+                        filled
                         v-model="params.balance"
                     />
                 </QItemSection>
@@ -137,8 +134,7 @@ const departments = ref();
                         map-options
                         option-label="name"
                         option-value="id"
-                        outlined
-                        rounded
+                        filled
                         use-input
                         v-model="params.workerFk"
                         @update:model-value="searchFn()"
@@ -154,7 +150,7 @@ const departments = ref();
                     <VnInputDate
                         :label="t('L. O. Date')"
                         clearable
-                        is-outlined
+                        filled
                         v-model="params.date"
                     />
                 </QItemSection>
@@ -165,7 +161,7 @@ const departments = ref();
                     <VnInput
                         :label="t('Credit I.')"
                         clearable
-                        is-outlined
+                        filled
                         v-model="params.credit"
                     />
                 </QItemSection>
@@ -175,7 +171,7 @@ const departments = ref();
                 <QItemSection>
                     <VnInputDate
                         :label="t('From')"
-                        is-outlined
+                        filled
                         v-model="params.defaulterSinced"
                     />
                 </QItemSection>
diff --git a/src/pages/Customer/Payments/CustomerPaymentsFilter.vue b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
index 8982cba5a39..ec20237b40d 100644
--- a/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
+++ b/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" is-outlined>
+                    <VnInput :label="t('Order ID')" v-model="params.orderFk" filled>
                         <template #prepend>
                             <QIcon name="vn:basket" size="xs" />
                         </template>
@@ -34,11 +34,7 @@ const props = defineProps({
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('Customer ID')"
-                        v-model="params.clientFk"
-                        is-outlined
-                    >
+                    <VnInput :label="t('Customer ID')" v-model="params.clientFk" filled>
                         <template #prepend>
                             <QIcon name="vn:client" size="xs" />
                         </template>
@@ -47,19 +43,15 @@ const props = defineProps({
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputNumber
-                        :label="t('Amount')"
-                        v-model="params.amount"
-                        is-outlined
-                    />
+                    <VnInputNumber :label="t('Amount')" v-model="params.amount" filled />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                    <VnInputDate v-model="params.from" :label="t('From')" filled />
                 </QItemSection>
                 <QItemSection>
-                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                    <VnInputDate v-model="params.to" :label="t('To')" filled />
                 </QItemSection>
             </QItem>
         </template>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 313ed3d728b..56011428390 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/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 CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 import axios from 'axios';
@@ -145,7 +145,7 @@ async function deleteEntry() {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Entries/${entityId}`"
         :filter="entryFilter"
         title="supplier.nickname"
@@ -264,7 +264,7 @@ async function deleteEntry() {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <i18n>
 es:
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 82bcb1a7916..19f4bca869e 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -101,14 +101,14 @@ const entryFilterPanel = ref();
                         :label="t('params.landed')"
                         v-model="params.landed"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                         data-cy="landed"
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput v-model="params.id" label="Id" is-outlined />
+                    <VnInput v-model="params.id" label="Id" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -118,8 +118,7 @@ const entryFilterPanel = ref();
                         @update:model-value="searchFn()"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -128,7 +127,7 @@ const entryFilterPanel = ref();
                     <VnInput
                         v-model="params.reference"
                         :label="t('entry.list.tableVisibleColumns.reference')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -143,8 +142,7 @@ const entryFilterPanel = ref();
                         :fields="['id', 'name']"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -153,7 +151,7 @@ const entryFilterPanel = ref();
                     <VnInput
                         v-model="params.evaNotes"
                         :label="t('params.evaNotes')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -168,8 +166,7 @@ const entryFilterPanel = ref();
                         sort-by="name ASC"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -184,8 +181,7 @@ const entryFilterPanel = ref();
                         sort-by="name ASC"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -207,7 +203,7 @@ const entryFilterPanel = ref();
                     <VnInput
                         v-model="params.invoiceNumber"
                         :label="t('params.invoiceNumber')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -224,8 +220,16 @@ const entryFilterPanel = ref();
                         option-label="description"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.evaNotes"
+                        :label="t('params.evaNotes')"
+                        filled
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index eb673c546cb..e8df27511fd 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/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 CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import filter from './InvoiceInFilter.js';
 import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
@@ -84,7 +84,7 @@ async function setInvoiceCorrection(id) {
 }
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         ref="cardDescriptorRef"
         data-key="InvoiceIn"
         :url="`InvoiceIns/${entityId}`"
@@ -159,7 +159,7 @@ async function setInvoiceCorrection(id) {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <style lang="scss" scoped>
 .q-dialog {
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index a4fb0d653a8..6551a7ca9df 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -40,17 +40,13 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInputDate
                         :label="$t('globals.from')"
                         v-model="params.from"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate
-                        :label="$t('globals.to')"
-                        v-model="params.to"
-                        is-outlined
-                    />
+                    <VnInputDate :label="$t('globals.to')" v-model="params.to" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -58,7 +54,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInputNumber
                         :label="$t('globals.daysAgo')"
                         v-model="params.daysAgo"
-                        is-outlined
+                        filled
                         :step="0"
                         @update:model-value="(val) => handleDaysAgo(params, val)"
                         @remove="(val) => handleDaysAgo(params, val)"
@@ -67,12 +63,7 @@ function handleDaysAgo(params, daysAgo) {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectSupplier
-                        v-model="params.supplierFk"
-                        dense
-                        outlined
-                        rounded
-                    />
+                    <VnSelectSupplier v-model="params.supplierFk" dense filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -80,7 +71,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('supplierRef')"
                         v-model="params.supplierRef"
-                        is-outlined
+                        filled
                         lazy-rules
                     />
                 </QItemSection>
@@ -90,7 +81,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('fi')"
                         v-model="params.fi"
-                        is-outlined
+                        filled
                         lazy-rules
                     />
                 </QItemSection>
@@ -100,7 +91,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('serial')"
                         v-model="params.serial"
-                        is-outlined
+                        filled
                         lazy-rules
                     />
                 </QItemSection>
@@ -110,7 +101,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('account')"
                         v-model="params.account"
-                        is-outlined
+                        filled
                         lazy-rules
                     />
                 </QItemSection>
@@ -120,7 +111,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('globals.params.awbCode')"
                         v-model="params.awbCode"
-                        is-outlined
+                        filled
                         lazy-rules
                     />
                 </QItemSection>
@@ -130,7 +121,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInputNumber
                         :label="$t('globals.amount')"
                         v-model="params.amount"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -142,7 +133,7 @@ function handleDaysAgo(params, daysAgo) {
                         url="Companies"
                         option-label="code"
                         :fields="['id', 'code']"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
index 19ed73e5087..66b7fa4331c 100644
--- a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
@@ -25,8 +25,7 @@ const { t } = useI18n();
                     <VnInputNumber
                         v-model="params.daysAgo"
                         :label="t('params.daysAgo')"
-                        outlined
-                        rounded
+                        filled
                         dense
                     />
                 </QItemSection>
@@ -36,8 +35,7 @@ const { t } = useI18n();
                     <VnInput
                         v-model="params.serial"
                         :label="t('params.serial')"
-                        outlined
-                        rounded
+                        filled
                         dense
                     />
                 </QItemSection>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index 2402c0bf6ce..b93b8c8b784 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/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 CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.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>
-    <CardDescriptor
+    <EntityDescriptor
         ref="descriptor"
         :url="`InvoiceOuts/${entityId}`"
         :filter="filter"
@@ -93,5 +93,5 @@ function ticketFilter(invoice) {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index 99524e0d6e7..93a343565b5 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -33,17 +33,13 @@ const states = ref();
                     <VnInput
                         :label="t('globals.params.clientFk')"
                         v-model="params.clientFk"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.fi"
-                        :label="t('globals.params.fi')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.fi" :label="t('globals.params.fi')" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -51,7 +47,7 @@ const states = ref();
                     <VnInputNumber
                         :label="t('globals.amount')"
                         v-model="params.amount"
-                        is-outlined
+                        filled
                         data-cy="InvoiceOutFilterAmountBtn"
                     />
                 </QItemSection>
@@ -62,8 +58,7 @@ const states = ref();
                         :label="t('invoiceOut.params.min')"
                         dense
                         lazy-rules
-                        outlined
-                        rounded
+                        filled
                         type="number"
                         v-model.number="params.min"
                     />
@@ -73,8 +68,7 @@ const states = ref();
                         :label="t('invoiceOut.params.max')"
                         dense
                         lazy-rules
-                        outlined
-                        rounded
+                        filled
                         type="number"
                         v-model.number="params.max"
                     />
@@ -94,7 +88,7 @@ const states = ref();
                     <VnInputDate
                         v-model="params.created"
                         :label="t('invoiceOut.params.created')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -103,15 +97,14 @@ const states = ref();
                     <VnInputDate
                         v-model="params.dued"
                         :label="t('invoiceOut.params.dued')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
                         option-value="id"
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 39225647342..53433c56bf0 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -26,7 +26,7 @@ const serialTypesOptions = ref([]);
 
 const handleInvoiceOutSerialsFetch = (data) => {
     serialTypesOptions.value = Array.from(
-        new Set(data.map((item) => item.type).filter((type) => type))
+        new Set(data.map((item) => item.type).filter((type) => type)),
     );
 };
 
@@ -99,8 +99,7 @@ onMounted(async () => {
                 option-label="name"
                 hide-selected
                 dense
-                outlined
-                rounded
+                filled
                 data-cy="InvoiceOutGlobalClientSelect"
             >
                 <template #option="scope">
@@ -124,19 +123,18 @@ onMounted(async () => {
                 option-label="type"
                 hide-selected
                 dense
-                outlined
-                rounded
+                filled
                 data-cy="InvoiceOutGlobalSerialSelect"
             />
             <VnInputDate
                 v-model="formData.invoiceDate"
                 :label="t('invoiceDate')"
-                is-outlined
+                filled
             />
             <VnInputDate
                 v-model="formData.maxShipped"
                 :label="t('maxShipped')"
-                is-outlined
+                filled
                 data-cy="InvoiceOutGlobalMaxShippedDate"
             />
             <VnSelect
@@ -145,8 +143,7 @@ onMounted(async () => {
                 :options="companiesOptions"
                 option-label="code"
                 dense
-                outlined
-                rounded
+                filled
                 data-cy="InvoiceOutGlobalCompanySelect"
             />
             <VnSelect
@@ -154,8 +151,7 @@ onMounted(async () => {
                 v-model="formData.printer"
                 :options="printersOptions"
                 dense
-                outlined
-                rounded
+                filled
                 data-cy="InvoiceOutGlobalPrinterSelect"
             />
         </div>
@@ -166,7 +162,7 @@ onMounted(async () => {
             color="primary"
             class="q-mt-md full-width"
             unelevated
-            rounded
+            filled
             dense
         />
         <QBtn
@@ -175,7 +171,7 @@ onMounted(async () => {
             color="primary"
             class="q-mt-md full-width"
             unelevated
-            rounded
+            filled
             dense
             @click="getStatus = 'stopping'"
         />
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index b24c8b2471f..1e2f80ec2da 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -35,17 +35,13 @@ const props = defineProps({
                     <VnInputDate
                         v-model="params.from"
                         :label="t('globals.from')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate
-                        v-model="params.to"
-                        :label="t('globals.to')"
-                        is-outlined
-                    />
+                    <VnInputDate v-model="params.to" :label="t('globals.to')" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -57,8 +53,7 @@ const props = defineProps({
                         option-label="code"
                         option-value="code"
                         dense
-                        outlined
-                        rounded
+                        filled
                         @update:model-value="searchFn()"
                     >
                         <template #option="scope">
@@ -84,9 +79,8 @@ const props = defineProps({
                         v-model="params.country"
                         option-label="name"
                         option-value="name"
-                        outlined
                         dense
-                        rounded
+                        filled
                         @update:model-value="searchFn()"
                     >
                         <template #option="scope">
@@ -110,9 +104,8 @@ const props = defineProps({
                         url="Clients"
                         :label="t('globals.client')"
                         v-model="params.clientId"
-                        outlined
                         dense
-                        rounded
+                        filled
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>
@@ -122,7 +115,7 @@ const props = defineProps({
                     <VnInputNumber
                         v-model="params.amount"
                         :label="t('globals.amount')"
-                        is-outlined
+                        filled
                         :positive="false"
                     />
                 </QItemSection>
@@ -130,9 +123,8 @@ const props = defineProps({
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
                         option-value="id"
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 84e07a2930f..09f63a3b10e 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -3,7 +3,7 @@ import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'src/components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
@@ -90,7 +90,7 @@ const updateStock = async () => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         data-key="Item"
         :summary="$props.summary"
         :url="`Items/${entityId}/getCard`"
@@ -162,7 +162,7 @@ const updateStock = async () => {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 8d92e245dbb..d68b966c6dc 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -13,7 +13,6 @@ const props = defineProps({
         required: true,
     },
 });
-
 </script>
 
 <template>
@@ -28,8 +27,7 @@ const props = defineProps({
                         :fields="['id', 'nickname']"
                         option-label="nickname"
                         dense
-                        outlined
-                        rounded
+                        filled
                         use-input
                         @update:model-value="searchFn()"
                         sort-by="nickname ASC"
@@ -46,8 +44,7 @@ const props = defineProps({
                         :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         dense
-                        outlined
-                        rounded
+                        filled
                         use-input
                         @update:model-value="searchFn()"
                     />
@@ -58,7 +55,7 @@ const props = defineProps({
                     <VnInputDate
                         :label="t('params.started')"
                         v-model="params.started"
-                        is-outlined
+                        filled
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>
@@ -68,7 +65,7 @@ const props = defineProps({
                     <VnInputDate
                         :label="t('params.ended')"
                         v-model="params.ended"
-                        is-outlined
+                        filled
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 22e948e06dd..f4500d5fa28 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -177,11 +177,7 @@ onMounted(async () => {
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.search"
-                        :label="t('params.search')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.search" :label="t('params.search')" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -197,8 +193,7 @@ onMounted(async () => {
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -213,8 +208,7 @@ onMounted(async () => {
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -240,8 +234,7 @@ onMounted(async () => {
                         option-label="nickname"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -252,8 +245,7 @@ onMounted(async () => {
                         @update:model-value="searchFn()"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -282,8 +274,7 @@ onMounted(async () => {
                         :options="tagOptions"
                         option-label="name"
                         dense
-                        outlined
-                        rounded
+                        filled
                         :emit-value="false"
                         use-input
                         :is-clearable="false"
@@ -299,8 +290,7 @@ onMounted(async () => {
                         option-value="value"
                         option-label="value"
                         dense
-                        outlined
-                        rounded
+                        filled
                         emit-value
                         use-input
                         :disable="!tag"
@@ -312,7 +302,7 @@ onMounted(async () => {
                         v-model="tag.value"
                         :label="t('params.value')"
                         :disable="!tag"
-                        is-outlined
+                        filled
                         :is-clearable="false"
                         @keydown.enter.prevent="applyTags(params, searchFn)"
                     />
@@ -351,8 +341,7 @@ onMounted(async () => {
                         option-label="label"
                         option-value="label"
                         dense
-                        outlined
-                        rounded
+                        filled
                         :emit-value="false"
                         use-input
                         :is-clearable="false"
@@ -377,7 +366,7 @@ onMounted(async () => {
                         v-model="fieldFilter.value"
                         :label="t('params.value')"
                         :disable="!fieldFilter.selectedField"
-                        is-outlined
+                        filled
                         @keydown.enter="applyFieldFilters(params, searchFn)"
                     />
                 </QItemSection>
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index a29203df309..68f36c56613 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -87,11 +87,7 @@ onMounted(async () => {
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.search"
-                        :label="t('params.search')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.search" :label="t('params.search')" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -99,7 +95,7 @@ onMounted(async () => {
                     <VnInput
                         v-model="params.ticketFk"
                         :label="t('params.ticketFk')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -114,8 +110,7 @@ onMounted(async () => {
                         option-label="nickname"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -124,7 +119,7 @@ onMounted(async () => {
                     <VnInput
                         v-model="params.clientFk"
                         :label="t('params.clientFk')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -139,8 +134,7 @@ onMounted(async () => {
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -153,25 +147,16 @@ onMounted(async () => {
                         :params="{ departmentCodes: ['VT'] }"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate
-                        v-model="params.from"
-                        :label="t('params.from')"
-                        is-outlined
-                    />
+                    <VnInputDate v-model="params.from" :label="t('params.from')" filled />
                 </QItemSection>
                 <QItemSection>
-                    <VnInputDate
-                        v-model="params.to"
-                        :label="t('params.to')"
-                        is-outlined
-                    />
+                    <VnInputDate v-model="params.to" :label="t('params.to')" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -180,7 +165,7 @@ onMounted(async () => {
                         :label="t('params.daysOnward')"
                         v-model="params.daysOnward"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -195,8 +180,7 @@ onMounted(async () => {
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
index 972f4cad909..106b005bf84 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import filter from './ItemTypeFilter.js';
@@ -25,7 +25,7 @@ const entityId = computed(() => {
 });
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`ItemTypes/${entityId}`"
         :filter="filter"
         title="code"
@@ -46,5 +46,5 @@ const entityId = computed(() => {
                 :value="entity.category?.name"
             />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 447dd35b830..535906e1769 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -77,7 +77,7 @@ const getLocale = (label) => {
                     <VnInput
                         :label="t('globals.params.clientFk')"
                         v-model="params.clientFk"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -86,7 +86,7 @@ const getLocale = (label) => {
                     <VnInput
                         :label="t('params.orderFk')"
                         v-model="params.orderFk"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -95,7 +95,7 @@ const getLocale = (label) => {
                     <VnInputNumber
                         :label="t('params.scopeDays')"
                         v-model="params.scopeDays"
-                        is-outlined
+                        filled
                         @update:model-value="(val) => handleScopeDays(params, val)"
                         @remove="(val) => handleScopeDays(params, val)"
                     />
@@ -106,66 +106,54 @@ const getLocale = (label) => {
                     <VnInput
                         :label="t('params.nickname')"
                         v-model="params.nickname"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
-                        option-value="id"
-                        option-label="name"
                         url="Departments"
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('params.refFk')"
-                        v-model="params.refFk"
-                        is-outlined
-                    />
+                    <VnInput :label="t('params.refFk')" v-model="params.refFk" filled />
                 </QItemSection>
             </QItem>
 
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('params.agencyModeFk')"
                         v-model="params.agencyModeFk"
                         url="AgencyModes/isActive"
-                        is-outlined
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.stateFk')"
                         v-model="params.stateFk"
                         url="States"
-                        is-outlined
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('params.groupedStates')"
                         v-model="params.alertLevel"
                         :options="groupedStates"
@@ -176,9 +164,8 @@ const getLocale = (label) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehouses"
@@ -188,9 +175,8 @@ const getLocale = (label) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.countryFk')"
                         v-model="params.countryFk"
                         url="Countries"
@@ -200,9 +186,8 @@ const getLocale = (label) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.provinceFk')"
                         v-model="params.provinceFk"
                         url="Provinces"
@@ -212,9 +197,8 @@ const getLocale = (label) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.department"
                         option-label="name"
@@ -226,9 +210,8 @@ const getLocale = (label) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.packing')"
                         v-model="params.packing"
                         url="ItemPackingTypes"
diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
index d1bd48c9e90..10273a254d6 100644
--- a/src/pages/Order/Card/CatalogFilterValueDialog.vue
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -57,9 +57,8 @@ const getSelectedTagValues = async (tag) => {
                 option-value="id"
                 option-label="name"
                 dense
-                outlined
                 class="q-mb-md"
-                rounded
+                filled
                 :emit-value="false"
                 use-input
                 @update:model-value="getSelectedTagValues"
@@ -79,8 +78,7 @@ const getSelectedTagValues = async (tag) => {
                         option-value="value"
                         option-label="value"
                         dense
-                        outlined
-                        rounded
+                        filled
                         emit-value
                         use-input
                         :disable="!value || !selectedTag"
@@ -92,16 +90,14 @@ const getSelectedTagValues = async (tag) => {
                         v-model="value.value"
                         :label="t('components.itemsFilterPanel.value')"
                         :disable="!value"
-                        is-outlined
                         class="col"
                         data-cy="catalogFilterValueDialogValueInput"
                     />
                     <QBtn
                         icon="delete"
                         size="md"
-                        outlined
                         dense
-                        rounded
+                        filled
                         flat
                         class="filter-icon col-2"
                         @click="tagValues.splice(index, 1)"
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 7dab307a0e8..11dbbe53216 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -6,9 +6,11 @@ import filter from './OrderFilter.js';
 
 <template>
     <VnCard
-        data-key="Order"
+        :data-key="$attrs['data-key'] ?? 'Order'"
         url="Orders"
         :filter="filter"
         :descriptor="OrderDescriptor"
+        v-bind="$attrs"
+        v-on="$attrs"
     />
 </template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index d16a920179d..cb380c48f8d 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -221,8 +221,7 @@ function addOrder(value, field, params) {
                         option-value="id"
                         option-label="name"
                         dense
-                        outlined
-                        rounded
+                        filled
                         emit-value
                         use-input
                         sort-by="name ASC"
@@ -251,8 +250,7 @@ function addOrder(value, field, params) {
                         v-model="orderBySelected"
                         :options="orderByList"
                         dense
-                        outlined
-                        rounded
+                        filled
                         @update:model-value="(value) => addOrder(value, 'field', params)"
                     />
                 </QItemSection>
@@ -264,8 +262,7 @@ function addOrder(value, field, params) {
                         v-model="orderWaySelected"
                         :options="orderWayList"
                         dense
-                        outlined
-                        rounded
+                        filled
                         @update:model-value="(value) => addOrder(value, 'way', params)"
                     />
                 </QItemSection>
@@ -275,8 +272,7 @@ function addOrder(value, field, params) {
                 <VnInput
                     :label="t('components.itemsFilterPanel.value')"
                     dense
-                    outlined
-                    rounded
+                    filled
                     :is-clearable="false"
                     v-model="searchByTag"
                     @keyup.enter="(val) => onSearchByTag(val, params)"
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index f34549c1eb3..ee66bb57e7e 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -4,10 +4,10 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency, toDate } from 'src/filters';
 import { useState } from 'src/composables/useState';
-import filter from './OrderFilter.js';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import FetchData from 'components/FetchData.vue';
+import OrderCard from './OrderCard.vue';
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 
 const DEFAULT_ITEMS = 0;
@@ -24,11 +24,14 @@ const route = useRoute();
 const state = useState();
 const { t } = useI18n();
 const getTotalRef = ref();
+const total = ref(0);
 
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
+const orderTotal = computed(() => state.get('orderTotal') ?? 0);
+
 const setData = (entity) => {
     if (!entity) return;
     getTotalRef.value && getTotalRef.value.fetch();
@@ -38,9 +41,6 @@ const setData = (entity) => {
 const getConfirmationValue = (isConfirmed) => {
     return t(isConfirmed ? 'globals.confirmed' : 'order.summary.notConfirmed');
 };
-
-const orderTotal = computed(() => state.get('orderTotal') ?? 0);
-const total = ref(0);
 </script>
 
 <template>
@@ -54,12 +54,12 @@ const total = ref(0);
         "
     />
     <CardDescriptor
-        ref="descriptor"
-        :url="`Orders/${entityId}`"
-        :filter="filter"
+        v-bind="$attrs"
+        :id="entityId"
+        :card="OrderCard"
         title="client.name"
         @on-fetch="setData"
-        data-key="Order"
+        module="Order"
     >
         <template #body="{ entity }">
             <VnLv
diff --git a/src/pages/Order/Card/OrderDescriptorProxy.vue b/src/pages/Order/Card/OrderDescriptorProxy.vue
index 04ebb054a23..1dff1b62083 100644
--- a/src/pages/Order/Card/OrderDescriptorProxy.vue
+++ b/src/pages/Order/Card/OrderDescriptorProxy.vue
@@ -12,6 +12,11 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <OrderDescriptor v-if="$props.id" :id="$props.id" :summary="OrderSummary" />
+        <OrderDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="OrderSummary"
+            data-key="OrderDescriptor"
+        />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index 42578423f40..609a1215ab2 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -49,8 +49,7 @@ const sourceList = ref([]);
                     v-model="params.clientFk"
                     lazy-rules
                     dense
-                    outlined
-                    rounded
+                    filled
                 />
                 <VnSelect
                     :label="t('agency')"
@@ -58,13 +57,11 @@ const sourceList = ref([]);
                     :options="agencyList"
                     :input-debounce="0"
                     dense
-                    outlined
-                    rounded
+                    filled
                 />
                 <VnSelect
-                    outlined
                     dense
-                    rounded
+                    filled
                     :label="t('globals.params.departmentFk')"
                     v-model="params.departmentFk"
                     option-value="id"
@@ -75,21 +72,14 @@ const sourceList = ref([]);
                     v-model="params.from"
                     :label="t('fromLanded')"
                     dense
-                    outlined
-                    rounded
-                />
-                <VnInputDate
-                    v-model="params.to"
-                    :label="t('toLanded')"
-                    dense
-                    outlined
-                    rounded
+                    filled
                 />
+                <VnInputDate v-model="params.to" :label="t('toLanded')" dense filled />
                 <VnInput
                     :label="t('orderId')"
                     v-model="params.orderFk"
                     lazy-rules
-                    is-outlined
+                    filled
                 />
                 <VnSelect
                     :label="t('application')"
@@ -98,8 +88,7 @@ const sourceList = ref([]);
                     option-label="value"
                     option-value="value"
                     dense
-                    outlined
-                    rounded
+                    filled
                     :input-debounce="0"
                 />
                 <QCheckbox
diff --git a/src/pages/Route/Agency/Card/AgencyDescriptor.vue b/src/pages/Route/Agency/Card/AgencyDescriptor.vue
index 46aa44be945..64b33cc066c 100644
--- a/src/pages/Route/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Route/Agency/Card/AgencyDescriptor.vue
@@ -3,7 +3,7 @@ import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 
 const props = defineProps({
@@ -21,7 +21,7 @@ const { store } = useArrayData();
 const card = computed(() => store.data);
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         data-key="Agency"
         :url="`Agencies/${entityId}`"
         :title="card?.name"
@@ -31,5 +31,5 @@ const card = computed(() => store.data);
         <template #body="{ entity: agency }">
             <VnLv :label="t('globals.name')" :value="agency.name" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
diff --git a/src/pages/Route/Card/RouteAutonomousFilter.vue b/src/pages/Route/Card/RouteAutonomousFilter.vue
index f70f60e1c17..fe631a0be70 100644
--- a/src/pages/Route/Card/RouteAutonomousFilter.vue
+++ b/src/pages/Route/Card/RouteAutonomousFilter.vue
@@ -71,7 +71,7 @@ const exprBuilder = (param, value) => {
             <QList dense>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInput v-model="params.routeFk" :label="t('ID')" is-outlined />
+                        <VnInput v-model="params.routeFk" :label="t('ID')" filled />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm" v-if="agencyList">
@@ -83,8 +83,7 @@ const exprBuilder = (param, value) => {
                             option-value="id"
                             option-label="name"
                             dense
-                            outlined
-                            rounded
+                            filled
                             emit-value
                             map-options
                             use-input
@@ -102,8 +101,7 @@ const exprBuilder = (param, value) => {
                             option-value="id"
                             option-label="name"
                             dense
-                            outlined
-                            rounded
+                            filled
                             emit-value
                             map-options
                             use-input
@@ -123,8 +121,7 @@ const exprBuilder = (param, value) => {
                             option-value="name"
                             option-label="name"
                             dense
-                            outlined
-                            rounded
+                            filled
                             emit-value
                             map-options
                             use-input
@@ -135,20 +132,12 @@ const exprBuilder = (param, value) => {
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInputDate
-                            v-model="params.dated"
-                            :label="t('Date')"
-                            is-outlined
-                        />
+                        <VnInputDate v-model="params.dated" :label="t('Date')" filled />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('From')"
-                            is-outlined
-                        />
+                        <VnInputDate v-model="params.from" :label="t('From')" filled />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
@@ -156,7 +145,7 @@ const exprBuilder = (param, value) => {
                         <VnInputDate
                             v-model="params.to"
                             :label="t('To')"
-                            is-outlined
+                            filled
                             is-clearable
                         />
                     </QItemSection>
@@ -166,23 +155,23 @@ const exprBuilder = (param, value) => {
                         <VnInput
                             v-model="params.packages"
                             :label="t('Packages')"
-                            is-outlined
+                            filled
                         />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInput v-model="params.m3" :label="t('m3')" is-outlined />
+                        <VnInput v-model="params.m3" :label="t('m3')" filled />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInput v-model="params.kmTotal" :label="t('Km')" is-outlined />
+                        <VnInput v-model="params.kmTotal" :label="t('Km')" filled />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInput v-model="params.price" :label="t('Price')" is-outlined />
+                        <VnInput v-model="params.price" :label="t('Price')" filled />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
@@ -190,7 +179,7 @@ const exprBuilder = (param, value) => {
                         <VnInput
                             v-model="params.invoiceInFk"
                             :label="t('Received')"
-                            is-outlined
+                            filled
                         />
                     </QItemSection>
                 </QItem>
diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index c57e5147337..ee42d8e76a6 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import useCardDescription from 'composables/useCardDescription';
 import VnLv from 'components/ui/VnLv.vue';
 import { dashIfEmpty, toDate } from 'src/filters';
@@ -41,13 +41,12 @@ const getZone = async () => {
     zone.value = zoneData.name;
 };
 const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
 onMounted(async () => {
     getZone();
 });
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Routes/${entityId}`"
         :filter="filter"
         :title="null"
@@ -69,7 +68,7 @@ onMounted(async () => {
         <template #menu="{ entity }">
             <RouteDescriptorMenu :route="entity" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <i18n>
 es:
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index cb515851719..f830b83e2ed 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -36,8 +36,7 @@ const emit = defineEmits(['search']);
                         :label="t('globals.worker')"
                         v-model="params.workerFk"
                         dense
-                        outlined
-                        rounded
+                        filled
                         :input-debounce="0"
                     />
                 </QItemSection>
@@ -52,8 +51,7 @@ const emit = defineEmits(['search']);
                         option-value="id"
                         option-label="name"
                         dense
-                        outlined
-                        rounded
+                        filled
                         :input-debounce="0"
                     />
                 </QItemSection>
@@ -63,7 +61,7 @@ const emit = defineEmits(['search']);
                     <VnInputDate
                         v-model="params.from"
                         :label="t('globals.from')"
-                        is-outlined
+                        filled
                         :disable="Boolean(params.scopeDays)"
                         @update:model-value="params.scopeDays = null"
                     />
@@ -74,7 +72,7 @@ const emit = defineEmits(['search']);
                     <VnInputDate
                         v-model="params.to"
                         :label="t('globals.to')"
-                        is-outlined
+                        filled
                         :disable="Boolean(params.scopeDays)"
                         @update:model-value="params.scopeDays = null"
                     />
@@ -86,7 +84,7 @@ const emit = defineEmits(['search']);
                         v-model="params.scopeDays"
                         type="number"
                         :label="t('globals.daysOnward')"
-                        is-outlined
+                        filled
                         clearable
                         :disable="Boolean(params.from || params.to)"
                         @update:model-value="
@@ -107,15 +105,14 @@ const emit = defineEmits(['search']);
                         option-label="numberPlate"
                         option-filter-value="numberPlate"
                         dense
-                        outlined
-                        rounded
+                        filled
                         :input-debounce="0"
                     />
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnInput v-model="params.m3" label="m³" is-outlined clearable />
+                    <VnInput v-model="params.m3" label="m³" filled clearable />
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">
@@ -127,8 +124,7 @@ const emit = defineEmits(['search']);
                         option-value="id"
                         option-label="name"
                         dense
-                        outlined
-                        rounded
+                        filled
                         :input-debounce="0"
                     />
                 </QItemSection>
@@ -138,7 +134,7 @@ const emit = defineEmits(['search']);
                     <VnInput
                         v-model="params.description"
                         :label="t('globals.description')"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index bc9230eda9d..dfa692feb82 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
@@ -30,7 +30,7 @@ const entityId = computed(() => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Roadmaps/${entityId}`"
         :filter="filter"
         data-key="Roadmap"
@@ -52,7 +52,7 @@ const entityId = computed(() => {
         <template #menu="{ entity }">
             <RoadmapDescriptorMenu :route="entity" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <i18n>
 es:
diff --git a/src/pages/Route/Roadmap/RoadmapFilter.vue b/src/pages/Route/Roadmap/RoadmapFilter.vue
index 982f1efba54..9acbfb740ad 100644
--- a/src/pages/Route/Roadmap/RoadmapFilter.vue
+++ b/src/pages/Route/Roadmap/RoadmapFilter.vue
@@ -31,12 +31,12 @@ const emit = defineEmits(['search']);
         <template #body="{ params }">
             <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                    <VnInputDate v-model="params.from" :label="t('From')" filled />
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                    <VnInputDate v-model="params.to" :label="t('To')" filled />
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">
@@ -44,7 +44,7 @@ const emit = defineEmits(['search']);
                     <VnInput
                         v-model="params.tractorPlate"
                         :label="t('Tractor Plate')"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>
@@ -54,7 +54,7 @@ const emit = defineEmits(['search']);
                     <VnInput
                         v-model="params.trailerPlate"
                         :label="t('Trailer Plate')"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>
@@ -66,8 +66,7 @@ const emit = defineEmits(['search']);
                         :fields="['id', 'nickname']"
                         v-model="params.supplierFk"
                         dense
-                        outlined
-                        rounded
+                        filled
                         emit-value
                         map-options
                         use-input
@@ -81,7 +80,7 @@ const emit = defineEmits(['search']);
                         v-model="params.price"
                         :label="t('Price')"
                         type="number"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>
@@ -91,7 +90,7 @@ const emit = defineEmits(['search']);
                     <VnInput
                         v-model="params.driverName"
                         :label="t('Driver name')"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>
@@ -101,7 +100,7 @@ const emit = defineEmits(['search']);
                     <VnInput
                         v-model="params.phone"
                         :label="t('Phone')"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>
diff --git a/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue b/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue
index 10c9fa9e291..bab7fa998ef 100644
--- a/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import VnLv from 'src/components/ui/VnLv.vue';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -20,7 +20,7 @@ const route = useRoute();
 const entityId = computed(() => props.id || route.params.id);
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Vehicles/${entityId}`"
         data-key="Vehicle"
         title="numberPlate"
@@ -54,7 +54,7 @@ const entityId = computed(() => props.id || route.params.id);
             <VnLv :label="$t('globals.model')" :value="entity.model" />
             <VnLv :label="$t('globals.country')" :value="entity.countryCodeFk" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <i18n>
 es:
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 5e618aa7f46..2405467daa5 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import ShelvingDescriptorMenu from 'pages/Shelving/Card/ShelvingDescriptorMenu.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
@@ -24,7 +24,7 @@ const entityId = computed(() => {
 });
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Shelvings/${entityId}`"
         :filter="filter"
         title="code"
@@ -45,5 +45,5 @@ const entityId = computed(() => {
         <template #menu="{ entity }">
             <ShelvingDescriptorMenu :shelving="entity" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index 88d716046a2..35657a97258 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -39,15 +39,14 @@ const emit = defineEmits(['search']);
                         option-label="code"
                         :filter-options="['id', 'code']"
                         dense
-                        outlined
-                        rounded
+                        filled
                         sort-by="code ASC"
                     />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnSelectWorker v-model="params.userFk" outlined rounded />
+                    <VnSelectWorker v-model="params.userFk" filled />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-md">
diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
index 07b168f874d..0e01238a0ea 100644
--- a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import filter from './ParkingFilter.js';
 const props = defineProps({
@@ -16,7 +16,7 @@ const route = useRoute();
 const entityId = computed(() => props.id || route.params.id);
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         data-key="Parking"
         :url="`Parkings/${entityId}`"
         title="code"
@@ -28,5 +28,5 @@ const entityId = computed(() => props.id || route.params.id);
             <VnLv :label="$t('parking.pickingOrder')" :value="entity.pickingOrder" />
             <VnLv :label="$t('parking.sector')" :value="entity.sector?.description" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
diff --git a/src/pages/Shelving/Parking/ParkingFilter.vue b/src/pages/Shelving/Parking/ParkingFilter.vue
index 1d7c3a4b605..59cb4945946 100644
--- a/src/pages/Shelving/Parking/ParkingFilter.vue
+++ b/src/pages/Shelving/Parking/ParkingFilter.vue
@@ -36,11 +36,7 @@ const emit = defineEmits(['search']);
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('params.code')"
-                        v-model="params.code"
-                        is-outlined
-                    />
+                    <VnInput :label="t('params.code')" v-model="params.code" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -51,8 +47,7 @@ const emit = defineEmits(['search']);
                         option-label="description"
                         :label="t('params.sectorFk')"
                         dense
-                        outlined
-                        rounded
+                        filled
                         :options="sectors"
                         use-input
                         input-debounce="0"
diff --git a/src/pages/Supplier/Card/SupplierBalanceFilter.vue b/src/pages/Supplier/Card/SupplierBalanceFilter.vue
index c4b63d9c8b4..c727688ad06 100644
--- a/src/pages/Supplier/Card/SupplierBalanceFilter.vue
+++ b/src/pages/Supplier/Card/SupplierBalanceFilter.vue
@@ -33,7 +33,7 @@ defineProps({
                         :label="t('params.from')"
                         v-model="params.from"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -47,8 +47,7 @@ defineProps({
                         :include="{ relation: 'accountingType' }"
                         sort-by="id"
                         dense
-                        outlined
-                        rounded
+                        filled
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -74,8 +73,7 @@ defineProps({
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 390f7d9ff76..e21e37eb384 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -25,20 +25,12 @@ defineProps({
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.search"
-                        :label="t('params.search')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.search" :label="t('params.search')" filled />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.itemId"
-                        :label="t('params.itemId')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.itemId" :label="t('params.itemId')" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -54,8 +46,7 @@ defineProps({
                         option-label="nickname"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -73,8 +64,7 @@ defineProps({
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -102,8 +92,7 @@ defineProps({
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -113,7 +102,7 @@ defineProps({
                         :label="t('params.from')"
                         v-model="params.from"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -123,7 +112,7 @@ defineProps({
                         :label="t('params.to')"
                         v-model="params.to"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 462bdf853ae..2863784abcf 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -3,7 +3,7 @@ import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { toDateString } from 'src/filters';
@@ -61,7 +61,7 @@ const getEntryQueryParams = (supplier) => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Suppliers/${entityId}`"
         :filter="filter"
         data-key="Supplier"
@@ -136,7 +136,7 @@ const getEntryQueryParams = (supplier) => {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 743f2188c05..96920231c31 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import DepartmentDescriptorProxy from 'pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { toDateTimeFormat } from 'src/filters/date';
@@ -57,7 +57,7 @@ function getInfo() {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Tickets/${entityId}`"
         :filter="filter"
         data-key="Ticket"
@@ -155,7 +155,7 @@ function getInfo() {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>
diff --git a/src/pages/Ticket/Negative/TicketLackFilter.vue b/src/pages/Ticket/Negative/TicketLackFilter.vue
index 3762f453d87..73d53b247b1 100644
--- a/src/pages/Ticket/Negative/TicketLackFilter.vue
+++ b/src/pages/Ticket/Negative/TicketLackFilter.vue
@@ -81,7 +81,7 @@ const setUserParams = (params) => {
                             v-model="params.days"
                             :label="t('negative.days')"
                             dense
-                            is-outlined
+                            filled
                             type="number"
                             @update:model-value="
                                 (value) => {
@@ -97,7 +97,7 @@ const setUserParams = (params) => {
                             v-model="params.id"
                             :label="t('negative.id')"
                             dense
-                            is-outlined
+                            filled
                         />
                     </QItemSection>
                 </QItem>
@@ -107,7 +107,7 @@ const setUserParams = (params) => {
                             v-model="params.producer"
                             :label="t('negative.producer')"
                             dense
-                            is-outlined
+                            filled
                         />
                     </QItemSection>
                 </QItem>
@@ -117,7 +117,7 @@ const setUserParams = (params) => {
                             v-model="params.origen"
                             :label="t('negative.origen')"
                             dense
-                            is-outlined
+                            filled
                         />
                     </QItemSection> </QItem
                 ><QItem>
@@ -133,8 +133,7 @@ const setUserParams = (params) => {
                             option-label="name"
                             hide-selected
                             dense
-                            outlined
-                            rounded
+                            filled
                         /> </QItemSection
                     ><QItemSection v-else>
                         <QSkeleton class="full-width" type="QSelect" />
@@ -151,8 +150,7 @@ const setUserParams = (params) => {
                             option-label="name"
                             hide-selected
                             dense
-                            outlined
-                            rounded
+                            filled
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index 6d5c7726e17..f065eaf2ee1 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -71,7 +71,7 @@ onMounted(async () => await getItemPackingTypes());
                     <VnInputDate
                         v-model="params.dateFuture"
                         :label="t('params.dateFuture')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -80,7 +80,7 @@ onMounted(async () => await getItemPackingTypes());
                     <VnInputDate
                         v-model="params.dateToAdvance"
                         :label="t('params.dateToAdvance')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -95,8 +95,7 @@ onMounted(async () => await getItemPackingTypes());
                         :info="t('iptInfo')"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
-                        rounded
+                        filled
                         :use-like="false"
                     >
                     </VnSelect>
@@ -113,8 +112,7 @@ onMounted(async () => await getItemPackingTypes());
                         :info="t('iptInfo')"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
-                        rounded
+                        filled
                         :use-like="false"
                     >
                     </VnSelect>
@@ -125,7 +123,7 @@ onMounted(async () => await getItemPackingTypes());
                     <VnInputNumber
                         v-model="params.scopeDays"
                         :label="t('Days onward')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -147,8 +145,7 @@ onMounted(async () => await getItemPackingTypes());
                         url="Departments"
                         :fields="['id', 'name']"
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -162,8 +159,7 @@ onMounted(async () => await getItemPackingTypes());
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
-                        rounded
+                        filled
                     >
                     </VnSelect>
                 </QItemSection>
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index f959157f68a..b763ef970ff 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -63,18 +63,10 @@ const getGroupedStates = (data) => {
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.clientFk"
-                        :label="t('Customer ID')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.clientFk" :label="t('Customer ID')" filled />
                 </QItemSection>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.orderFk"
-                        :label="t('Order ID')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.orderFk" :label="t('Order ID')" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -82,7 +74,7 @@ const getGroupedStates = (data) => {
                     <VnInputDate
                         v-model="params.from"
                         :label="t('From')"
-                        is-outlined
+                        filled
                         data-cy="From_date"
                     />
                 </QItemSection>
@@ -90,7 +82,7 @@ const getGroupedStates = (data) => {
                     <VnInputDate
                         v-model="params.to"
                         :label="t('To')"
-                        is-outlined
+                        filled
                         data-cy="To_date"
                     />
                 </QItemSection>
@@ -98,9 +90,8 @@ const getGroupedStates = (data) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
                         option-value="id"
@@ -125,8 +116,7 @@ const getGroupedStates = (data) => {
                         map-options
                         use-input
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -146,19 +136,14 @@ const getGroupedStates = (data) => {
                         map-options
                         use-input
                         dense
-                        outlined
-                        rounded
+                        filled
                         sort-by="name ASC"
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.refFk"
-                        :label="t('Invoice Ref.')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.refFk" :label="t('Invoice Ref.')" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -166,17 +151,13 @@ const getGroupedStates = (data) => {
                     <VnInput
                         v-model="params.scopeDays"
                         :label="t('Days onward')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.nickname"
-                        :label="t('Nickname')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.nickname" :label="t('Nickname')" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -241,8 +222,7 @@ const getGroupedStates = (data) => {
                         map-options
                         use-input
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -260,8 +240,7 @@ const getGroupedStates = (data) => {
                         map-options
                         use-input
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -281,8 +260,7 @@ const getGroupedStates = (data) => {
                         map-options
                         use-input
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -291,7 +269,7 @@ const getGroupedStates = (data) => {
                     <VnInput
                         v-model="params.collectionFk"
                         :label="t('Collection')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index 64e060a3921..033b47f7218 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -73,7 +73,7 @@ onMounted(async () => {
                     <VnInputDate
                         v-model="params.originScopeDays"
                         :label="t('params.originScopeDays')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -82,7 +82,7 @@ onMounted(async () => {
                     <VnInputDate
                         v-model="params.futureScopeDays"
                         :label="t('params.futureScopeDays')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -91,7 +91,7 @@ onMounted(async () => {
                     <VnInput
                         :label="t('params.litersMax')"
                         v-model="params.litersMax"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -100,7 +100,7 @@ onMounted(async () => {
                     <VnInput
                         :label="t('params.linesMax')"
                         v-model="params.linesMax"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -115,8 +115,7 @@ onMounted(async () => {
                         :info="t('iptInfo')"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
-                        rounded
+                        filled
                     >
                     </VnSelect>
                 </QItemSection>
@@ -132,8 +131,7 @@ onMounted(async () => {
                         :info="t('iptInfo')"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
-                        rounded
+                        filled
                     >
                     </VnSelect>
                 </QItemSection>
@@ -148,8 +146,7 @@ onMounted(async () => {
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
-                        rounded
+                        filled
                     >
                     </VnSelect>
                 </QItemSection>
@@ -164,8 +161,7 @@ onMounted(async () => {
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
-                        rounded
+                        filled
                     >
                     </VnSelect>
                 </QItemSection>
@@ -191,8 +187,7 @@ onMounted(async () => {
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
-                        rounded
+                        filled
                     >
                     </VnSelect>
                 </QItemSection>
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 922f89f333f..d4903f7940a 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
@@ -31,7 +31,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Travels/${entityId}`"
         :title="data.title"
         :subtitle="data.subtitle"
@@ -79,7 +79,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index ae6e695becf..76ffdba206c 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -87,7 +87,7 @@ warehouses();
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput label="id" v-model="params.id" is-outlined />
+                    <VnInput label="id" v-model="params.id" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -95,7 +95,7 @@ warehouses();
                     <VnInput
                         :label="t('extraCommunity.filter.reference')"
                         v-model="params.reference"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -106,8 +106,7 @@ warehouses();
                         type="number"
                         :label="t('extraCommunity.filter.totalEntries')"
                         dense
-                        outlined
-                        rounded
+                        filled
                         min="0"
                         class="input-number"
                     >
@@ -141,8 +140,7 @@ warehouses();
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -152,7 +150,7 @@ warehouses();
                         :label="t('extraCommunity.filter.shippedFrom')"
                         v-model="params.shippedFrom"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -162,7 +160,7 @@ warehouses();
                         :label="t('extraCommunity.filter.landedTo')"
                         v-model="params.landedTo"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -176,8 +174,7 @@ warehouses();
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -191,8 +188,7 @@ warehouses();
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -206,8 +202,7 @@ warehouses();
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -218,8 +213,7 @@ warehouses();
                         v-model="params.cargoSupplierFk"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -229,8 +223,7 @@ warehouses();
                         v-model="params.entrySupplierFk"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -245,8 +238,7 @@ warehouses();
                         :filter-options="['code', 'name']"
                         hide-selected
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 4a9c8095260..a26cc0ec090 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -33,19 +33,14 @@ defineExpose({ states });
         </template>
         <template #body="{ params, searchFn }">
             <div class="q-pa-sm q-gutter-y-sm">
-                <VnInput
-                    :label="t('travel.Id')"
-                    v-model="params.id"
-                    lazy-rules
-                    is-outlined
-                >
+                <VnInput :label="t('travel.Id')" v-model="params.id" lazy-rules filled>
                     <template #prepend> <QIcon name="badge" size="xs" /></template>
                 </VnInput>
                 <VnInput
                     :label="t('travel.ref')"
                     v-model="params.ref"
                     lazy-rules
-                    is-outlined
+                    filled
                 />
                 <VnSelect
                     :label="t('travel.agency')"
@@ -56,8 +51,7 @@ defineExpose({ states });
                     :use-like="false"
                     option-filter="name"
                     dense
-                    outlined
-                    rounded
+                    filled
                 />
                 <VnSelect
                     :label="t('travel.warehouseInFk')"
@@ -69,22 +63,19 @@ defineExpose({ states });
                     option-label="name"
                     option-filter="name"
                     dense
-                    outlined
-                    rounded
+                    filled
                 />
                 <VnInputDate
                     :label="t('travel.shipped')"
                     v-model="params.shipped"
                     @update:model-value="searchFn()"
-                    outlined
-                    rounded
+                    filled
                 />
                 <VnInputTime
                     v-model="params.shipmentHour"
                     @update:model-value="searchFn()"
                     :label="t('travel.shipmentHour')"
-                    outlined
-                    rounded
+                    filled
                     dense
                 />
                 <VnSelect
@@ -97,36 +88,33 @@ defineExpose({ states });
                     option-label="name"
                     option-filter="name"
                     dense
-                    outlined
-                    rounded
+                    filled
                 />
                 <VnInputDate
                     :label="t('travel.landed')"
                     v-model="params.landed"
                     @update:model-value="searchFn()"
                     dense
-                    outlined
-                    rounded
+                    filled
                 />
                 <VnInputTime
                     v-model="params.landingHour"
                     @update:model-value="searchFn()"
                     :label="t('travel.landingHour')"
-                    outlined
-                    rounded
+                    filled
                     dense
                 />
                 <VnInput
                     :label="t('travel.totalEntries')"
                     v-model="params.totalEntries"
                     lazy-rules
-                    is-outlined
+                    filled
                 />
                 <VnInput
                     :label="t('travel.daysOnward')"
                     v-model="params.daysOnward"
                     lazy-rules
-                    is-outlined
+                    filled
                 />
             </div>
         </template>
diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 48fc4094b8f..f0e2d758a52 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -40,7 +40,7 @@ watch(
     (newValue) => {
         checkHolidays(newValue);
     },
-    { deep: true, immediate: true }
+    { deep: true, immediate: true },
 );
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
@@ -174,8 +174,7 @@ const yearList = ref(generateYears());
                     v-model="selectedYear"
                     :options="yearList"
                     dense
-                    outlined
-                    rounded
+                    filled
                     use-input
                     :is-clearable="false"
                 />
@@ -188,8 +187,7 @@ const yearList = ref(generateYears());
                     option-value="businessFk"
                     option-label="businessFk"
                     dense
-                    outlined
-                    rounded
+                    filled
                     use-input
                     :is-clearable="false"
                 >
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 910c92fd83b..060520e843b 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -2,7 +2,7 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'src/components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
@@ -52,7 +52,7 @@ const handlePhotoUpdated = (evt = false) => {
 };
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         ref="cardDescriptorRef"
         :data-key="dataKey"
         :summary="$props.summary"
@@ -167,7 +167,7 @@ const handlePhotoUpdated = (evt = false) => {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
     <VnChangePassword
         ref="changePassRef"
         :submit-fn="
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index d329414946c..001eb368aef 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -5,24 +5,25 @@ import { ref, computed } from 'vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'src/composables/useArrayData';
+import { downloadDocuware } from 'src/composables/downloadFile';
+
 import FetchData from 'components/FetchData.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
-import { useVnConfirm } from 'composables/useVnConfirm';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
-
-const paginate = ref();
+const loadingDocuware = ref(true);
+const tableRef = ref();
 const dialog = ref();
 const route = useRoute();
 const { openConfirmationModal } = useVnConfirm();
 const routeId = computed(() => route.params.id);
-
+const worker = computed(() => useArrayData('Worker').store.data);
 const initialData = computed(() => {
     return {
         userFk: routeId.value,
@@ -31,154 +32,268 @@ const initialData = computed(() => {
     };
 });
 
-const deallocatePDA = async (deviceProductionFk) => {
-    await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
-        pda: deviceProductionFk,
-    });
-    notify(t('PDA deallocated'), 'positive');
-
-    paginate.value.fetch();
-};
+const columns = computed(() => [
+    {
+        align: 'center',
+        label: t('globals.state'),
+        name: 'state',
+        format: (row) => row?.docuware?.state,
+        columnFilter: false,
+        chip: {
+            condition: (_, row) => !!row.docuware,
+            color: (row) => (isSigned(row) ? 'bg-positive' : 'bg-warning'),
+        },
+        visible: false,
+    },
+    {
+        align: 'right',
+        label: t('worker.pda.currentPDA'),
+        name: 'deviceProductionFk',
+        columnClass: 'shrink',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('Model'),
+        name: 'modelFk',
+        format: ({ deviceProduction }) => deviceProduction.modelFk,
+        cardVisible: true,
+    },
+    {
+        align: 'right',
+        label: t('Serial number'),
+        name: 'serialNumber',
+        format: ({ deviceProduction }) => deviceProduction.serialNumber,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('Current SIM'),
+        name: 'simFk',
+        cardVisible: true,
+    },
+    {
+        align: 'right',
+        name: 'actions',
+        columnFilter: false,
+        cardVisible: true,
+    },
+]);
 
 function reloadData() {
     initialData.value.deviceProductionFk = null;
     initialData.value.simFk = null;
-    paginate.value.fetch();
+    tableRef.value.reload();
+}
+
+async function fetchDocuware() {
+    loadingDocuware.value = true;
+
+    const id = `${worker.value?.lastName} ${worker.value?.firstName}`;
+    const rows = tableRef.value.CrudModelRef.formData;
+
+    const promises = rows.map(async (row) => {
+        const { data } = await axios.post(`Docuwares/${id}/checkFile`, {
+            fileCabinet: 'hr',
+            signed: false,
+            mergeFilter: [
+                {
+                    DBName: 'TIPO_DOCUMENTO',
+                    Value: ['PDA'],
+                },
+                {
+                    DBName: 'FILENAME',
+                    Value: [`${row.deviceProductionFk}-pda`],
+                },
+            ],
+        });
+        row.docuware = data;
+    });
+
+    await Promise.allSettled(promises);
+    loadingDocuware.value = false;
+}
+
+async function sendToTablet(rows) {
+    const promises = rows.map(async (row) => {
+        await axios.post(`Docuwares/upload-pda-pdf`, {
+            ids: [row.deviceProductionFk],
+        });
+        row.docuware = true;
+    });
+    await Promise.allSettled(promises);
+    notify(t('PDF sended to signed'), 'positive');
+    tableRef.value.reload();
+}
+
+async function deallocatePDA(deviceProductionFk) {
+    await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
+        pda: deviceProductionFk,
+    });
+    const index = tableRef.value.CrudModelRef.formData.findIndex(
+        (data) => data?.deviceProductionFk == deviceProductionFk,
+    );
+    delete tableRef.value.CrudModelRef.formData[index];
+    notify(t('PDA deallocated'), 'positive');
+}
+
+function isSigned(row) {
+    return row.docuware?.state === 'Firmado';
 }
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md centerCard">
-        <FetchData
-            url="workers/getAvailablePda"
-            @on-fetch="(data) => (deviceProductions = data)"
-            auto-load
-        />
-        <VnPaginate
-            ref="paginate"
-            data-key="WorkerPda"
-            url="DeviceProductionUsers"
-            :user-filter="{ where: { userFk: routeId } }"
-            order="id"
-            search-url="pda"
-            auto-load
-        >
-            <template #body="{ rows }">
-                <QCard
-                    flat
-                    bordered
-                    :key="row.id"
-                    v-for="row of rows"
-                    class="card q-px-md q-mb-sm container"
-                >
-                    <VnRow>
-                        <VnInput
-                            :label="t('worker.pda.currentPDA')"
-                            :model-value="row?.deviceProductionFk"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Model')"
-                            :model-value="row?.deviceProduction?.modelFk"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Serial number')"
-                            :model-value="row?.deviceProduction?.serialNumber"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Current SIM')"
-                            :model-value="row?.simFk"
-                            disable
-                        />
-                        <QBtn
-                            flat
-                            icon="delete"
-                            color="primary"
-                            class="btn-delete"
-                            @click="
-                                openConfirmationModal(
-                                    t(`Remove PDA`),
-                                    t('Do you want to remove this PDA?'),
-                                    () => deallocatePDA(row.deviceProductionFk),
-                                )
-                            "
-                        >
-                            <QTooltip>
-                                {{ t('worker.pda.removePDA') }}
-                            </QTooltip>
-                        </QBtn>
-                    </VnRow>
-                </QCard>
-            </template>
-        </VnPaginate>
-        <QPageSticky :offset="[18, 18]">
+    <FetchData
+        url="workers/getAvailablePda"
+        @on-fetch="(data) => (deviceProductions = data)"
+        auto-load
+    />
+    <VnTable
+        ref="tableRef"
+        data-key="WorkerPda"
+        url="DeviceProductionUsers"
+        :user-filter="{ order: 'id' }"
+        :filter="{ where: { userFk: routeId } }"
+        search-url="pda"
+        auto-load
+        :columns="columns"
+        @onFetch="fetchDocuware"
+        :hasSubToolbar="true"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
+        :table="{
+            'row-key': 'deviceProductionFk',
+            selection: 'multiple',
+        }"
+        :table-filter="{ hiddenTags: ['userFk'] }"
+    >
+        <template #moreBeforeActions>
             <QBtn
-                @click.stop="dialog.show()"
+                :label="t('globals.refresh')"
+                icon="refresh"
+                @click="tableRef.reload()"
+            />
+            <QBtn
+                :disable="!tableRef?.selected?.length"
+                :label="t('globals.send')"
+                icon="install_mobile"
+                @click="sendToTablet(tableRef?.selected)"
+                class="bg-primary"
+            />
+        </template>
+        <template #column-actions="{ row }">
+            <QBtn
+                flat
+                icon="delete"
                 color="primary"
-                fab
-                icon="add"
-                v-shortcut="'+'"
+                @click="
+                    openConfirmationModal(
+                        t(`Remove PDA`),
+                        t('Do you want to remove this PDA?'),
+                        () => deallocatePDA(row.deviceProductionFk),
+                    )
+                "
+                data-cy="workerPda-remove"
             >
-                <QDialog ref="dialog">
-                    <FormModelPopup
-                        :title="t('Add new device')"
-                        url-create="DeviceProductionUsers"
-                        model="DeviceProductionUser"
-                        :form-initial-data="initialData"
-                        @on-data-saved="reloadData()"
-                    >
-                        <template #form-inputs="{ data }">
-                            <VnRow>
-                                <VnSelect
-                                    :label="t('worker.pda.newPDA')"
-                                    v-model="data.deviceProductionFk"
-                                    :options="deviceProductions"
-                                    option-label="id"
-                                    option-value="id"
-                                    id="deviceProductionFk"
-                                    hide-selected
-                                    data-cy="pda-dialog-select"
-                                    :required="true"
-                                >
-                                    <template #option="scope">
-                                        <QItem v-bind="scope.itemProps">
-                                            <QItemSection>
-                                                <QItemLabel
-                                                    >ID: {{ scope.opt?.id }}</QItemLabel
-                                                >
-                                                <QItemLabel caption>
-                                                    {{ scope.opt?.modelFk }},
-                                                    {{ scope.opt?.serialNumber }}
-                                                </QItemLabel>
-                                            </QItemSection>
-                                        </QItem>
-                                    </template>
-                                </VnSelect>
-                                <VnInput
-                                    v-model="data.simFk"
-                                    :label="t('SIM serial number')"
-                                    id="simSerialNumber"
-                                    use-input
-                                />
-                            </VnRow>
-                        </template>
-                    </FormModelPopup>
-                </QDialog>
+                <QTooltip>
+                    {{ t('worker.pda.removePDA') }}
+                </QTooltip>
             </QBtn>
-            <QTooltip>
-                {{ t('globals.new') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+            <QBtn
+                v-if="!isSigned(row)"
+                :loading="loadingDocuware"
+                icon="install_mobile"
+                flat
+                color="primary"
+                @click="
+                    openConfirmationModal(
+                        t('Sign PDA'),
+                        t('Are you sure you want to send it?'),
+                        () => sendToTablet([row]),
+                    )
+                "
+                data-cy="workerPda-send"
+            >
+                <QTooltip>
+                    {{ t('worker.pda.sendToTablet') }}
+                </QTooltip>
+            </QBtn>
+            <QBtn
+                v-if="isSigned(row)"
+                :loading="loadingDocuware"
+                icon="cloud_download"
+                flat
+                color="primary"
+                @click="
+                    downloadDocuware('Docuwares/download-pda-pdf', {
+                        file: row.deviceProductionFk + '-pda',
+                        worker: worker?.lastName + ' ' + worker?.firstName,
+                    })
+                "
+                data-cy="workerPda-download"
+            >
+                <QTooltip>
+                    {{ t('worker.pda.download') }}
+                </QTooltip>
+            </QBtn>
+        </template>
+    </VnTable>
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" v-shortcut="'+'">
+            <QDialog ref="dialog">
+                <FormModelPopup
+                    :title="t('Add new device')"
+                    url-create="DeviceProductionUsers"
+                    model="DeviceProductionUser"
+                    :form-initial-data="initialData"
+                    @on-data-saved="reloadData()"
+                >
+                    <template #form-inputs="{ data }">
+                        <VnRow>
+                            <VnSelect
+                                :label="t('PDA')"
+                                v-model="data.deviceProductionFk"
+                                :options="deviceProductions"
+                                option-label="modelFk"
+                                option-value="id"
+                                id="deviceProductionFk"
+                                hide-selected
+                                data-cy="pda-dialog-select"
+                                :required="true"
+                            >
+                                <template #option="scope">
+                                    <QItem v-bind="scope.itemProps">
+                                        <QItemSection>
+                                            <QItemLabel
+                                                >ID: {{ scope.opt?.id }}</QItemLabel
+                                            >
+                                            <QItemLabel caption>
+                                                {{ scope.opt?.modelFk }},
+                                                {{ scope.opt?.serialNumber }}
+                                            </QItemLabel>
+                                        </QItemSection>
+                                    </QItem>
+                                </template>
+                            </VnSelect>
+                            <VnSelect
+                                url="Sims"
+                                option-label="line"
+                                option-value="code"
+                                v-model="data.simFk"
+                                :label="t('SIM serial number')"
+                                id="simSerialNumber"
+                            />
+                        </VnRow>
+                    </template>
+                </FormModelPopup>
+            </QDialog>
+        </QBtn>
+        <QTooltip>
+            {{ t('globals.new') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
-<style lang="scss" scoped>
-.btn-delete {
-    max-width: 4%;
-    margin-top: 30px;
-}
-</style>
 <i18n>
 es:
     Model: Modelo
@@ -190,4 +305,6 @@ es:
     Do you want to remove this PDA?: ¿Desea eliminar este PDA?
     You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
     This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+    Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
+    Sign PDA: Firmar PDA
 </i18n>
diff --git a/src/pages/Worker/Department/Card/DepartmentDescriptor.vue b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue
index 4b7dfd9b80d..82065859350 100644
--- a/src/pages/Worker/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue
@@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import VnLv from 'src/components/ui/VnLv.vue';
-import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'src/components/ui/EntityDescriptor.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -40,7 +40,7 @@ const removeDepartment = async () => {
 const { openConfirmationModal } = useVnConfirm();
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         ref="DepartmentDescriptorRef"
         :url="`Departments/${entityId}`"
         :summary="$props.summary"
@@ -95,7 +95,7 @@ const { openConfirmationModal } = useVnConfirm();
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 8210ba0e33b..44dfd32b4cb 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -35,7 +35,7 @@ const getLocale = (label) => {
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('FI')" v-model="params.fi" is-outlined
+                    <VnInput :label="t('FI')" v-model="params.fi" filled
                         ><template #prepend>
                             <QIcon name="badge" size="xs"></QIcon> </template
                     ></VnInput>
@@ -43,29 +43,17 @@ const getLocale = (label) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('First Name')"
-                        v-model="params.firstName"
-                        is-outlined
-                    />
+                    <VnInput :label="t('First Name')" v-model="params.firstName" filled />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('Last Name')"
-                        v-model="params.lastName"
-                        is-outlined
-                    />
+                    <VnInput :label="t('Last Name')" v-model="params.lastName" filled />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('User Name')"
-                        v-model="params.userName"
-                        is-outlined
-                    />
+                    <VnInput :label="t('User Name')" v-model="params.userName" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -79,23 +67,18 @@ const getLocale = (label) => {
                         emit-value
                         map-options
                         dense
-                        outlined
-                        rounded
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                    <VnInput :label="t('Email')" v-model="params.email" filled />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('Extension')"
-                        v-model="params.extension"
-                        is-outlined
-                    />
+                    <VnInput :label="t('Extension')" v-model="params.extension" filled />
                 </QItemSection>
             </QItem>
             <QItem>
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 27676212e65..f2bcc124788 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { toTimeFormat } from 'src/filters/date';
 import { toCurrency } from 'filters/index';
@@ -25,7 +25,7 @@ const entityId = computed(() => {
 </script>
 
 <template>
-    <CardDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone">
+    <EntityDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone">
         <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
         </template>
@@ -36,5 +36,5 @@ const entityId = computed(() => {
             <VnLv :label="$t('list.price')" :value="toCurrency(entity.price)" />
             <VnLv :label="$t('zone.bonus')" :value="toCurrency(entity.bonus)" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index a8cb05afccc..fc5c04b41bb 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -95,8 +95,7 @@ watch(
                 :filter-options="['code']"
                 hide-selected
                 dense
-                outlined
-                rounded
+                filled
                 map-key="geoFk"
                 data-cy="ZoneDeliveryDaysPostcodeSelect"
             >
@@ -128,8 +127,7 @@ watch(
                 option-label="name"
                 hide-selected
                 dense
-                outlined
-                rounded
+                filled
                 data-cy="ZoneDeliveryDaysAgencySelect"
             />
             <VnSelect
@@ -144,7 +142,6 @@ watch(
                 option-label="name"
                 hide-selected
                 dense
-                outlined
                 rounded
             />
         </div>
diff --git a/test/cypress/integration/vnComponent/VnLog.spec.js b/test/cypress/integration/vnComponent/VnLog.spec.js
index e857457a7d1..ae0013150ce 100644
--- a/test/cypress/integration/vnComponent/VnLog.spec.js
+++ b/test/cypress/integration/vnComponent/VnLog.spec.js
@@ -25,7 +25,7 @@ describe('VnLog', () => {
 
     it('should show claimDescriptor', () => {
         cy.dataCy('iconLaunch-claimFk').first().click();
-        cy.dataCy('cardDescriptor_subtitle').contains('1');
+        cy.dataCy('vnDescriptor_subtitle').contains('1');
         cy.dataCy('iconLaunch-claimFk').first().click();
     });
 });
diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
index 31ec19eda0e..2623e81cf42 100644
--- a/test/cypress/integration/worker/workerPda.spec.js
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -1,23 +1,80 @@
 describe('WorkerPda', () => {
-    const select = '[data-cy="pda-dialog-select"]';
+    const deviceId = 4;
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/worker/1110/pda`);
     });
 
-    it('assign pda', () => {
-        cy.addBtnClick();
-        cy.get(select).click();
-        cy.get(select).type('{downArrow}{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
+    it('assign and delete pda', () => {
+        creatNewPDA();
+        cy.checkNotification('Data created');
+        cy.visit(`/#/worker/1110/pda`);
+        removeNewPDA();
+        cy.checkNotification('PDA deallocated');
     });
 
-    it('delete pda', () => {
-        cy.get('.btn-delete').click();
-        cy.get(
-            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
-        ).click();
-        cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
+    it('send and download pdf to docuware', () => {
+        //Send
+        cy.intercept('POST', '/api/Docuwares/upload-pda-pdf', (req) => {
+            req.reply({
+                statusCode: 200,
+                body: {},
+            });
+        });
+
+        creatNewPDA();
+
+        cy.dataCy('workerPda-send').click();
+        cy.clickConfirm();
+        cy.checkNotification('PDF sended to signed');
+
+        //Download
+        cy.intercept('POST', /\/api\/Docuwares\/Jones%20Jessica\/checkFile/, (req) => {
+            req.reply({
+                statusCode: 200,
+                body: {
+                    id: deviceId,
+                    state: 'Firmado',
+                },
+            });
+        });
+        cy.get('#st-actions').contains('refresh').click();
+        cy.intercept('GET', '/api/Docuwares/download-pda-pdf**', (req) => {
+            req.reply({
+                statusCode: 200,
+                body: {},
+            });
+        });
+
+        cy.dataCy('workerPda-download').click();
+        removeNewPDA();
     });
+
+    it('send 2 pdfs to docuware', () => {
+        cy.intercept('POST', '/api/Docuwares/upload-pda-pdf', (req) => {
+            req.reply({
+                statusCode: 200,
+                body: {},
+            });
+        });
+
+        creatNewPDA();
+        creatNewPDA(2);
+        cy.selectRows([1, 2]);
+        cy.get('#st-actions').contains('Send').click();
+        cy.checkNotification('PDF sended to signed');
+
+        removeNewPDA();
+    });
+
+    function creatNewPDA(id = deviceId) {
+        cy.addBtnClick();
+        cy.selectOption('[data-cy="pda-dialog-select"]', id);
+        cy.saveCard();
+    }
+
+    function removeNewPDA() {
+        cy.dataCy('workerPda-remove').first().click();
+        cy.clickConfirm();
+    }
 });
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index de25959b2ca..fe8d38e7999 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -371,7 +371,7 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
 });
 
 Cypress.Commands.add('openActionsDescriptor', () => {
-    cy.get('[data-cy="cardDescriptor"] [data-cy="descriptor-more-opts"]').click();
+    cy.get('[data-cy="vnDescriptor"] [data-cy="descriptor-more-opts"]').click();
 });
 
 Cypress.Commands.add('openUserPanel', () => {
@@ -466,16 +466,16 @@ Cypress.Commands.add('validateDescriptor', (toCheck = {}) => {
 
     const popupSelector = popup ? '[role="menu"] ' : '';
 
-    if (title) cy.get(`${popupSelector}[data-cy="cardDescriptor_title"]`).contains(title);
+    if (title) cy.get(`${popupSelector}[data-cy="vnDescriptor_title"]`).contains(title);
     if (description)
-        cy.get(`${popupSelector}[data-cy="cardDescriptor_description"]`).contains(
+        cy.get(`${popupSelector}[data-cy="vnDescriptor_description"]`).contains(
             description,
         );
     if (subtitle)
-        cy.get(`${popupSelector}[data-cy="cardDescriptor_subtitle"]`).contains(subtitle);
+        cy.get(`${popupSelector}[data-cy="vnDescriptor_subtitle"]`).contains(subtitle);
 
     for (const index in listbox)
-        cy.get(`${popupSelector}[data-cy="cardDescriptor_listbox"] > *`)
+        cy.get(`${popupSelector}[data-cy="vnDescriptor_listbox"] > *`)
             .eq(index)
             .should('contain.text', listbox[index]);
 });

From 88c61c8a856b79bd289efaaa022ead0b26f1334c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 24 Mar 2025 14:27:18 +0100
Subject: [PATCH 35/47] fix: warmFix quasar build async function

---
 src/composables/downloadFile.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/composables/downloadFile.js b/src/composables/downloadFile.js
index 302836e09e9..0c4e8edb653 100644
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@@ -5,18 +5,19 @@ import { exportFile } from 'quasar';
 
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
-const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
+    const appUrl = await getAppUrl();
     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,
@@ -32,3 +33,7 @@ function download(response) {
 
     exportFile(filename, response.data);
 }
+
+async function getAppUrl() {
+    return (await getUrl('', 'lilium')).replace('/#/', '');
+}

From 535fe011f61f3511ff5cc2df7c1a942cb668c97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 24 Mar 2025 17:51:29 +0100
Subject: [PATCH 36/47] feat: refs #8529 add isDeductible column and
 localization for InvoiceIn summary

---
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue    | 16 ++++++++++++++++
 src/pages/InvoiceIn/Card/InvoiceInVat.vue        |  3 +--
 src/pages/InvoiceIn/locale/en.yml                |  1 +
 src/pages/InvoiceIn/locale/es.yml                |  1 +
 .../invoiceIn/invoiceInDescriptor.spec.js        |  3 ---
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 4f1140a9a23..d5fded4bc73 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -40,6 +40,13 @@ 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',
@@ -331,6 +338,15 @@ 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 }}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 5a868d32da2..61c3040aeae 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -55,7 +55,7 @@ const columns = computed(() => [
     },
     {
         name: 'isDeductible',
-        label: t('Deductible'),
+        label: t('invoiceIn.isDeductible'),
         field: (row) => row.isDeductible,
         model: 'isDeductible',
         align: 'center',
@@ -511,7 +511,6 @@ es:
     Create a new expense: Crear nuevo gasto
     Add tax: Crear gasto
     Taxable base: Base imp.
-    Deductible: Deducible
     Sage tax: Sage iva
     Sage transaction: Sage transacción
     Rate: Tasa
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 548e6c2010b..7e3603f0fb5 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -4,6 +4,7 @@ invoiceIn:
     serial: Serial
     isBooked: Is booked
     supplierRef: Invoice nº
+    isDeductible: Deductible
     list:
         ref: Reference
         supplier: Supplier
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 142d95f929c..e6ac9273c68 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -4,6 +4,7 @@ invoiceIn:
     serial: Serie
     isBooked: Contabilizada
     supplierRef: Nº factura
+    isDeductible: Deducible
     list:
         ref: Referencia
         supplier: Proveedor
diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
index ee1a5543466..7058e154ca7 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
@@ -1,7 +1,4 @@
 describe('InvoiceInDescriptor', () => {
-    const book = '.summaryHeader > .no-wrap > .q-btn';
-    const firstDescritorOpt = '.q-menu > .q-list > :nth-child(4) > .q-item__section';
-    const checkbox = ':nth-child(4) > .q-checkbox';
     beforeEach(() => cy.login('administrative'));
 
     describe('more options', () => {

From 8da61655e2cc10aa186989211332b795fe820060 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 24 Mar 2025 23:02:05 +0100
Subject: [PATCH 37/47] fix: refs #8602 disable use-like option in EntryBuys
 component

---
 src/pages/Entry/Card/EntryBuys.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 3990fde19c6..89c6d52c411 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -652,6 +652,7 @@ onMounted(() => {
                     :fields="['id', 'nickname']"
                     option-label="nickname"
                     sort-by="nickname ASC"
+                    :use-like="false"
                 />
                 <VnSelect
                     :label="t('Family')"

From ca4e02a2bf0e3a07ee91a88c83b20cd68b87cac1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 25 Mar 2025 08:39:19 +0100
Subject: [PATCH 38/47] chore: update changelog

---
 CHANGELOG.md | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 211 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd75a00a409..3b654a1ad5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,214 @@
+# 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 🆕

From 0014356b3358709a4d5401d49f592e1bf93a2109 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Mar 2025 10:08:58 +0100
Subject: [PATCH 39/47] fix: use store instead formData

---
 src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index 3c2fe95e568..76191b099ad 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -44,7 +44,7 @@ const getPriceDifference = async () => {
         shipped: ticket.value.shipped,
     };
     const { data } = await axios.post(
-        `tickets/${formData.value.id}/priceDifference`,
+        `tickets/${ticket.value.id}/priceDifference`,
         params,
     );
     ticket.value.sale = data;
@@ -71,7 +71,7 @@ const submit = async () => {
     };
 
     const { data } = await axios.post(
-        `tickets/${formData.value.id}/componentUpdate`,
+        `tickets/${ticket.value.id}/componentUpdate`,
         params,
     );
 

From 9446202dee42c3a48e2aacb17c5a04d626f1457d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 25 Mar 2025 11:30:09 +0100
Subject: [PATCH 40/47] fix: update file path in useDescriptorStore to remove
 leading slash

---
 src/stores/useDescriptorStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/useDescriptorStore.js b/src/stores/useDescriptorStore.js
index 89189f32ee1..c6a95fa851b 100644
--- a/src/stores/useDescriptorStore.js
+++ b/src/stores/useDescriptorStore.js
@@ -8,7 +8,7 @@ export const useDescriptorStore = defineStore('descriptorStore', () => {
         if (Object.keys(descriptors).length) return descriptors;
 
         const currentDescriptors = {};
-        const files = import.meta.glob(`/src/**/*DescriptorProxy.vue`);
+        const files = import.meta.glob(`src/**/*DescriptorProxy.vue`);
         const moduleParser = {
             account: 'user',
             client: 'customer',

From af5a850311debf2d612e4dd1d824a9d5a4d37ee2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Mar 2025 11:41:04 +0100
Subject: [PATCH 41/47] fix: remove create prop departmentFk

---
 src/pages/Customer/Card/CustomerDescriptor.vue  |  9 ---------
 .../Customer/Card/CustomerDescriptorMenu.vue    | 17 -----------------
 src/pages/Order/OrderList.vue                   |  1 -
 3 files changed, 27 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 8978c00f117..bd127c9ed39 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -105,15 +105,6 @@ 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"
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index aea45721c7a..fb78eab69cc 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -61,16 +61,6 @@ 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>
@@ -79,13 +69,6 @@ const updateSubstitutionAllowed = async () => {
             {{ 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>
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index d75390d96e4..1241c4ee24d 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -65,7 +65,6 @@ const columns = computed(() => [
         attrs: {
             url: 'Departments',
         },
-        create: true,
         columnField: {
             component: null,
         },

From c0e9efc5d8b36fafd33de1547c5b7cdab02eab13 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 25 Mar 2025 11:54:14 +0100
Subject: [PATCH 42/47] fix(useDescriptorStore): simplify async component
 import logic

---
 src/stores/useDescriptorStore.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/stores/useDescriptorStore.js b/src/stores/useDescriptorStore.js
index c6a95fa851b..4254117096a 100644
--- a/src/stores/useDescriptorStore.js
+++ b/src/stores/useDescriptorStore.js
@@ -16,9 +16,7 @@ export const useDescriptorStore = defineStore('descriptorStore', () => {
         for (const file in files) {
             const name = file.split('/').at(-1).slice(0, -19).toLowerCase();
             const descriptor = moduleParser[name] ?? name;
-            currentDescriptors[descriptor + 'Fk'] = defineAsyncComponent(
-                () => import(/* @vite-ignore */ file),
-            );
+            currentDescriptors[descriptor + 'Fk'] = defineAsyncComponent(files[file]);
         }
         setDescriptors(currentDescriptors);
         return currentDescriptors;

From 79e6530d3965e45174fb96ae3f74ba1dacf462c1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Mar 2025 12:23:49 +0100
Subject: [PATCH 43/47] docs: add production serving instructions to README

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index d280e29ceb5..8eff9913739 100644
--- a/README.md
+++ b/README.md
@@ -49,3 +49,9 @@ 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
+```

From 6dffa7823545a8b6995775343f31b0a008bce1ba Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 25 Mar 2025 12:47:43 +0100
Subject: [PATCH 44/47] fix(useDescriptorStore): correct file path for
 descriptor proxy imports

---
 src/stores/useDescriptorStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/useDescriptorStore.js b/src/stores/useDescriptorStore.js
index 4254117096a..a5b83a42e25 100644
--- a/src/stores/useDescriptorStore.js
+++ b/src/stores/useDescriptorStore.js
@@ -8,7 +8,7 @@ export const useDescriptorStore = defineStore('descriptorStore', () => {
         if (Object.keys(descriptors).length) return descriptors;
 
         const currentDescriptors = {};
-        const files = import.meta.glob(`src/**/*DescriptorProxy.vue`);
+        const files = import.meta.glob(`/src/**/*DescriptorProxy.vue`);
         const moduleParser = {
             account: 'user',
             client: 'customer',

From 31205d40d39de60b6cf6e6f3aad43163cd1b3cff Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 25 Mar 2025 14:01:29 +0100
Subject: [PATCH 45/47] fix: update default DMS code and improve filter
 handling in various components

---
 src/components/common/VnDmsInput.vue     |  2 +-
 src/pages/Entry/Card/EntryBuys.vue       |  2 +-
 src/pages/Entry/Card/EntryDescriptor.vue |  2 +-
 src/pages/Entry/EntryStockBought.vue     |  1 +
 src/pages/Travel/Card/TravelSummary.vue  | 10 ++++++----
 src/pages/Travel/TravelFilter.vue        |  4 +++-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnDmsInput.vue b/src/components/common/VnDmsInput.vue
index 25d625d5d8f..5a3ef351b6a 100644
--- a/src/components/common/VnDmsInput.vue
+++ b/src/components/common/VnDmsInput.vue
@@ -15,7 +15,7 @@ const editDownloadDisabled = ref(false);
 const $props = defineProps({
     defaultDmsCode: {
         type: String,
-        default: 'InvoiceIn',
+        default: 'invoiceIn',
     },
     disable: {
         type: Boolean,
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index a93b0801b4e..dedc9fc85dd 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -648,7 +648,7 @@ onMounted(() => {
         :url="`Entries/${entityId}/getBuyList`"
         search-url="EntryBuys"
         save-url="Buys/crud"
-        :filter="filter"
+        :filter="editableMode ? filter : {}"
         :disable-option="{ card: true }"
         v-model:selected="selectedRows"
         @on-fetch="() => footerFetchDataRef.fetch()"
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 784f6e8a342..9a8b797440d 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -147,7 +147,7 @@ async function deleteEntry() {
 <template>
     <CardDescriptor
         :url="`Entries/${entityId}`"
-        :user-filter="entryFilter"
+        :filter="entryFilter"
         title="supplier.nickname"
         data-key="Entry"
         width="lg-width"
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 6168f073708..9e97e2ad577 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -116,6 +116,7 @@ const filter = computed(() => ({
             hour: 0,
             minute: 0,
             second: 0,
+            milliseconds: 0,
         }),
         m3: { neq: null },
     },
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 9f955261181..da933de6052 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -199,7 +199,11 @@ const entriesTotals = computed(() => {
 
     entriesTableRows.value.forEach((row) => {
         for (const key in totals) {
-            totals[key] += row[key] || 0;
+            if (key === 'cc') {
+                totals[key] += Math.ceil(row[key] || 0);
+            } else {
+                totals[key] += row[key] || 0;
+            }
         }
     });
 
@@ -337,9 +341,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
                 <VnLv
                     :label="t('travel.summary.availabled')"
-                    :value="
-                        dashIfEmpty(toDateTimeFormat(travel.availabled))
-                    "
+                    :value="dashIfEmpty(toDateTimeFormat(travel.availabled))"
                 />
             </QCard>
             <QCard class="full-width">
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 4a9c8095260..d2cf6092d2a 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -89,7 +89,7 @@ defineExpose({ states });
                 />
                 <VnSelect
                     :label="t('travel.warehouseOut')"
-                    v-model="params.warehouseOut"
+                    v-model="params.warehouseOutFk"
                     @update:model-value="searchFn()"
                     url="warehouses"
                     :use-like="false"
@@ -140,6 +140,7 @@ en:
         ref: Reference
         agency: Agency
         warehouseInFk: Warehouse In
+        warehouseOutFk: Warehouse Out
         shipped: Shipped
         shipmentHour: Shipment Hour
         warehouseOut: Warehouse Out
@@ -153,6 +154,7 @@ es:
         ref: Referencia
         agency: Agencia
         warehouseInFk: Alm.Entrada
+        warehouseOutFk: Alm.Salida
         shipped: F.Envío
         shipmentHour: Hora de envío
         warehouseOut: Alm.Salida

From 659d73e11a559175f1b392955153d399e5650a1f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 26 Mar 2025 08:13:42 +0100
Subject: [PATCH 46/47] test: skip RouteAutonomous tests temporarily

---
 test/cypress/integration/route/routeAutonomous.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/route/routeAutonomous.spec.js b/test/cypress/integration/route/routeAutonomous.spec.js
index acf82bd95d6..08fd7d7eace 100644
--- a/test/cypress/integration/route/routeAutonomous.spec.js
+++ b/test/cypress/integration/route/routeAutonomous.spec.js
@@ -1,4 +1,4 @@
-describe('RouteAutonomous', () => {
+describe.skip('RouteAutonomous', () => {
     const getLinkSelector = (colField) =>
         `tr:first-child > [data-col-field="${colField}"] > .no-padding > .link`;
 

From bbc03ddcad713bce6fbcb14c26bf283bca12ff56 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 26 Mar 2025 08:30:20 +0100
Subject: [PATCH 47/47] fix: remove duplicated department selection from
 MonitorTicketFilter

---
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 447dd35b830..258a9058376 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -209,20 +209,6 @@ const getLocale = (label) => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        outlined
-                        dense
-                        rounded
-                        :label="t('globals.params.departmentFk')"
-                        v-model="params.department"
-                        option-label="name"
-                        option-value="name"
-                        url="Departments"
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect