From d82372c0a98dc3571529263a3ad9e9293a551ca7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 2 May 2024 17:13:53 +0200
Subject: [PATCH 01/44] feat: refs #6449 show summaryId

---
 src/components/common/VnLog.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 340a9e550..c8d69307e 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -49,6 +49,7 @@ const filter = {
         'changedModelId',
         'changedModelValue',
         'description',
+        'summaryId',
     ],
     include: [
         {
@@ -455,12 +456,12 @@ setLogTree();
                                 :style="{
                                     backgroundColor: useColor(modelLog.model),
                                 }"
-                                :title="modelLog.model"
+                                :title="`${modelLog.model} #${modelLog.id}`"
                             >
                                 {{ t(modelLog.modelI18n) }}
                             </QChip>
-                            <span class="model-id" v-if="modelLog.id"
-                                >#{{ modelLog.id }}</span
+                            <span class="model-id" v-if="modelLog.summaryId"
+                                >#{{ modelLog.summaryId }}</span
                             >
                             <span class="model-value" :title="modelLog.showValue">
                                 {{ modelLog.showValue }}

From 789dffe2e21e88ed05109542ffd7735cafc5078b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 19 Jun 2024 12:05:21 +0200
Subject: [PATCH 02/44] refs #6898 vntable, traductions

---
 src/i18n/locale/en.yml              |   8 ++
 src/i18n/locale/es.yml              |   8 ++
 src/pages/Supplier/SupplierList.vue | 141 +++++++++++++++-------------
 3 files changed, 90 insertions(+), 67 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 4e7d7bb8a..f740ba9e0 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1015,6 +1015,14 @@ supplier:
         payDay: Pay day
         account: Account
         newSupplier: New supplier
+        tableVisibleColumns:
+            id: Id
+            name: Name
+            nif: NIF/CIF
+            nickname: Alias
+            account: Account
+            payMethod: Pay Method
+            payDay: Pay Day
     summary:
         responsible: Responsible
         notes: Notes
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 68ffc4e5b..bf3b60ffc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1000,6 +1000,14 @@ supplier:
         payDay: Día de pago
         account: Cuenta
         newSupplier: Nuevo proveedor
+        tableVisibleColumns:
+            id: Id
+            name: Nombre
+            nif: NIF/CIF
+            nickname: Alias
+            account: Cuenta
+            payMethod: Método de pago
+            payDay: Dia de pago
     summary:
         responsible: Responsable
         notes: Notas
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index d53781a38..9491a938b 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -1,85 +1,92 @@
 <script setup>
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import SupplierSummary from './Card/SupplierSummary.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import SupplierListFilter from './SupplierListFilter.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
-const router = useRouter();
 const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
 
-function navigate(id) {
-    router.push({ path: `/supplier/${id}` });
-}
-
-const redirectToCreateView = () => {
-    router.push({ name: 'SupplierCreate' });
-};
+const columns = computed(() => [
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.id'),
+        name: 'id',
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.name'),
+        name: 'name',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.nif'),
+        name: 'nif',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.nickname'),
+        name: 'nickname',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.account'),
+        name: 'account',
+        create: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.payMethod'),
+        name: 'payMethodFk',
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'payMethods',
+            fields: ['id', 'name'],
+        },
+    },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.payDay'),
+        name: 'payDat',
+        create: true,
+        component: 'input',
+    },
+]);
 </script>
 
 <template>
-    <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
     <RightMenu>
         <template #right-panel>
             <SupplierListFilter data-key="SuppliersList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate data-key="SuppliersList" url="Suppliers/filter">
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="row.socialName"
-                        :id="row.id"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv label="NIF/CIF" :value="row.nif" />
-                            <VnLv label="Alias" :value="row.alias" />
-                            <VnLv
-                                :label="t('supplier.list.payMethod')"
-                                :value="row.payMethod"
-                            />
-                            <VnLv
-                                :label="t('supplier.list.payDeadline')"
-                                :title-label="t('invoiceOut.list.created')"
-                                :value="row.payDem"
-                            />
-                            <VnLv
-                                :label="t('supplier.list.payDay')"
-                                :value="row.payDay"
-                            />
-                            <VnLv
-                                :label="t('supplier.list.account')"
-                                :value="row.account"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, SupplierSummary)"
-                                color="primary"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
-            <QTooltip>
-                {{ t('supplier.list.newSupplier') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+    <VnTable
+        ref="SuppliersRef"
+        data-key="SuppliersList"
+        :url="`Suppliers`"
+        save-url="Suppliers/crud"
+        :create="{
+            urlCreate: 'suppliers',
+            title: t('Create Supplier'),
+            onDataSaved: () => tableRef.reload(),
+        }"
+        order="id ASC"
+        :columns="columns"
+        default-mode="table"
+        auto-load
+        :right-search="false"
+        :is-editable="true"
+        :use-model="true"
+    />
 </template>
 
 <i18n>

From a803250cb913e1a821ff6a1bb2eb230ee20ecf88 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 19 Jun 2024 13:01:31 +0200
Subject: [PATCH 03/44] refs #6898 fix create

---
 src/pages/Supplier/SupplierList.vue | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 9491a938b..89ab12a67 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -1,11 +1,12 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
-import SupplierListFilter from './SupplierListFilter.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
+const tableRef = ref();
 
 const columns = computed(() => [
     {
@@ -25,28 +26,24 @@ const columns = computed(() => [
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nif'),
         name: 'nif',
-        create: true,
         component: 'input',
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nickname'),
         name: 'nickname',
-        create: true,
         component: 'input',
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.account'),
         name: 'account',
-        create: true,
         component: 'input',
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payMethod'),
         name: 'payMethodFk',
-        create: true,
         component: 'select',
         attrs: {
             url: 'payMethods',
@@ -57,34 +54,34 @@ const columns = computed(() => [
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payDay'),
         name: 'payDat',
-        create: true,
         component: 'input',
     },
 ]);
 </script>
 
 <template>
-    <RightMenu>
+    <!-- <RightMenu>
         <template #right-panel>
             <SupplierListFilter data-key="SuppliersList" />
         </template>
-    </RightMenu>
+    </RightMenu> -->
     <VnTable
-        ref="SuppliersRef"
+        ref="tableRef"
         data-key="SuppliersList"
         :url="`Suppliers`"
         save-url="Suppliers/crud"
+        redirect="supplier"
         :create="{
-            urlCreate: 'suppliers',
+            urlCreate: 'Suppliers/newSupplier',
             title: t('Create Supplier'),
-            onDataSaved: () => tableRef.reload(),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
         }"
         order="id ASC"
         :columns="columns"
         default-mode="table"
         auto-load
         :right-search="false"
-        :is-editable="true"
         :use-model="true"
     />
 </template>

From 677e71d1a752dad74982f40dbb3ad55a303e9d95 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 26 Jun 2024 08:26:04 +0200
Subject: [PATCH 04/44] refactor: refs #7543 standarized descriptors

---
 src/pages/Agency/Card/AgencyDescriptor.vue    | 21 ++++++++++++
 src/pages/Claim/Card/ClaimDescriptor.vue      | 17 ++++++++++
 .../Customer/Card/CustomerDescriptor.vue      | 14 --------
 src/pages/Entry/Card/EntryDescriptor.vue      |  8 ++++-
 src/pages/Entry/Card/EntryDescriptorProxy.vue |  3 +-
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    | 17 +++++++++-
 .../Card/InvoiceInDescriptorProxy.vue         |  9 +++--
 src/pages/Order/Card/OrderDescriptor.vue      | 21 ++++++++++++
 src/pages/Route/Card/RouteDescriptor.vue      |  7 +++-
 src/pages/Route/Card/RouteDescriptorProxy.vue |  3 +-
 src/pages/Route/Roadmap/RoadmapDescriptor.vue | 17 ++++++++++
 .../Shelving/Card/ShelvingDescriptor.vue      | 26 +++++++++++++++
 .../Shelving/Card/ShelvingDescriptorProxy.vue |  5 +--
 src/pages/Ticket/Card/TicketDescriptor.vue    |  6 ++++
 .../Ticket/Card/TicketDescriptorProxy.vue     |  3 +-
 src/pages/Travel/Card/TravelDescriptor.vue    | 33 ++++++++-----------
 .../Travel/Card/TravelDescriptorProxy.vue     |  3 +-
 src/pages/Worker/Card/WorkerDescriptor.vue    |  1 +
 src/pages/Zone/Card/ZoneDescriptor.vue        | 27 ++++++---------
 src/pages/Zone/Card/ZoneDescriptorProxy.vue   |  3 +-
 20 files changed, 182 insertions(+), 62 deletions(-)

diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index b9772037c..8b6a6603e 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -28,8 +28,29 @@ const card = computed(() => store.data);
         :title="card?.name"
         :subtitle="props.id"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="garage_home"
+                color="white"
+                class="link"
+                :to="{ name: 'RouteList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #body="{ entity: agency }">
             <VnLv :label="t('globals.name')" :value="agency.name" />
         </template>
     </CardDescriptor>
 </template>
+
+<i18n>
+es:
+    Go to module index: Ir al índice del modulo
+</i18n>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 5336c4427..e4b96b5b6 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -61,6 +61,22 @@ onMounted(async () => {
         @on-fetch="setData"
         data-key="Claim"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="vn:claims"
+                color="white"
+                class="link"
+                :to="{ name: 'ClaimList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity" />
         </template>
@@ -171,4 +187,5 @@ onMounted(async () => {
         claimRate: Claming rate
     es:
         claimRate: Ratio de reclamación
+        Go to module index: Ir al índice del módulo
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 2d3b17bc9..5e688076a 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -45,20 +45,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         :summary="$props.summary"
         data-key="customerData"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                size="sm"
-                icon="vn:Person"
-                color="white"
-                :to="{ name: 'CustomerList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />
         </template>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 3c925ead6..317400181 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, watch } from 'vue';
+import { ref, computed, watch, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -10,6 +10,7 @@ import useCardDescription from 'src/composables/useCardDescription';
 import { useState } from 'src/composables/useState';
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
+import { getUrl } from 'src/composables/getUrl';
 
 const $props = defineProps({
     id: {
@@ -28,6 +29,7 @@ const { t } = useI18n();
 const { openReport } = usePrintService();
 const state = useState();
 const entryDescriptorRef = ref(null);
+const url = ref();
 
 const entryFilter = {
     include: [
@@ -69,6 +71,9 @@ const entryFilter = {
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+onMounted(async () => {
+    url.value = await getUrl('');
+});
 
 const data = ref(useCardDescription());
 const setData = (entity) =>
@@ -114,6 +119,7 @@ watch;
         :subtitle="data.subtitle"
         @on-fetch="setData"
         data-key="entry"
+        :summary="$props.summary"
     >
         <template #menu="{ entity }">
             <QItem v-ripple clickable @click="showEntryReport(entity)">
diff --git a/src/pages/Entry/Card/EntryDescriptorProxy.vue b/src/pages/Entry/Card/EntryDescriptorProxy.vue
index e1c05f1ac..17b542ec1 100644
--- a/src/pages/Entry/Card/EntryDescriptorProxy.vue
+++ b/src/pages/Entry/Card/EntryDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import EntryDescriptor from './EntryDescriptor.vue';
+import EntrySummary from './EntrySummary.vue';
 
 const $props = defineProps({
     id: {
@@ -11,6 +12,6 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <EntryDescriptor v-if="$props.id" :id="$props.id" />
+        <EntryDescriptor v-if="$props.id" :id="$props.id" :summary="EntrySummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 68dc5be4b..1381bdc73 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -9,6 +9,7 @@ import { useRole } from 'src/composables/useRole';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
+import useCardDescription from 'src/composables/useCardDescription';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import FetchData from 'src/components/FetchData.vue';
@@ -19,7 +20,16 @@ import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceInToBook from '../InvoiceInToBook.vue';
 
-const $props = defineProps({ id: { type: Number, default: null } });
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+});
 
 const { push, currentRoute } = useRouter();
 
@@ -252,6 +262,9 @@ const createInvoiceInCorrection = async () => {
     );
     push({ path: `/invoice-in/${correctingId}/summary` });
 };
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
 </script>
 <template>
     <FetchData
@@ -283,6 +296,8 @@ const createInvoiceInCorrection = async () => {
         :url="`InvoiceIns/${entityId}`"
         :filter="filter"
         title="supplierRef"
+        @on-fetch="setData"
+        :summary="$props.summary"
     >
         <template #menu="{ entity }">
             <InvoiceInToBook>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
index a36656c1d..e9ca762ed 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
-import InvoiceInDescriptor from "pages/InvoiceIn/Card/InvoiceInDescriptor.vue";
+import InvoiceInDescriptor from 'pages/InvoiceIn/Card/InvoiceInDescriptor.vue';
+import InvoiceInSummary from './InvoiceInSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,10 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <InvoiceInDescriptor v-if="$props.id" :id="$props.id" />
+        <InvoiceInDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="InvoiceInSummary"
+        />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 60e86d04e..92bc5ad66 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -87,6 +87,22 @@ const total = ref(null);
         @on-fetch="setData"
         data-key="orderData"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="vn:basket"
+                color="white"
+                class="link"
+                :to="{ name: 'OrderList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #menu="{ entity }">
             <OrderDescriptorMenu :order="entity" />
         </template>
@@ -137,3 +153,8 @@ const total = ref(null);
         </template>
     </CardDescriptor>
 </template>
+
+<i18n>
+es:
+    Go to module index: Ir al índice del módulo
+</i18n>
diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index 218764277..a0e0aaf3a 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -14,6 +14,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -74,8 +78,9 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         :filter="filter"
         :title="data.title"
         :subtitle="data.subtitle"
-        data-key="Routes"
+        data-key="routeData"
         @on-fetch="setData"
+        :summary="$props.summary"
     >
         <template #body="{ entity }">
             <VnLv :label="t('Date')" :value="toDate(entity?.created)" />
diff --git a/src/pages/Route/Card/RouteDescriptorProxy.vue b/src/pages/Route/Card/RouteDescriptorProxy.vue
index 541f9716a..1ff39a51e 100644
--- a/src/pages/Route/Card/RouteDescriptorProxy.vue
+++ b/src/pages/Route/Card/RouteDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
+import RouteSummary from './RouteSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,6 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <RouteDescriptor v-if="$props.id" :id="$props.id" />
+        <RouteDescriptor v-if="$props.id" :id="$props.id" :summary="RouteSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 788173688..78851ef5f 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -39,6 +39,22 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         data-key="Roadmap"
         @on-fetch="setData"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="vn:troncales"
+                color="white"
+                class="link"
+                :to="{ name: 'RouteList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #body="{ entity }">
             <VnLv :label="t('Roadmap')" :value="entity?.name" />
             <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" />
@@ -60,4 +76,5 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
 es:
     Roadmap: Troncal
     Carrier: Transportista
+    Go to module index: Ir al índice del módulo
 </i18n>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 6beca6d88..0fac92f65 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -14,6 +14,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -51,7 +55,24 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         :subtitle="data.subtitle"
         data-key="Shelvings"
         @on-fetch="setData"
+        :summary="$props.summary"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="vn:inventory"
+                color="white"
+                class="link"
+                :to="{ name: 'ShelvingList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #body="{ entity }">
             <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
             <VnLv :label="t('shelving.summary.parking')" :value="entity.parking?.code" />
@@ -69,3 +90,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         </template>
     </CardDescriptor>
 </template>
+
+<i18n>
+es:
+    Go to module index: Ir al indice del modulo
+</i18n>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptorProxy.vue b/src/pages/Shelving/Card/ShelvingDescriptorProxy.vue
index 8023271b0..9561b77db 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptorProxy.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
-import ShelvingDescriptor from "pages/Shelving/Card/ShelvingDescriptor.vue";
+import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
+import ShelvingSummary from './ShelvingSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,6 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <ShelvingDescriptor v-if="$props.id" :id="$props.id" />
+        <ShelvingDescriptor v-if="$props.id" :id="$props.id" :summary="ShelvingSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index dfbcfc106..3c5e6c80d 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -16,6 +16,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -83,6 +87,7 @@ const setData = (entity) =>
         :subtitle="data.subtitle"
         data-key="ticketData"
         @on-fetch="setData"
+        :summary="$props.summary"
     >
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />
@@ -153,4 +158,5 @@ const setData = (entity) =>
 <i18n>
 es:
     This ticket is deleted: Este ticket está eliminado
+    Go to module index: Ir al índice del modulo
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketDescriptorProxy.vue b/src/pages/Ticket/Card/TicketDescriptorProxy.vue
index 7799b9ee6..583ba35e7 100644
--- a/src/pages/Ticket/Card/TicketDescriptorProxy.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import TicketDescriptor from './TicketDescriptor.vue';
+import TicketSummary from './TicketSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,6 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <TicketDescriptor v-if="$props.id" :id="$props.id" />
+        <TicketDescriptor v-if="$props.id" :id="$props.id" :summary="TicketSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 6d3707828..0b768ef22 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -1,10 +1,11 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
 
 import { toDate } from 'src/filters';
@@ -15,6 +16,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -51,32 +56,22 @@ const filter = {
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.id));
 </script>
 
 <template>
     <CardDescriptor
         module="Travel"
         :url="`Travels/${entityId}`"
-        title="ref"
+        :title="data.title"
+        :subtitle="data.subtitle"
         :filter="filter"
-        data-key="Travel"
+        data-key="travelData"
+        :summary="$props.summary"
+        @on-fetch="setData"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="local_airport"
-                color="white"
-                class="link"
-                :to="{ name: 'TravelList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <TravelDescriptorMenuItems :travel="entity" />
         </template>
diff --git a/src/pages/Travel/Card/TravelDescriptorProxy.vue b/src/pages/Travel/Card/TravelDescriptorProxy.vue
index ab5c42d7e..eddadb382 100644
--- a/src/pages/Travel/Card/TravelDescriptorProxy.vue
+++ b/src/pages/Travel/Card/TravelDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import TravelDescriptor from './TravelDescriptor.vue';
+import TravelSummary from './TravelSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -11,6 +12,6 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <TravelDescriptor v-if="$props.id" :id="$props.id" />
+        <TravelDescriptor v-if="$props.id" :id="$props.id" :summary="TravelSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 6739b3356..3ad14cf3f 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -200,4 +200,5 @@ es:
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
     Change password: Cambiar contraseña
+    Go to module index: Ir al índice del modulo
 </i18n>
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index b3a55bbe0..548ab3427 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -17,6 +17,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -38,7 +42,6 @@ const entityId = computed(() => {
 });
 
 const data = ref(useCardDescription());
-
 const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
@@ -53,23 +56,8 @@ const setData = (entity) => {
         :filter="filter"
         @on-fetch="setData"
         data-key="zoneData"
+        :summary="$props.summary"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:zone"
-                color="white"
-                class="link"
-                :to="{ name: 'ZoneList' }"
-            >
-                <QTooltip>
-                    {{ t('Summary') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
         </template>
@@ -82,3 +70,8 @@ const setData = (entity) => {
         </template>
     </CardDescriptor>
 </template>
+
+<i18n>
+es:
+    Go to module index: Ir al índice del módulo
+</i18n>
diff --git a/src/pages/Zone/Card/ZoneDescriptorProxy.vue b/src/pages/Zone/Card/ZoneDescriptorProxy.vue
index 15c5fb0e5..27102ac07 100644
--- a/src/pages/Zone/Card/ZoneDescriptorProxy.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import ZoneDescriptor from './ZoneDescriptor.vue';
+import ZoneSummary from './ZoneSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -11,6 +12,6 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <ZoneDescriptor v-if="$props.id" :id="$props.id" />
+        <ZoneDescriptor v-if="$props.id" :id="$props.id" :summary="ZoneSummary" />
     </QPopupProxy>
 </template>

From def8d4222ba886cab30bc7764ecc554d063db958 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 26 Jun 2024 11:33:02 +0200
Subject: [PATCH 05/44] refs #6898 fix warnings

---
 src/pages/Supplier/SupplierList.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 89ab12a67..0d60e7219 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -2,8 +2,6 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();

From efa8791b9d79eeb725e89e4ed3400cca998fcd5f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 26 Jun 2024 11:40:59 +0200
Subject: [PATCH 06/44] refs #6898 remove comment

---
 src/pages/Supplier/SupplierList.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 0d60e7219..efb86b4bb 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -58,11 +58,6 @@ const columns = computed(() => [
 </script>
 
 <template>
-    <!-- <RightMenu>
-        <template #right-panel>
-            <SupplierListFilter data-key="SuppliersList" />
-        </template>
-    </RightMenu> -->
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"

From 452d1000bc6d37118b32d08392e4ba172222d2c5 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 26 Jun 2024 14:28:21 +0200
Subject: [PATCH 07/44] refactor: refs #7543 requested changes

---
 src/i18n/locale/en.yml                           |  1 +
 src/i18n/locale/es.yml                           |  1 +
 src/pages/Agency/Card/AgencyDescriptor.vue       |  7 +------
 src/pages/Claim/Card/ClaimDescriptor.vue         |  3 +--
 src/pages/Entry/Card/EntryDescriptor.vue         |  6 +-----
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue |  6 +-----
 src/pages/Order/Card/OrderDescriptor.vue         |  7 +------
 src/pages/Route/Card/RouteDescriptor.vue         |  6 +-----
 src/pages/Route/Roadmap/RoadmapDescriptor.vue    |  3 +--
 src/pages/Shelving/Card/ShelvingDescriptor.vue   | 13 ++-----------
 src/pages/Ticket/Card/TicketDescriptor.vue       |  6 +-----
 src/pages/Travel/Card/TravelDescriptor.vue       |  6 +-----
 src/pages/Worker/Card/WorkerDescriptor.vue       |  7 +------
 src/pages/Zone/Card/ZoneDescriptor.vue           |  6 +-----
 14 files changed, 15 insertions(+), 63 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f8850d396..b18c396c0 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -114,6 +114,7 @@ globals:
     new: New
     comment: Comment
     observations: Observations
+    goToModuleIndex: Go to module index
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e5924f93b..e0c563f07 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -115,6 +115,7 @@ globals:
     new: Nuevo
     comment: Comentario
     observations: Observaciones
+    goToModuleIndex: Ir al índice del módulo
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index 8b6a6603e..46b225ff2 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -40,7 +40,7 @@ const card = computed(() => store.data);
                 :to="{ name: 'RouteList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('globals.goToModuleIndex') }}
                 </QTooltip>
             </QBtn>
         </template>
@@ -49,8 +49,3 @@ const card = computed(() => store.data);
         </template>
     </CardDescriptor>
 </template>
-
-<i18n>
-es:
-    Go to module index: Ir al índice del modulo
-</i18n>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index e4b96b5b6..9b25aa2d9 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -73,7 +73,7 @@ onMounted(async () => {
                 :to="{ name: 'ClaimList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('globals.goToModuleIndex') }}
                 </QTooltip>
             </QBtn>
         </template>
@@ -187,5 +187,4 @@ onMounted(async () => {
         claimRate: Claming rate
     es:
         claimRate: Ratio de reclamación
-        Go to module index: Ir al índice del módulo
 </i18n>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 317400181..a55ad67cd 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -18,10 +18,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -119,7 +115,7 @@ watch;
         :subtitle="data.subtitle"
         @on-fetch="setData"
         data-key="entry"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <QItem v-ripple clickable @click="showEntryReport(entity)">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 1381bdc73..e8428dca1 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -25,10 +25,6 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const { push, currentRoute } = useRouter();
@@ -297,7 +293,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         :filter="filter"
         title="supplierRef"
         @on-fetch="setData"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <InvoiceInToBook>
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 92bc5ad66..82d7e0d05 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -99,7 +99,7 @@ const total = ref(null);
                 :to="{ name: 'OrderList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('globals.goToModuleIndex') }}
                 </QTooltip>
             </QBtn>
         </template>
@@ -153,8 +153,3 @@ const total = ref(null);
         </template>
     </CardDescriptor>
 </template>
-
-<i18n>
-es:
-    Go to module index: Ir al índice del módulo
-</i18n>
diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index a0e0aaf3a..2fa0e77e0 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -14,10 +14,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -80,7 +76,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         :subtitle="data.subtitle"
         data-key="routeData"
         @on-fetch="setData"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #body="{ entity }">
             <VnLv :label="t('Date')" :value="toDate(entity?.created)" />
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 78851ef5f..0f52f087f 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -51,7 +51,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
                 :to="{ name: 'RouteList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('globals.goToModuleIndex') }}
                 </QTooltip>
             </QBtn>
         </template>
@@ -76,5 +76,4 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
 es:
     Roadmap: Troncal
     Carrier: Transportista
-    Go to module index: Ir al índice del módulo
 </i18n>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 0fac92f65..9322faaa0 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -14,10 +14,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -55,7 +51,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         :subtitle="data.subtitle"
         data-key="Shelvings"
         @on-fetch="setData"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #header-extra-action>
             <QBtn
@@ -69,7 +65,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
                 :to="{ name: 'ShelvingList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('globals.goToModuleIndex') }}
                 </QTooltip>
             </QBtn>
         </template>
@@ -90,8 +86,3 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         </template>
     </CardDescriptor>
 </template>
-
-<i18n>
-es:
-    Go to module index: Ir al indice del modulo
-</i18n>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 3c5e6c80d..ab95ee643 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -16,10 +16,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -87,7 +83,7 @@ const setData = (entity) =>
         :subtitle="data.subtitle"
         data-key="ticketData"
         @on-fetch="setData"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 0b768ef22..b74761b37 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -16,10 +16,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -69,7 +65,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         :subtitle="data.subtitle"
         :filter="filter"
         data-key="travelData"
-        :summary="$props.summary"
+        :summary="$attrs"
         @on-fetch="setData"
     >
         <template #menu="{ entity }">
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 3ad14cf3f..82a698878 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -17,10 +17,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -115,7 +111,7 @@ const refetch = async () => await cardDescriptorRef.value.getData();
         :filter="filter"
         :title="data.title"
         :subtitle="data.subtitle"
-        :summary="$props.summary"
+        :summary="$attrs"
         @on-fetch="
             (data) => {
                 worker = data;
@@ -200,5 +196,4 @@ es:
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
     Change password: Cambiar contraseña
-    Go to module index: Ir al índice del modulo
 </i18n>
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 548ab3427..602fefde3 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -17,10 +17,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -56,7 +52,7 @@ const setData = (entity) => {
         :filter="filter"
         @on-fetch="setData"
         data-key="zoneData"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />

From aaee96d6bb4ddcb693d9801b50b1af9fcc42e712 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 26 Jun 2024 15:09:26 +0200
Subject: [PATCH 08/44] refs #7366 VnTable

---
 src/i18n/locale/en.yml          |  10 ++
 src/i18n/locale/es.yml          |  10 ++
 src/pages/Travel/TravelList.vue | 245 +++++++++++++++++---------------
 3 files changed, 147 insertions(+), 118 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index fbab06966..5ebd50649 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1144,6 +1144,16 @@ travel:
         basicData: Basic data
         history: Log
         thermographs: Thermograph
+    travelList:
+        tableVisibleColumns:
+            id: Id
+            ref: Reference
+            agency: Agency
+            shipped: Shipped
+            landed: Landed
+            warehouseIn: Warehouse in
+            warehouseOut: Warehouse out
+            totalEntries: Total entries
     summary:
         confirmed: Confirmed
         entryId: Entry Id
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fec78d5e6..cecca86da 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1132,6 +1132,16 @@ travel:
         basicData: Datos básicos
         history: Historial
         thermographs: Termógrafos
+    travelList:
+        tableVisibleColumns:
+            id: Id
+            ref: Referencia
+            agency: Agencia
+            shipped: Enviado
+            landed: Llegada
+            warehouseIn: Almacén de salida
+            warehouseOut: Almacén de entrada
+            totalEntries: Total de entradas
     summary:
         confirmed: Confirmado
         entryId: Id entrada
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index e6696b26f..eca79d690 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -2,19 +2,12 @@
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import TravelSummary from './Card/TravelSummary.vue';
-import TravelFilter from './TravelFilter.vue';
-import FetchData from 'components/FetchData.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
 import { useStateStore } from 'stores/useStateStore';
-import { toDate } from 'src/filters/index';
+import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
-import RightMenu from 'src/components/common/RightMenu.vue';
+
+import { computed } from 'vue';
+import TravelSummary from './Card/TravelSummary.vue';
 
 const router = useRouter();
 const { t } = useI18n();
@@ -47,118 +40,134 @@ const getWarehouseName = (id) => {
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('travel.travelList.tableVisibleColumns.id'),
+        isId: true,
+        field: 'id',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'ref',
+        label: t('travel.travelList.tableVisibleColumns.ref'),
+        field: 'ref',
+        component: 'input',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'agencyModeFk',
+        label: t('travel.travelList.tableVisibleColumns.agency'),
+        field: 'agencyModeFk',
+        component: 'select',
+        attrs: {
+            url: 'agencyModes',
+            fields: ['id', 'name'],
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'shipped',
+        label: t('travel.travelList.tableVisibleColumns.shipped'),
+        field: 'shipped',
+        component: 'date',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'landed',
+        label: t('travel.travelList.tableVisibleColumns.landed'),
+        field: 'landed',
+        component: 'date',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'warehouseInFk',
+        label: t('travel.travelList.tableVisibleColumns.warehouseIn'),
+        field: 'warehouseInFk',
+        component: 'select',
+        attrs: {
+            url: 'warehouses',
+            fields: ['id', 'name'],
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'warehouseOutFk',
+        label: t('travel.travelList.tableVisibleColumns.warehouseOut'),
+        field: 'warehouseOutFk',
+        component: 'select',
+        attrs: {
+            url: 'warehouses',
+            fields: ['id', 'name'],
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'totalEntries',
+        label: t('travel.travelList.tableVisibleColumns.totalEntries'),
+        field: 'totalEntries',
+        component: 'input',
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Clone'),
+                icon: 'vn:ticket',
+                action: cloneTravel,
+                isPrimary: true,
+            },
+            {
+                title: t('Add entry'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, TravelSummary),
+            },
+        ],
+    },
+]);
 </script>
 
 <template>
-    <FetchData
-        url="Warehouses"
-        :filter="{ fields: ['id', 'name'] }"
-        order="name"
-        @on-fetch="(data) => (warehouses = data)"
+    <VnTable
+        ref="tableRef"
+        data-key="Travels"
+        :url="`Travels`"
+        :create="{
+            urlCreate: 'Travels',
+            title: t('Create Travels'),
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {
+                workerFk: entityId,
+            },
+        }"
+        order="landed DESC"
+        :columns="columns"
+        default-mode="table"
         auto-load
+        redirect="travel"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
     />
-    <VnSearchbar data-key="TravelList" :limit="20" :label="t('searchByIdOrReference')" />
-    <RightMenu>
-        <template #right-panel>
-            <TravelFilter data-key="TravelList" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="TravelList"
-                url="Travels/filter"
-                auto-load
-                order="shipped DESC, landed DESC"
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="row.ref"
-                        :id="row.id"
-                        @click="navigateToTravelId(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv
-                                :label="t('globals.agency')"
-                                :value="row.agencyModeName"
-                            />
-                            <VnLv
-                                v-if="warehouses.length > 0"
-                                :label="t('globals.wareHouseOut')"
-                                :value="getWarehouseName(row.warehouseOutFk)"
-                            />
-                            <VnLv :label="t('globals.shipped')">
-                                <template #value>
-                                    <QBadge
-                                        text-color="black"
-                                        v-if="getDateQBadgeColor(row.shipped)"
-                                        :color="getDateQBadgeColor(row.shipped)"
-                                        class="q-ma-none"
-                                        dense
-                                        style="font-size: 14px"
-                                    >
-                                        {{ toDate(row.shipped) }}
-                                    </QBadge>
-                                    <span v-else>{{ toDate(row.shipped) }}</span>
-                                </template>
-                            </VnLv>
-                            <VnLv :label="t('globals.landed')">
-                                <template #value>
-                                    <QBadge
-                                        text-color="black"
-                                        v-if="getDateQBadgeColor(row.landed)"
-                                        :color="getDateQBadgeColor(row.landed)"
-                                        class="q-ma-none"
-                                        dense
-                                        style="font-size: 14px"
-                                    >
-                                        {{ toDate(row.landed) }}
-                                    </QBadge>
-                                    <span v-else>{{ toDate(row.landed) }}</span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                v-if="warehouses.length > 0"
-                                :label="t('globals.wareHouseIn')"
-                                :value="getWarehouseName(row.warehouseInFk)"
-                            />
-                            <VnLv
-                                :label="t('globals.totalEntries')"
-                                :value="row.totalEntries"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.clone')"
-                                @click.stop="cloneTravel(row)"
-                                outline
-                            />
-                            <QBtn
-                                :label="t('addEntry')"
-                                @click.stop="redirectCreateEntryView(row)"
-                                outline
-                                style="margin-top: 15px"
-                            />
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, TravelSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
-            <QTooltip>
-                {{ t('supplier.list.newSupplier') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
 </template>
 
 <i18n>

From 95a9805a842cc802059c33f65534cf32b3d60878 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Jun 2024 09:53:42 +0200
Subject: [PATCH 09/44] refs #7366 fix icons actions

---
 src/pages/Travel/TravelList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index eca79d690..1e616a937 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -132,14 +132,14 @@ const columns = computed(() => [
         actions: [
             {
                 title: t('Clone'),
-                icon: 'vn:ticket',
+                icon: 'vn:clone',
                 action: cloneTravel,
                 isPrimary: true,
             },
             {
                 title: t('Add entry'),
-                icon: 'preview',
-                action: (row) => viewSummary(row.id, TravelSummary),
+                icon: 'contact_support',
+                action: redirectCreateEntryView,
             },
         ],
     },

From 99628d2cf83a7869a41387f556888ecf37a9766a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Jun 2024 10:08:17 +0200
Subject: [PATCH 10/44] refs #7366 remove code

---
 src/pages/Travel/TravelList.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 1e616a937..e77c95ac2 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -7,19 +7,13 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
 import { computed } from 'vue';
-import TravelSummary from './Card/TravelSummary.vue';
 
 const router = useRouter();
 const { t } = useI18n();
 const stateStore = useStateStore();
-const { viewSummary } = useSummaryDialog();
 
 const warehouses = ref([]);
 
-const navigateToTravelId = (id) => {
-    router.push({ path: `/travel/${id}` });
-};
-
 const cloneTravel = (travelData) => {
     const stringifiedTravelData = JSON.stringify(travelData);
     redirectToCreateView(stringifiedTravelData);

From 4dd1ed3a3dba69f8f06034b160055feadae79ed4 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Jun 2024 10:12:04 +0200
Subject: [PATCH 11/44] refs #7366 remove summary

---
 src/pages/Travel/TravelList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index e77c95ac2..2b2af9dbf 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
 import { computed } from 'vue';
 

From f93929de6a52d243e5d7886c6aa167348f59e19c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Jun 2024 13:01:00 +0200
Subject: [PATCH 12/44] refs #6897 vnTable, columns

---
 src/pages/Entry/EntryList.vue | 166 +++++++++++++++++-----------------
 1 file changed, 82 insertions(+), 84 deletions(-)

diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e5d37900c..715b4dcd2 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -1,15 +1,12 @@
 <script setup>
-import { onMounted } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import EntrySummary from './Card/EntrySummary.vue';
+import { useRoute } from 'vue-router';
 import EntryFilter from './EntryFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
-import { toDate } from 'src/filters/index';
+import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
@@ -17,7 +14,8 @@ const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-
+const route = useRoute();
+const entityId = computed(() => route.params.id);
 function navigate(id) {
     router.push({ path: `/entry/${id}` });
 }
@@ -26,6 +24,61 @@ const redirectToCreateView = () => {
     router.push({ name: 'EntryCreate' });
 };
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.id'),
+        name: 'id',
+        isTitle: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.reference'),
+        name: 'reference',
+        isTitle: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.created'),
+        name: 'created',
+        create: true,
+        component: 'date',
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.supplierFk'),
+        name: 'supplierFk',
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'suppliers',
+            fields: ['id', 'name'],
+        },
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.isBooked'),
+        name: 'isBooked',
+        create: true,
+        component: 'checkbox',
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.isConfirmed'),
+        name: 'isConfirmed',
+        create: true,
+        component: 'checkbox',
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.isOrdered'),
+        name: 'isOrdered',
+        create: true,
+        component: 'checkbox',
+    },
+]);
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
@@ -42,83 +95,28 @@ onMounted(async () => {
             <EntryFilter data-key="EntryList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="EntryList"
-                url="Entries/filter"
-                :order="['landed DESC', 'id DESC']"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="row.reference"
-                        @click="navigate(row.id)"
-                        :id="row.id"
-                        :has-info-icons="!!row.isExcludedFromAvailable || !!row.isRaid"
-                    >
-                        <template #info-icons>
-                            <QIcon
-                                v-if="row.isExcludedFromAvailable"
-                                name="vn:inventory"
-                                color="primary"
-                                size="xs"
-                            >
-                                <QTooltip>{{ t('Inventory entry') }}</QTooltip>
-                            </QIcon>
-                            <QIcon
-                                v-if="row.isRaid"
-                                name="vn:net"
-                                color="primary"
-                                size="xs"
-                            >
-                                <QTooltip>{{ t('Virtual entry') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                        <template #list-items>
-                            <VnLv :label="t('landed')" :value="toDate(row.landed)" />
-                            <VnLv
-                                :label="t('entry.list.booked')"
-                                :value="!!row.isBooked"
-                            />
-                            <VnLv
-                                :label="t('entry.list.invoiceNumber')"
-                                :value="row.invoiceNumber"
-                            />
-                            <VnLv
-                                :label="t('entry.list.confirmed')"
-                                :value="!!row.isConfirmed"
-                            />
-                            <VnLv
-                                :label="t('entry.list.supplier')"
-                                :value="row.supplierName"
-                            />
-                            <VnLv
-                                :label="t('entry.list.ordered')"
-                                :value="!!row.isOrdered"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, EntrySummary)"
-                                color="primary"
-                                type="submit"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-    <QPageSticky :offset="[20, 20]">
-        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
-        <QTooltip>
-            {{ t('entry.list.newEntry') }}
-        </QTooltip>
-    </QPageSticky>
+    <VnTable
+        ref="tableRef"
+        data-key="EntryList"
+        :url="`Entries`"
+        :url-create="`Entries`"
+        save-url="Entries/crud"
+        :create="{
+            urlCreate: 'Entries',
+            title: 'Create entry',
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {
+                workerFk: entityId,
+            },
+        }"
+        order="id DESC"
+        :columns="columns"
+        default-mode="table"
+        auto-load
+        :right-search="false"
+        :is-editable="true"
+        :use-model="true"
+    />
 </template>
 
 <i18n>

From ed4517183ee418d35ed2eccc452ece7f1275e81c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Jun 2024 14:02:45 +0200
Subject: [PATCH 13/44] refs #6897 fix trad, latestBuys

---
 src/i18n/locale/en.yml              |  8 ++++++++
 src/i18n/locale/es.yml              |  8 ++++++++
 src/pages/Entry/EntryLatestBuys.vue | 19 ++-----------------
 src/pages/Entry/EntryList.vue       | 16 ++++++++++++----
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index fbab06966..6100e9528 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -322,6 +322,14 @@ entry:
         log: Log
         entryCreate: New entry
         latestBuys: Latest buys
+        tableVisibleColumns:
+            id: Id
+            reference: Reference
+            created: Creation
+            supplierFk: Supplier
+            isBooked: Booked
+            isConfirmed: Confirmed
+            isOrdered: Ordered
     list:
         newEntry: New entry
         landed: Landed
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fec78d5e6..f845b1706 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -329,6 +329,14 @@ entry:
         booked: Asentado
         confirmed: Confirmado
         ordered: Pedida
+        tableVisibleColumns:
+            id: Id
+            reference: Referencia
+            created: Creación
+            supplierFk: Proveedor
+            isBooked: Asentado
+            isConfirmed: Confirmado
+            isOrdered: Pedida
     summary:
         commission: Comisión
         currency: Moneda
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 5da3309d8..f70cd99a9 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -639,21 +639,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (intrastatOptions = data)"
     />
-    <VnSubToolbar>
-        <template #st-data>
-            <TableVisibleColumns
-                :all-columns="allColumnNames"
-                table-code="latestBuys"
-                labels-traductions-path="entry.latestBuys"
-                @on-config-saved="visibleColumns = ['picture', ...$event]"
-            />
-        </template>
-    </VnSubToolbar>
-    <RightMenu>
-        <template #right-panel>
-            <EntryLatestBuysFilter data-key="EntryLatestBuys" />
-        </template>
-    </RightMenu>
     <Teleport to="#actions-append">
         <div class="row q-gutter-x-sm">
             <QBtn flat @click="stateStore.toggleRightDrawer()" round dense icon="menu">
@@ -739,12 +724,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTd>
             </template>
         </QTable>
-        <QPageSticky v-if="rowsSelected.length > 0" :offset="[20, 20]">
+        <!-- <QPageSticky v-if="rowsSelected.length > 0" :offset="[20, 20]">
             <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
             <QTooltip>
                 {{ t('Edit buy(s)') }}
             </QTooltip>
-        </QPageSticky>
+        </QPageSticky> -->
         <QDialog ref="editTableCellDialogRef">
             <EditTableCellValueForm
                 edit-url="Buys/editLatestBuys"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 715b4dcd2..1f59e7d78 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -9,6 +9,7 @@ import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import { toDate } from 'src/filters';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -45,6 +46,10 @@ const columns = computed(() => [
         name: 'created',
         create: true,
         component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.created)),
     },
     {
         align: 'left',
@@ -56,6 +61,10 @@ const columns = computed(() => [
             url: 'suppliers',
             fields: ['id', 'name'],
         },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.supplierName),
     },
     {
         align: 'left',
@@ -98,8 +107,8 @@ onMounted(async () => {
     <VnTable
         ref="tableRef"
         data-key="EntryList"
-        :url="`Entries`"
-        :url-create="`Entries`"
+        url="Entries/filter"
+        url-create="Entries"
         save-url="Entries/crud"
         :create="{
             urlCreate: 'Entries',
@@ -111,11 +120,10 @@ onMounted(async () => {
         }"
         order="id DESC"
         :columns="columns"
+        redirect="entry"
         default-mode="table"
         auto-load
         :right-search="false"
-        :is-editable="true"
-        :use-model="true"
     />
 </template>
 

From 67f89dfde276651c620b58650199fa3d02135329 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Jun 2024 14:48:36 +0200
Subject: [PATCH 14/44] refs #6897 fix latestbuys

---
 src/pages/Entry/EntryLatestBuys.vue | 150 +++-------------------------
 1 file changed, 12 insertions(+), 138 deletions(-)

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index f70cd99a9..ecb5b7f22 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -3,24 +3,15 @@ import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
-import FetchData from 'components/FetchData.vue';
-import FetchedTags from 'components/ui/FetchedTags.vue';
-import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
-import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
-import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
-import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate, toCurrency } from 'src/filters';
 // import { useSession } from 'composables/useSession';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import VnImg from 'src/components/ui/VnImg.vue';
 
 const router = useRouter();
 // const { getTokenMultimedia } = useSession();
@@ -609,136 +600,19 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <FetchData
-        url="ItemTypes"
-        :filter="{ fields: ['code'], order: 'code ASC', limit: 30 }"
+    <VnTable
+        ref="tableRef"
+        data-key="EntryLatestBuysList"
+        url="EntryLatestBuys"
+        url-create="EntryLatestBuys"
+        save-url="EntryLatestBuys/crud"
+        order="id DESC"
+        :columns="columns"
+        redirect="entry"
+        default-mode="table"
         auto-load
-        @on-fetch="(data) => (itemTypesOptions = data)"
+        :right-search="false"
     />
-    <FetchData
-        url="Origins"
-        :filter="{ fields: ['code'], order: 'code ASC', limit: 30 }"
-        auto-load
-        @on-fetch="(data) => (originsOptions = data)"
-    />
-    <FetchData
-        url="ItemFamilies"
-        :filter="{ fields: ['code'], order: 'code ASC', limit: 30 }"
-        auto-load
-        @on-fetch="(data) => (itemFamiliesOptions = data)"
-    />
-    <FetchData
-        url="Packagings"
-        :filter="{ fields: ['id'], order: 'id ASC', limit: 30 }"
-        auto-load
-        @on-fetch="(data) => (packagingsOptions = data)"
-    />
-    <FetchData
-        url="Intrastats"
-        :filter="{ fields: ['description'], order: 'description ASC', limit: 30 }"
-        auto-load
-        @on-fetch="(data) => (intrastatOptions = data)"
-    />
-    <Teleport to="#actions-append">
-        <div class="row q-gutter-x-sm">
-            <QBtn flat @click="stateStore.toggleRightDrawer()" round dense icon="menu">
-                <QTooltip bottom anchor="bottom right">
-                    {{ t('globals.collapseMenu') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-    </Teleport>
-    <QPage class="column items-center q-pa-md">
-        <QTable
-            :rows="rows"
-            :columns="columns"
-            selection="multiple"
-            row-key="id"
-            class="full-width q-mt-md"
-            :visible-columns="visibleColumns"
-            v-model:selected="rowsSelected"
-            :no-data-label="t('globals.noResults')"
-            @row-click="(_, row) => redirectToEntryBuys(row.entryFk)"
-        >
-            <template #top-row="{ cols }">
-                <QTr>
-                    <QTd />
-                    <QTd
-                        v-for="(col, index) in cols"
-                        :key="index"
-                        style="max-width: 100px"
-                    >
-                        <component
-                            :is="col.columnFilter.component"
-                            v-if="col.name !== 'picture'"
-                            v-model="col.columnFilter.filterValue"
-                            v-bind="col.columnFilter.attrs"
-                            v-on="col.columnFilter.event(col)"
-                            dense
-                        />
-                    </QTd>
-                </QTr>
-            </template>
-            <template #body-cell-picture="{ row }">
-                <QTd>
-                    <VnImg :id="row.itemFk" size="50x50" class="image" />
-                </QTd>
-            </template>
-            <template #body-cell-itemFk="{ row }">
-                <QTd @click.stop>
-                    <QBtn flat color="primary">
-                        {{ row.itemFk }}
-                    </QBtn>
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QTd>
-            </template>
-            <template #body-cell-tags="{ row }">
-                <QTd>
-                    <FetchedTags :item="row" :max-length="6" />
-                </QTd>
-            </template>
-            <template #body-cell-entryFk="{ row }">
-                <QTd @click.stop>
-                    <QBtn flat color="primary">
-                        <EntryDescriptorProxy :id="row.entryFk" />
-                        {{ row.entryFk }}
-                    </QBtn>
-                </QTd>
-            </template>
-            <template #body-cell-isIgnored="{ row }">
-                <QTd>
-                    <QIcon
-                        :name="row.isIgnored ? `check` : `close`"
-                        :color="row.isIgnored ? `positive` : `negative`"
-                        size="sm"
-                    />
-                </QTd>
-            </template>
-            <template #body-cell-isActive="{ row }">
-                <QTd>
-                    <QIcon
-                        :name="row.isActive ? `check` : `close`"
-                        :color="row.isActive ? `positive` : `negative`"
-                        size="sm"
-                    />
-                </QTd>
-            </template>
-        </QTable>
-        <!-- <QPageSticky v-if="rowsSelected.length > 0" :offset="[20, 20]">
-            <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
-            <QTooltip>
-                {{ t('Edit buy(s)') }}
-            </QTooltip>
-        </QPageSticky> -->
-        <QDialog ref="editTableCellDialogRef">
-            <EditTableCellValueForm
-                edit-url="Buys/editLatestBuys"
-                :rows="rowsSelected"
-                :fields-options="editTableCellFormFieldsOptions"
-                @on-data-saved="onEditCellDataSaved()"
-            />
-        </QDialog>
-    </QPage>
 </template>
 
 <i18n>

From 8ec51ff8fdad3d335abb3506ee9881a7544e5a3e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Jun 2024 09:01:28 +0200
Subject: [PATCH 15/44] refs #6897 fix columns

---
 src/pages/Entry/EntryLatestBuys.vue | 515 +++++-----------------------
 1 file changed, 93 insertions(+), 422 deletions(-)

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index ecb5b7f22..6b4b41dc4 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -4,29 +4,16 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { toDate, toCurrency } from 'src/filters';
-// import { useSession } from 'composables/useSession';
-import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 
 const router = useRouter();
-// const { getTokenMultimedia } = useSession();
-// const token = getTokenMultimedia();
 const stateStore = useStateStore();
 const { t } = useI18n();
 
 const rowsFetchDataRef = ref(null);
-const itemTypesOptions = ref([]);
-const originsOptions = ref([]);
-const itemFamiliesOptions = ref([]);
-const intrastatOptions = ref([]);
-const packagingsOptions = ref([]);
 const editTableCellDialogRef = ref(null);
-const visibleColumns = ref([]);
 const allColumnNames = ref([]);
 
 const exprBuilder = (param, value) => {
@@ -88,470 +75,154 @@ const getInputEvents = (col) => {
 
 const columns = computed(() => [
     {
-        label: t('entry.latestBuys.picture'),
+        label: t('entry.latestBuys.tableVisibleColumns.picture'),
         name: 'picture',
-        align: 'left',
     },
     {
-        label: t('entry.latestBuys.itemFk'),
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.itemFk'),
         name: 'itemFk',
-        field: 'itemFk',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+        isTitle: true,
     },
     {
-        label: t('entry.latestBuys.packing'),
-        field: 'packing',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.packing'),
         name: 'packing',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('entry.latestBuys.grouping'),
-        field: 'grouping',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.grouping'),
         name: 'grouping',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('entry.latestBuys.quantity'),
-        field: 'quantity',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.quantity'),
         name: 'quantity',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.description'),
-        field: 'description',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.description'),
         name: 'description',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
+
     },
     {
-        label: t('entry.latestBuys.size'),
-        field: 'size',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.size'),
         name: 'size',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+
     },
     {
-        label: t('entry.latestBuys.tags'),
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.tags'),
         name: 'tags',
-        align: 'left',
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+
     },
     {
-        label: t('entry.latestBuys.type'),
-        field: 'code',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.type'),
         name: 'type',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: itemTypesOptions.value,
-                'option-value': 'code',
-                'option-label': 'code',
-                dense: true,
-            },
-        },
+
     },
     {
-        label: t('entry.latestBuys.intrastat'),
-        field: 'intrastat',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.intrastat'),
         name: 'intrastat',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: intrastatOptions.value,
-                'option-value': 'description',
-                'option-label': 'description',
-                dense: true,
-            },
-        },
+
     },
     {
-        label: t('entry.latestBuys.origin'),
-        field: 'origin',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.origin'),
         name: 'origin',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: originsOptions.value,
-                'option-value': 'code',
-                'option-label': 'code',
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.weightByPiece'),
-        field: 'weightByPiece',
+
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
         name: 'weightByPiece',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('entry.latestBuys.isActive'),
-        field: 'isActive',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.isActive'),
         name: 'isActive',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-    },
-    {
-        label: t('entry.latestBuys.family'),
-        field: 'family',
-        name: 'family',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: itemFamiliesOptions.value,
-                'option-value': 'code',
-                'option-label': 'code',
-                dense: true,
-            },
-        },
-    },
-    {
-        label: t('entry.latestBuys.entryFk'),
-        field: 'entryFk',
-        name: 'entryFk',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-    },
-    {
-        label: t('entry.latestBuys.buyingValue'),
-        field: 'buyingValue',
-        name: 'buyingValue',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
-    },
-    {
-        label: t('entry.latestBuys.freightValue'),
-        field: 'freightValue',
-        name: 'freightValue',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
-    },
-    {
-        label: t('entry.latestBuys.comissionValue'),
-        field: 'comissionValue',
-        name: 'comissionValue',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
-    },
-    {
-        label: t('entry.latestBuys.packageValue'),
-        field: 'packageValue',
-        name: 'packageValue',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
-    },
-    {
-        label: t('entry.latestBuys.isIgnored'),
-        field: 'isIgnored',
-        name: 'isIgnored',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-    },
-    {
-        label: t('entry.latestBuys.price2'),
-        field: 'price2',
-        name: 'price2',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
 
-        format: (val) => toCurrency(val),
     },
     {
-        label: t('entry.latestBuys.price3'),
-        field: 'price3',
-        name: 'price3',
         align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
+        label: t('entry.latestBuys.tableVisibleColumns.family'),
+        name: 'family'
+
     },
     {
-        label: t('entry.latestBuys.minPrice'),
-        field: 'minPrice',
-        name: 'minPrice',
         align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
+        label: t('entry.latestBuys.tableVisibleColumns.entryFk'),
+        name: 'entryFk'
+
     },
     {
-        label: t('entry.latestBuys.ektFk'),
-        field: 'ektFk',
-        name: 'ektFk',
         align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
+        label: t('entry.latestBuys.tableVisibleColumns.buyingValue'),
+        name: 'buyingValue'
+
     },
     {
-        label: t('entry.latestBuys.weight'),
-        field: 'weight',
-        name: 'weight',
         align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+        label: t('entry.latestBuys.tableVisibleColumns.freightValue'),
+        name: 'freightValue'
     },
     {
-        label: t('entry.latestBuys.packagingFk'),
-        field: 'packagingFk',
-        name: 'packagingFk',
         align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: packagingsOptions.value,
-                'option-value': 'id',
-                'option-label': 'id',
-                dense: true,
-            },
-        },
+        label: t('entry.latestBuys.tableVisibleColumns.comissionValue'),
+        name: 'comissionValue'
     },
     {
-        label: t('entry.latestBuys.packingOut'),
-        field: 'packingOut',
-        name: 'packingOut',
         align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
+        label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
+        name: 'packageValue'
     },
     {
-        label: t('entry.latestBuys.landing'),
-        field: 'landing',
-        name: 'landing',
         align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toDate(val),
+        label: t('entry.latestBuys.tableVisibleColumns.isIgnored'),
+        name: 'isIgnored'
+    },
+    {
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.price2'),
+        name: 'price2'
+    },
+    {
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.price3'),
+        name: 'price3'
+    },
+    {
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.minPrice'),
+        name: 'minPrice'
+    },
+    {
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.ektFk'),
+        name: 'ektFk'
+    },
+    {
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.weight'),
+        name: 'weight'
+    },
+    {
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.packagingFk'),
+        name: 'packagingFk'
+    },
+    {
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.packingOut'),
+        name: 'packingOut'
+    },
+    {
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.landing'),
+        name: 'landing'
     },
 ]);
 
@@ -602,10 +273,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 <template>
     <VnTable
         ref="tableRef"
-        data-key="EntryLatestBuysList"
-        url="EntryLatestBuys"
-        url-create="EntryLatestBuys"
-        save-url="EntryLatestBuys/crud"
+        data-key="LatestBuys"
+        url="Entries/LatestBuys"
+        url-create="Entries/LatestBuys"
+        save-url="Entries/LatestBuys/crud"
         order="id DESC"
         :columns="columns"
         redirect="entry"

From 2e8396d1d4eefd121dec55d45531b32736b325f8 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Jun 2024 10:08:19 +0200
Subject: [PATCH 16/44] refs #6897 fix url

---
 src/pages/Entry/EntryLatestBuys.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 6b4b41dc4..09cbb893b 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -274,12 +274,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     <VnTable
         ref="tableRef"
         data-key="LatestBuys"
-        url="Entries/LatestBuys"
-        url-create="Entries/LatestBuys"
-        save-url="Entries/LatestBuys/crud"
+        url="Buys/latestBuysFilter"
         order="id DESC"
         :columns="columns"
-        redirect="entry"
+        redirect="buy"
         default-mode="table"
         auto-load
         :right-search="false"

From 68552b8da9bdb61237ed7c356671e3c34d4f4de4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 28 Jun 2024 11:07:32 +0200
Subject: [PATCH 17/44] perf: add QBtn in CardDescriptor instead each
 ModuleDescriptor

---
 src/components/ui/CardDescriptor.vue          | 25 ++++++++++++++++++-
 src/pages/Account/Card/AccountDescriptor.vue  | 14 -----------
 src/pages/Agency/Card/AgencyDescriptor.vue    | 16 ------------
 src/pages/Claim/Card/ClaimDescriptor.vue      | 16 ------------
 .../ItemType/Card/ItemTypeDescriptor.vue      | 14 -----------
 src/pages/Order/Card/OrderDescriptor.vue      | 16 ------------
 src/pages/Route/Roadmap/RoadmapDescriptor.vue | 16 ------------
 .../Shelving/Card/ShelvingDescriptor.vue      | 16 ------------
 .../Supplier/Card/SupplierDescriptor.vue      | 16 ------------
 9 files changed, 24 insertions(+), 125 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 8bb2a603e..481e2ec12 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -78,13 +78,36 @@ async function getData() {
     }
 }
 const emit = defineEmits(['onFetch']);
+
+const iconModule = computed(() => route.matched[1].meta.icon);
+const toModule = computed(() =>
+    route.matched[1].path.split('/').length > 2
+        ? route.matched[1].redirect
+        : route.matched[1].children[0].redirect
+);
 </script>
 
 <template>
     <div class="descriptor">
         <template v-if="entity && !isLoading">
             <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action" />
+                <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)"
                     round
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index ddc7c077f..d43266172 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -49,20 +49,6 @@ const hasAccount = ref(false);
         :title="data.title"
         :subtitle="data.subtitle"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                size="md"
-                color="white"
-                icon="face"
-                :to="{ name: 'AccountList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu>
             <AccountDescriptorMenu :has-account="hasAccount" />
         </template>
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index 46b225ff2..b9772037c 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -28,22 +28,6 @@ const card = computed(() => store.data);
         :title="card?.name"
         :subtitle="props.id"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="garage_home"
-                color="white"
-                class="link"
-                :to="{ name: 'RouteList' }"
-            >
-                <QTooltip>
-                    {{ t('globals.goToModuleIndex') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #body="{ entity: agency }">
             <VnLv :label="t('globals.name')" :value="agency.name" />
         </template>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 9b25aa2d9..5336c4427 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -61,22 +61,6 @@ onMounted(async () => {
         @on-fetch="setData"
         data-key="Claim"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:claims"
-                color="white"
-                class="link"
-                :to="{ name: 'ClaimList' }"
-            >
-                <QTooltip>
-                    {{ t('globals.goToModuleIndex') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity" />
         </template>
diff --git a/src/pages/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
index e565a791b..cd12fc238 100644
--- a/src/pages/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
@@ -51,20 +51,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         @on-fetch="setData"
         data-key="entry"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                size="sm"
-                icon="vn:item"
-                color="white"
-                :to="{ name: 'ItemTypeList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #body="{ entity }">
             <VnLv :label="t('shared.code')" :value="entity.code" />
             <VnLv :label="t('shared.name')" :value="entity.name" />
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 82d7e0d05..60e86d04e 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -87,22 +87,6 @@ const total = ref(null);
         @on-fetch="setData"
         data-key="orderData"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:basket"
-                color="white"
-                class="link"
-                :to="{ name: 'OrderList' }"
-            >
-                <QTooltip>
-                    {{ t('globals.goToModuleIndex') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <OrderDescriptorMenu :order="entity" />
         </template>
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 0f52f087f..788173688 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -39,22 +39,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         data-key="Roadmap"
         @on-fetch="setData"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:troncales"
-                color="white"
-                class="link"
-                :to="{ name: 'RouteList' }"
-            >
-                <QTooltip>
-                    {{ t('globals.goToModuleIndex') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #body="{ entity }">
             <VnLv :label="t('Roadmap')" :value="entity?.name" />
             <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" />
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 9322faaa0..52b4896ad 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -53,22 +53,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         @on-fetch="setData"
         :summary="$attrs"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:inventory"
-                color="white"
-                class="link"
-                :to="{ name: 'ShelvingList' }"
-            >
-                <QTooltip>
-                    {{ t('globals.goToModuleIndex') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #body="{ entity }">
             <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
             <VnLv :label="t('shelving.summary.parking')" :value="entity.parking?.code" />
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 4ef76c2f8..a31a3bc8d 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -112,22 +112,6 @@ const getEntryQueryParams = (supplier) => {
         data-key="supplier"
         :summary="$props.summary"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:supplier"
-                color="white"
-                class="link"
-                :to="{ name: 'SupplierList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #body="{ entity }">
             <VnLv :label="t('supplier.summary.taxNumber')" :value="entity.nif" />
             <VnLv label="Alias" :value="entity.nickname" />

From b05528ae1469629511fe502ec425de9ebda0556e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Jun 2024 11:23:29 +0200
Subject: [PATCH 18/44] refs #6897 fix latestbuys trad

---
 src/i18n/locale/en.yml              | 57 +++++++++++++++--------------
 src/i18n/locale/es.yml              | 57 +++++++++++++++--------------
 src/pages/Entry/EntryLatestBuys.vue | 11 ++++--
 3 files changed, 66 insertions(+), 59 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 6100e9528..23ffddead 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -413,34 +413,35 @@ entry:
         landed: Landed
         warehouseOut: Warehouse Out
     latestBuys:
-        picture: Picture
-        itemFk: Item ID
-        packing: Packing
-        grouping: Grouping
-        quantity: Quantity
-        size: Size
-        tags: Tags
-        type: Type
-        intrastat: Intrastat
-        origin: Origin
-        weightByPiece: Weight/Piece
-        isActive: Active
-        family: Family
-        entryFk: Entry
-        buyingValue: Buying value
-        freightValue: Freight value
-        comissionValue: Commission value
-        description: Description
-        packageValue: Package value
-        isIgnored: Is ignored
-        price2: Grouping
-        price3: Packing
-        minPrice: Min
-        ektFk: Ekt
-        weight: Weight
-        packagingFk: Package
-        packingOut: Package out
-        landing: Landing
+        tableVisibleColumns:
+            picture: Picture
+            itemFk: Item ID
+            packing: Packing
+            grouping: Grouping
+            quantity: Quantity
+            size: Size
+            tags: Tags
+            type: Type
+            intrastat: Intrastat
+            origin: Origin
+            weightByPiece: Weight/Piece
+            isActive: Active
+            family: Family
+            entryFk: Entry
+            buyingValue: Buying value
+            freightValue: Freight value
+            comissionValue: Commission value
+            description: Description
+            packageValue: Package value
+            isIgnored: Is ignored
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            weight: Weight
+            packagingFk: Package
+            packingOut: Package out
+            landing: Landing
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f845b1706..c3aca500f 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -412,34 +412,35 @@ entry:
         landed: F. entrega
         warehouseOut: Alm. salida
     latestBuys:
-        picture: Foto
-        itemFk: ID Artículo
-        packing: Packing
-        grouping: Grouping
-        quantity: Cantidad
-        size: Medida
-        tags: Etiquetas
-        type: Tipo
-        intrastat: Intrastat
-        origin: Origen
-        weightByPiece: Peso (gramos)/tallo
-        isActive: Activo
-        family: Familia
-        entryFk: Entrada
-        buyingValue: Coste
-        freightValue: Porte
-        comissionValue: Comisión
-        description: Descripción
-        packageValue: Embalaje
-        isIgnored: Ignorado
-        price2: Grouping
-        price3: Packing
-        minPrice: Min
-        ektFk: Ekt
-        weight: Peso
-        packagingFk: Embalaje
-        packingOut: Embalaje envíos
-        landing: Llegada
+        tableVisibleColumns:
+            picture: Foto
+            itemFk: Id Artículo
+            packing: packing
+            grouping: Grouping
+            quantity: Cantidad
+            size: Medida
+            tags: Etiquetas
+            type: Tipo
+            intrastat: Intrastat
+            origin: Origen
+            weightByPiece: Peso (gramos)/tallo
+            isActive: Activo
+            family: Familia
+            entryFk: Entrada
+            buyingValue: Coste
+            freightValue: Porte
+            comissionValue: Comisión
+            description: Descripción
+            packageValue: Embalaje
+            isIgnored: Ignorado
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            weight: Peso
+            packagingFk: Embalaje
+            packingOut: Embalaje envíos
+            landing: Llegada
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 09cbb893b..b591b107a 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -11,7 +11,7 @@ import { useArrayData } from 'composables/useArrayData';
 const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
-
+import { toDate } from 'src/filters';
 const rowsFetchDataRef = ref(null);
 const editTableCellDialogRef = ref(null);
 const allColumnNames = ref([]);
@@ -222,7 +222,12 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.landing'),
-        name: 'landing'
+        name: 'landing',
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing))
     },
 ]);
 
@@ -277,7 +282,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         url="Buys/latestBuysFilter"
         order="id DESC"
         :columns="columns"
-        redirect="buy"
+        redirect="entry"
         default-mode="table"
         auto-load
         :right-search="false"

From e62e914e487a4b334287d7e9a1320519fff19dd3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Jun 2024 14:55:44 +0200
Subject: [PATCH 19/44] refs #6897 change image, fit component

---
 src/components/VnTable/VnFilter.vue   |  6 +-
 src/components/common/VnComponent.vue |  1 -
 src/i18n/locale/en.yml                |  2 +
 src/i18n/locale/es.yml                |  2 +
 src/pages/Entry/EntryLatestBuys.vue   | 27 ++++++---
 src/pages/Entry/EntryList.vue         | 87 ++++++++++++++++++++++++---
 6 files changed, 105 insertions(+), 20 deletions(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 3d489cf73..9db688a5f 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -39,7 +39,7 @@ const enterEvent = {
 
 const defaultAttrs = {
     filled: !$props.showTitle,
-    class: 'q-px-sm q-pb-xs q-pt-none',
+    class: 'q-px-sm q-pb-xs q-pt-none fit',
     dense: true,
 };
 
@@ -80,7 +80,7 @@ const components = {
         event: updateEvent,
         attrs: {
             dense: true,
-            class: $props.showTitle ? 'q-py-sm q-mt-md' : 'q-px-md q-py-xs',
+            class: $props.showTitle ? 'q-py-sm q-mt-md' : 'q-px-md q-py-xs fit',
             'toggle-indeterminate': true,
         },
         forceAttrs,
@@ -89,7 +89,7 @@ const components = {
         component: markRaw(VnSelect),
         event: updateEvent,
         attrs: {
-            class: 'q-px-md q-pb-xs q-pt-none',
+            class: 'q-px-md q-pb-xs q-pt-none fit',
             dense: true,
             filled: !$props.showTitle,
         },
diff --git a/src/components/common/VnComponent.vue b/src/components/common/VnComponent.vue
index 318b5ee5f..2e2095f23 100644
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@@ -54,7 +54,6 @@ function toValueAttrs(attrs) {
             v-bind="mix(toComponent).attrs"
             v-on="mix(toComponent).event ?? {}"
             v-model="model"
-            class="fit"
         />
     </span>
 </template>
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 23ffddead..89e5b24df 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -442,6 +442,8 @@ entry:
             packagingFk: Package
             packingOut: Package out
             landing: Landing
+            isExcludedFromAvailable: Es inventory
+            isRaid: Raid
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index c3aca500f..5be1c5773 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -441,6 +441,8 @@ entry:
             packagingFk: Embalaje
             packingOut: Embalaje envíos
             landing: Llegada
+            isExcludedFromAvailable: Es inventario
+            isRaid: Redada
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index b591b107a..555155a4e 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -12,6 +12,8 @@ const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
 import { toDate } from 'src/filters';
+import VnImg from 'src/components/ui/VnImg.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 const rowsFetchDataRef = ref(null);
 const editTableCellDialogRef = ref(null);
 const allColumnNames = ref([]);
@@ -73,10 +75,20 @@ const getInputEvents = (col) => {
           };
 };
 
-const columns = computed(() => [
+const columns = [
     {
-        label: t('entry.latestBuys.tableVisibleColumns.picture'),
-        name: 'picture',
+        label: t('entry.latestBuys.tableVisibleColumns.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) =>  {
+                return {
+                    id,
+                    width: '50px',
+                }
+            },
+        },
+        columnFilter: false
     },
     {
         align: 'left',
@@ -229,7 +241,7 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing))
     },
-]);
+];
 
 const editTableCellFormFieldsOptions = [
     { field: 'packing', label: t('entry.latestBuys.packing') },
@@ -267,15 +279,16 @@ const applyColumnFilter = async (col) => {
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
-    const filteredColumns = columns.value.filter((col) => col.name !== 'picture');
-    allColumnNames.value = filteredColumns.map((col) => col.name);
-    await arrayData.fetch({ append: false });
+    // const filteredColumns = columns.value.filter((col) => col.name !== 'picture');
+    // allColumnNames.value = filteredColumns.map((col) => col.name);
+    // await arrayData.fetch({ append: false });
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
+    <VnSubToolbar/>
     <VnTable
         ref="tableRef"
         data-key="LatestBuys"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 1f59e7d78..993a055dc 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -7,31 +7,45 @@ import EntryFilter from './EntryFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import { toDate } from 'src/filters';
 
 const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
 const route = useRoute();
 const entityId = computed(() => route.params.id);
-function navigate(id) {
-    router.push({ path: `/entry/${id}` });
-}
 
-const redirectToCreateView = () => {
-    router.push({ name: 'EntryCreate' });
+const entryFilter = {
+    include: [
+        {
+            relation: 'supplier',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+        {
+            relation: 'travel',
+            scope: {
+                fields: ['id', 'ref'],
+            },
+        },
+        {
+            relation: 'company',
+            scope: {
+                fields: ['id', 'code'],
+            },
+        },
+    ],
 };
 
 const columns = computed(() => [
+
     {
         align: 'left',
         label: t('entry.list.tableVisibleColumns.id'),
         name: 'id',
         isTitle: true,
-        create: true,
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -39,12 +53,14 @@ const columns = computed(() => [
         name: 'reference',
         isTitle: true,
         create: true,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: t('entry.list.tableVisibleColumns.created'),
         name: 'created',
         create: true,
+        cardVisible: true,
         component: 'date',
         columnField: {
             component: null,
@@ -56,6 +72,7 @@ const columns = computed(() => [
         label: t('entry.list.tableVisibleColumns.supplierFk'),
         name: 'supplierFk',
         create: true,
+        cardVisible: true,
         component: 'select',
         attrs: {
             url: 'suppliers',
@@ -70,6 +87,7 @@ const columns = computed(() => [
         align: 'left',
         label: t('entry.list.tableVisibleColumns.isBooked'),
         name: 'isBooked',
+        cardVisible: true,
         create: true,
         component: 'checkbox',
     },
@@ -77,6 +95,7 @@ const columns = computed(() => [
         align: 'left',
         label: t('entry.list.tableVisibleColumns.isConfirmed'),
         name: 'isConfirmed',
+        cardVisible: true,
         create: true,
         component: 'checkbox',
     },
@@ -84,9 +103,58 @@ const columns = computed(() => [
         align: 'left',
         label: t('entry.list.tableVisibleColumns.isOrdered'),
         name: 'isOrdered',
+        cardVisible: true,
         create: true,
         component: 'checkbox',
     },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.companyFk'),
+        name: 'companyFk',
+        component: 'select',
+        attrs: {
+            url: 'companies',
+            fields: ['id', 'code'],
+        },
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.travelFk'),
+        name: 'travelFk',
+        component: 'select',
+        attrs: {
+            url: 'travels',
+            fields: ['id', 'ref'],
+        },
+        create: true,
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'),
+        name: 'isExcludedFromAvailable',
+        chip: {
+            color: null,
+            condition: (value) => value,
+            icon: 'vn:inventory',
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.isRaid'),
+        name: 'isRaid',
+        chip: {
+            color: null,
+            condition: (value) => value,
+            icon: 'vn:net',
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+    },
 ]);
 onMounted(async () => {
     stateStore.rightDrawer = true;
@@ -110,6 +178,7 @@ onMounted(async () => {
         url="Entries/filter"
         url-create="Entries"
         save-url="Entries/crud"
+        :filter="entryFilter"
         :create="{
             urlCreate: 'Entries',
             title: 'Create entry',

From 41d6c3f07e1fe32184e75af6cbf2beef88ef20ca Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Jun 2024 15:00:35 +0200
Subject: [PATCH 20/44] refs #6897 fix columns trad

---
 src/i18n/locale/en.yml              |  2 +-
 src/i18n/locale/es.yml              |  2 +-
 src/pages/Entry/EntryLatestBuys.vue | 10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 89e5b24df..be019d1b1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -414,7 +414,7 @@ entry:
         warehouseOut: Warehouse Out
     latestBuys:
         tableVisibleColumns:
-            picture: Picture
+            image: Picture
             itemFk: Item ID
             packing: Packing
             grouping: Grouping
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 5be1c5773..1f54f627f 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -413,7 +413,7 @@ entry:
         warehouseOut: Alm. salida
     latestBuys:
         tableVisibleColumns:
-            picture: Foto
+            image: Foto
             itemFk: Id Artículo
             packing: packing
             grouping: Grouping
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 555155a4e..83a7ba922 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -16,7 +16,6 @@ import VnImg from 'src/components/ui/VnImg.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 const rowsFetchDataRef = ref(null);
 const editTableCellDialogRef = ref(null);
-const allColumnNames = ref([]);
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -67,16 +66,9 @@ const store = arrayData.store;
 const rows = computed(() => store.data);
 const rowsSelected = ref([]);
 
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
-
 const columns = [
     {
+        align: 'center',
         label: t('entry.latestBuys.tableVisibleColumns.image'),
         name: 'image',
         columnField: {

From a69235e4d4ca5297f43c0752dc3ebd4b34e15bd4 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 1 Jul 2024 07:39:35 +0200
Subject: [PATCH 21/44] fix: refs #7404 add e2e and fix route

---
 src/components/LeftMenuItem.vue               |   2 +-
 src/css/app.scss                              |   9 +-
 src/i18n/locale/en.yml                        |   1 +
 src/pages/{ => Route}/Agency/AgencyList.vue   |   1 +
 .../Agency/Card/AgencyBasicData.vue           |   0
 .../{ => Route}/Agency/Card/AgencyCard.vue    |   2 +-
 .../Agency/Card/AgencyDescriptor.vue          |   0
 .../{ => Route}/Agency/Card/AgencyLog.vue     |   0
 .../{ => Route}/Agency/Card/AgencyModes.vue   |   0
 .../{ => Route}/Agency/Card/AgencySummary.vue |   0
 .../Agency/Card/AgencyWorkcenter.vue          |   0
 src/pages/{ => Route}/Agency/locale/en.yml    |   0
 src/pages/{ => Route}/Agency/locale/es.yml    |   0
 src/router/modules/agency.js                  |  87 +-------------
 src/router/modules/route.js                   | 107 ++++++++++++++++--
 src/router/routes.js                          |   2 -
 .../agency/agencyWorkCenter.spec.js           |   2 -
 17 files changed, 108 insertions(+), 105 deletions(-)
 rename src/pages/{ => Route}/Agency/AgencyList.vue (98%)
 rename src/pages/{ => Route}/Agency/Card/AgencyBasicData.vue (100%)
 rename src/pages/{ => Route}/Agency/Card/AgencyCard.vue (82%)
 rename src/pages/{ => Route}/Agency/Card/AgencyDescriptor.vue (100%)
 rename src/pages/{ => Route}/Agency/Card/AgencyLog.vue (100%)
 rename src/pages/{ => Route}/Agency/Card/AgencyModes.vue (100%)
 rename src/pages/{ => Route}/Agency/Card/AgencySummary.vue (100%)
 rename src/pages/{ => Route}/Agency/Card/AgencyWorkcenter.vue (100%)
 rename src/pages/{ => Route}/Agency/locale/en.yml (100%)
 rename src/pages/{ => Route}/Agency/locale/es.yml (100%)
 rename test/cypress/integration/{ => route}/agency/agencyWorkCenter.spec.js (97%)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index d12fb8428..f3f2315a3 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -21,7 +21,7 @@ const itemComputed = computed(() => {
 </script>
 <template>
     <QItem
-        active-class="bg-hover"
+        active-class="bg-vn-hover"
         class="min-height"
         :to="{ name: itemComputed.name }"
         clickable
diff --git a/src/css/app.scss b/src/css/app.scss
index f34b1358b..27ed65534 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -5,6 +5,7 @@
 body.body--light {
     --font-color: black;
     --vn-section-color: #e0e0e0;
+    --vn-section-hover-color: #b9b9b9;
     --vn-page-color: #ffffff;
     --vn-text-color: var(--font-color);
     --vn-label-color: #5f5f5f;
@@ -19,6 +20,7 @@ body.body--light {
 body.body--dark {
     --vn-page-color: #222;
     --vn-section-color: #3d3d3d;
+    --vn-section-hover-color: #747474;
     --vn-text-color: white;
     --vn-label-color: #a8a8a8;
     --vn-accent-color: #424242;
@@ -71,8 +73,9 @@ select:-webkit-autofill {
 .bg-vn-section-color {
     background-color: var(--vn-section-color);
 }
-.bg-hover {
-    background-color: #666666;
+
+.bg-vn-hover {
+    background-color: var(--vn-section-hover-color);
 }
 
 .color-vn-label {
@@ -183,8 +186,6 @@ select:-webkit-autofill {
     justify-content: center;
 }
 
-/* q-notification row items-stretch q-notification--standard bg-negative text-white */
-
 .q-card,
 .q-table,
 .q-table__bottom,
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index fbab06966..f1f18a89c 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -990,6 +990,7 @@ roadmap:
         stops: Stops
 route:
     pageTitles:
+        agency: Agency List
         routes: Routes
         cmrsList: CMRs list
         RouteList: List
diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
similarity index 98%
rename from src/pages/Agency/AgencyList.vue
rename to src/pages/Route/Agency/AgencyList.vue
index ec6506ba0..de335738d 100644
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -33,6 +33,7 @@ function exprBuilder(param, value) {
                 url="Agencies"
                 order="name"
                 :expr-builder="exprBuilder"
+                auto-load
             >
                 <template #body="{ rows }">
                     <CardList
diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Route/Agency/Card/AgencyBasicData.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencyBasicData.vue
rename to src/pages/Route/Agency/Card/AgencyBasicData.vue
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Route/Agency/Card/AgencyCard.vue
similarity index 82%
rename from src/pages/Agency/Card/AgencyCard.vue
rename to src/pages/Route/Agency/Card/AgencyCard.vue
index 6b2296df3..e1eebabf7 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Route/Agency/Card/AgencyCard.vue
@@ -1,5 +1,5 @@
 <script setup>
-import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
+import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
 </script>
 <template>
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Route/Agency/Card/AgencyDescriptor.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencyDescriptor.vue
rename to src/pages/Route/Agency/Card/AgencyDescriptor.vue
diff --git a/src/pages/Agency/Card/AgencyLog.vue b/src/pages/Route/Agency/Card/AgencyLog.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencyLog.vue
rename to src/pages/Route/Agency/Card/AgencyLog.vue
diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Route/Agency/Card/AgencyModes.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencyModes.vue
rename to src/pages/Route/Agency/Card/AgencyModes.vue
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Route/Agency/Card/AgencySummary.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencySummary.vue
rename to src/pages/Route/Agency/Card/AgencySummary.vue
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencyWorkcenter.vue
rename to src/pages/Route/Agency/Card/AgencyWorkcenter.vue
diff --git a/src/pages/Agency/locale/en.yml b/src/pages/Route/Agency/locale/en.yml
similarity index 100%
rename from src/pages/Agency/locale/en.yml
rename to src/pages/Route/Agency/locale/en.yml
diff --git a/src/pages/Agency/locale/es.yml b/src/pages/Route/Agency/locale/es.yml
similarity index 100%
rename from src/pages/Agency/locale/es.yml
rename to src/pages/Route/Agency/locale/es.yml
diff --git a/src/router/modules/agency.js b/src/router/modules/agency.js
index 6f281e21d..46a73bfff 100644
--- a/src/router/modules/agency.js
+++ b/src/router/modules/agency.js
@@ -1,88 +1,3 @@
 import { RouterView } from 'vue-router';
 
-export default {
-    path: '/agency',
-    name: 'Agency',
-    meta: {
-        title: 'agency',
-        icon: 'garage_home',
-        moduleName: 'Agency',
-    },
-    component: RouterView,
-    redirect: { name: 'AgencyCard' },
-    menus: {
-        main: [],
-        card: ['AgencyBasicData', 'AgencyModes', 'AgencyWorkCenters', 'AgencyLog'],
-    },
-    children: [
-        {
-            path: '/agency/:id',
-            name: 'AgencyCard',
-            component: () => import('src/pages/Agency/Card/AgencyCard.vue'),
-            redirect: { name: 'AgencySummary' },
-            children: [
-                {
-                    name: 'AgencySummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Agency/Card/AgencySummary.vue'),
-                },
-                {
-                    name: 'AgencyBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('pages/Agency/Card/AgencyBasicData.vue'),
-                },
-                {
-                    path: 'workCenter',
-                    name: 'AgencyWorkCenterCard',
-                    redirect: { name: 'AgencyWorkCenters' },
-                    children: [
-                        {
-                            path: '',
-                            name: 'AgencyWorkCenters',
-                            meta: {
-                                icon: 'apartment',
-                                title: 'workCenters',
-                            },
-                            component: () =>
-                                import('src/pages/Agency/Card/AgencyWorkcenter.vue'),
-                        },
-                    ],
-                },
-                {
-                    path: 'modes',
-                    name: 'AgencyModesCard',
-                    redirect: { name: 'AgencyModes' },
-                    children: [
-                        {
-                            path: '',
-                            name: 'AgencyModes',
-                            meta: {
-                                icon: 'format_list_bulleted',
-                                title: 'modes',
-                            },
-                            component: () =>
-                                import('src/pages/Agency/Card/AgencyModes.vue'),
-                        },
-                    ],
-                },
-                {
-                    name: 'AgencyLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Agency/Card/AgencyLog.vue'),
-                },
-            ],
-        },
-    ],
-};
+export default {};
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 8e08d7222..54019f27b 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'AgencyList'],
+        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'Agency'],
         card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
     },
     children: [
@@ -76,17 +76,106 @@ export default {
                     component: () => import('src/pages/Route/Cmr/CmrList.vue'),
                 },
                 {
-                    path: '/agency',
+                    path: 'agency',
+                    name: 'Agency',
+                    meta: {
+                        title: 'agency',
+                        icon: 'garage_home',
+                        moduleName: 'Agency',
+                    },
                     redirect: { name: 'AgencyList' },
+                    menus: {
+                        main: [],
+                        card: [
+                            'AgencyBasicData',
+                            'AgencyModes',
+                            'AgencyWorkCenters',
+                            'AgencyLog',
+                        ],
+                    },
                     children: [
                         {
-                            path: 'list',
-                            name: 'AgencyList',
-                            meta: {
-                                title: 'agencyList',
-                                icon: 'view_list',
-                            },
-                            component: () => import('src/pages/Agency/AgencyList.vue'),
+                            path: '/agency',
+                            name: 'AgencyCard',
+                            component: () =>
+                                import('src/pages/Route/Agency/Card/AgencyCard.vue'),
+                            redirect: { name: 'AgencySummary' },
+                            children: [
+                                {
+                                    name: 'AgencySummary',
+                                    path: 'summary',
+                                    meta: {
+                                        title: 'summary',
+                                        icon: 'view_list',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'src/pages/Route/Agency/Card/AgencySummary.vue'
+                                        ),
+                                },
+                                {
+                                    name: 'AgencyBasicData',
+                                    path: 'basic-data',
+                                    meta: {
+                                        title: 'basicData',
+                                        icon: 'vn:settings',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'pages/Route/Agency/Card/AgencyBasicData.vue'
+                                        ),
+                                },
+                                {
+                                    path: 'workCenter',
+                                    name: 'AgencyWorkCenterCard',
+                                    redirect: { name: 'AgencyWorkCenters' },
+                                    children: [
+                                        {
+                                            path: '',
+                                            name: 'AgencyWorkCenters',
+                                            meta: {
+                                                icon: 'apartment',
+                                                title: 'workCenters',
+                                            },
+                                            component: () =>
+                                                import(
+                                                    'src/pages/Route/Agency/Card/AgencyWorkcenter.vue'
+                                                ),
+                                        },
+                                    ],
+                                },
+                                {
+                                    path: 'modes',
+                                    name: 'AgencyModesCard',
+                                    redirect: { name: 'AgencyModes' },
+                                    children: [
+                                        {
+                                            path: '',
+                                            name: 'AgencyModes',
+                                            meta: {
+                                                icon: 'format_list_bulleted',
+                                                title: 'modes',
+                                            },
+                                            component: () =>
+                                                import(
+                                                    'src/pages/Route/Agency/Card/AgencyModes.vue'
+                                                ),
+                                        },
+                                    ],
+                                },
+                                {
+                                    name: 'AgencyLog',
+                                    path: 'log',
+                                    meta: {
+                                        title: 'log',
+                                        icon: 'history',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'src/pages/Route/Agency/Card/AgencyLog.vue'
+                                        ),
+                                },
+                            ],
                         },
                     ],
                 },
diff --git a/src/router/routes.js b/src/router/routes.js
index 805eefb8c..ca1296d36 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -17,7 +17,6 @@ import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
 import roadmap from 'src/router/modules/roadmap';
 import parking from 'src/router/modules/parking';
-import agency from 'src/router/modules/agency';
 import zone from 'src/router/modules/zone';
 import account from './modules/account';
 import monitor from 'src/router/modules/monitor';
@@ -79,7 +78,6 @@ const routes = [
             roadmap,
             entry,
             parking,
-            agency,
             ItemType,
             zone,
             account,
diff --git a/test/cypress/integration/agency/agencyWorkCenter.spec.js b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
similarity index 97%
rename from test/cypress/integration/agency/agencyWorkCenter.spec.js
rename to test/cypress/integration/route/agency/agencyWorkCenter.spec.js
index 8349260ee..a66476d47 100644
--- a/test/cypress/integration/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@@ -6,7 +6,6 @@ describe('AgencyWorkCenter', () => {
     });
 
     it('assign workCenter', () => {
-        cy.visit(`/#/agency`);
         cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
         cy.get('[href="#/agency/11/workCenter"] > .q-item__section--main').click();
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
@@ -27,7 +26,6 @@ describe('AgencyWorkCenter', () => {
     });
 
     it('error on duplicate workCenter', () => {
-        cy.visit(`/#/agency`);
         cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
         cy.get('[href="#/agency/11/workCenter"] > .q-item__section--main').click();
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();

From 9d1e7363ab86dbea97bf6d853f641cfe557bc03a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 10:13:33 +0200
Subject: [PATCH 22/44] refs #6897 fix filters

---
 src/i18n/locale/en.yml        | 12 ++++++++++++
 src/i18n/locale/es.yml        |  4 ++++
 src/pages/Entry/EntryList.vue |  7 +++----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index be019d1b1..ac78c062b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -338,6 +338,18 @@ entry:
         booked: Booked
         confirmed: Confirmed
         ordered: Ordered
+        tableVisibleColumns:
+            id: Id
+            reference: Reference
+            created: Creation
+            supplierFk: Supplier
+            isBooked: Booked
+            isConfirmed: Confirmed
+            isOrdered: Ordered
+            companyFk: Company
+            travelFk: Travel
+            isExcludedFromAvailable: Inventory
+            isRaid: Raid
     summary:
         commission: Commission
         currency: Currency
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 1f54f627f..545368279 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -337,6 +337,10 @@ entry:
             isBooked: Asentado
             isConfirmed: Confirmado
             isOrdered: Pedida
+            companyFk: Empresa
+            travelFk: Envio
+            isExcludedFromAvailable: Inventario
+            isRaid: Redada
     summary:
         commission: Comisión
         currency: Moneda
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 993a055dc..d24715e52 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -18,19 +18,19 @@ const entityId = computed(() => route.params.id);
 const entryFilter = {
     include: [
         {
-            relation: 'supplier',
+            relation: 'suppliers',
             scope: {
                 fields: ['id', 'name'],
             },
         },
         {
-            relation: 'travel',
+            relation: 'travels',
             scope: {
                 fields: ['id', 'ref'],
             },
         },
         {
-            relation: 'company',
+            relation: 'companies',
             scope: {
                 fields: ['id', 'code'],
             },
@@ -39,7 +39,6 @@ const entryFilter = {
 };
 
 const columns = computed(() => [
-
     {
         align: 'left',
         label: t('entry.list.tableVisibleColumns.id'),

From a6bb9af1a7531760c7de28a162482d0a2c5f60b6 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 10:48:58 +0200
Subject: [PATCH 23/44] refs #6897 fix filters

---
 src/pages/Entry/EntryList.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index d24715e52..997d58f37 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -114,8 +114,15 @@ const columns = computed(() => [
         attrs: {
             url: 'companies',
             fields: ['id', 'code'],
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
         },
         create: true,
+
+        format: (row, dashIfEmpty) => dashIfEmpty(row.companyCode),
     },
     {
         align: 'left',
@@ -125,8 +132,14 @@ const columns = computed(() => [
         attrs: {
             url: 'travels',
             fields: ['id', 'ref'],
+            optionLabel: 'ref',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
         },
         create: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
     },
     {
         align: 'left',

From 00321803ab8f9aba0ae88b55d722cecf4570981c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 10:57:13 +0200
Subject: [PATCH 24/44] refs #6897 fix filters, right filters

---
 src/pages/Entry/EntryLatestBuys.vue | 58 +++++++++++++----------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 83a7ba922..0fc906682 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -2,8 +2,9 @@
 import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
+import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
+import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
@@ -62,8 +63,6 @@ const arrayData = useArrayData('EntryLatestBuys', {
     order: ['itemFk DESC'],
     exprBuilder: exprBuilder,
 });
-const store = arrayData.store;
-const rows = computed(() => store.data);
 const rowsSelected = ref([]);
 
 const columns = [
@@ -73,14 +72,14 @@ const columns = [
         name: 'image',
         columnField: {
             component: VnImg,
-            attrs: (id) =>  {
+            attrs: (id) => {
                 return {
                     id,
                     width: '50px',
-                }
+                };
             },
         },
-        columnFilter: false
+        columnFilter: false,
     },
     {
         align: 'left',
@@ -107,31 +106,26 @@ const columns = [
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.description'),
         name: 'description',
-
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.size'),
         name: 'size',
-
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.tags'),
         name: 'tags',
-
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.type'),
         name: 'type',
-
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.intrastat'),
         name: 'intrastat',
-
     },
     {
         align: 'left',
@@ -139,7 +133,6 @@ const columns = [
         name: 'origin',
     },
     {
-
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
         name: 'weightByPiece',
@@ -148,80 +141,76 @@ const columns = [
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.isActive'),
         name: 'isActive',
-
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.family'),
-        name: 'family'
-
+        name: 'family',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.entryFk'),
-        name: 'entryFk'
-
+        name: 'entryFk',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.buyingValue'),
-        name: 'buyingValue'
-
+        name: 'buyingValue',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.freightValue'),
-        name: 'freightValue'
+        name: 'freightValue',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.comissionValue'),
-        name: 'comissionValue'
+        name: 'comissionValue',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
-        name: 'packageValue'
+        name: 'packageValue',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.isIgnored'),
-        name: 'isIgnored'
+        name: 'isIgnored',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.price2'),
-        name: 'price2'
+        name: 'price2',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.price3'),
-        name: 'price3'
+        name: 'price3',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.minPrice'),
-        name: 'minPrice'
+        name: 'minPrice',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.ektFk'),
-        name: 'ektFk'
+        name: 'ektFk',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.weight'),
-        name: 'weight'
+        name: 'weight',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.packagingFk'),
-        name: 'packagingFk'
+        name: 'packagingFk',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.packingOut'),
-        name: 'packingOut'
+        name: 'packingOut',
     },
     {
         align: 'left',
@@ -231,7 +220,7 @@ const columns = [
         columnField: {
             component: null,
         },
-        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing))
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing)),
     },
 ];
 
@@ -280,7 +269,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <VnSubToolbar/>
+    <RightMenu>
+        <template #right-panel>
+            <EntryLatestBuysFilter data-key="LatestBuys" />
+        </template>
+    </RightMenu>
+    <VnSubToolbar />
     <VnTable
         ref="tableRef"
         data-key="LatestBuys"

From 58e87a9af6362e9b715160d5f6daa98da273ccba Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 11:56:12 +0200
Subject: [PATCH 25/44] refs #6897 remove

---
 src/pages/Entry/EntryLatestBuys.vue | 91 -----------------------------
 1 file changed, 91 deletions(-)

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 0fc906682..dca32c08d 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -1,69 +1,15 @@
 <script setup>
 import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
-
 import { useStateStore } from 'stores/useStateStore';
-import { useArrayData } from 'composables/useArrayData';
-
-const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
 import { toDate } from 'src/filters';
 import VnImg from 'src/components/ui/VnImg.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-const rowsFetchDataRef = ref(null);
-const editTableCellDialogRef = ref(null);
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'id':
-        case 'size':
-        case 'weightByPiece':
-        case 'isActive':
-        case 'family':
-        case 'minPrice':
-        case 'packingOut':
-            return { [`i.${param}`]: value };
-        case 'name':
-        case 'description':
-            return { [`i.${param}`]: { like: `%${value}%` } };
-        case 'code':
-            return { 'it.code': value };
-        case 'intrastat':
-            return { 'intr.description': value };
-        case 'origin':
-            return { 'ori.code': value };
-        case 'landing':
-            return { [`lb.${param}`]: value };
-        case 'packing':
-        case 'grouping':
-        case 'quantity':
-        case 'entryFk':
-        case 'buyingValue':
-        case 'freightValue':
-        case 'comissionValue':
-        case 'packageValue':
-        case 'isIgnored':
-        case 'price2':
-        case 'price3':
-        case 'ektFk':
-        case 'weight':
-        case 'packagingFk':
-            return { [`b.${param}`]: value };
-    }
-};
-
-const params = reactive({});
-const arrayData = useArrayData('EntryLatestBuys', {
-    url: 'Buys/latestBuysFilter',
-    order: ['itemFk DESC'],
-    exprBuilder: exprBuilder,
-});
-const rowsSelected = ref([]);
 
 const columns = [
     {
@@ -224,45 +170,8 @@ const columns = [
     },
 ];
 
-const editTableCellFormFieldsOptions = [
-    { field: 'packing', label: t('entry.latestBuys.packing') },
-    { field: 'grouping', label: t('entry.latestBuys.grouping') },
-    { field: 'packageValue', label: t('entry.latestBuys.packageValue') },
-    { field: 'weight', label: t('entry.latestBuys.weight') },
-    { field: 'description', label: t('globals.description') },
-    { field: 'size', label: t('entry.latestBuys.size') },
-    { field: 'weightByPiece', label: t('entry.latestBuys.weightByPiece') },
-    { field: 'packingOut', label: t('entry.latestBuys.packingOut') },
-    { field: 'landing', label: t('entry.latestBuys.landing') },
-];
-
-const openEditTableCellDialog = () => {
-    editTableCellDialogRef.value.show();
-};
-
-const onEditCellDataSaved = async () => {
-    rowsSelected.value = [];
-    await rowsFetchDataRef.value.fetch();
-};
-
-const redirectToEntryBuys = (entryFk) => {
-    router.push({ name: 'EntryBuys', params: { id: entryFk } });
-};
-
-const applyColumnFilter = async (col) => {
-    try {
-        params[col.field] = col.columnFilter.filterValue;
-        await arrayData.addFilter({ params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
 onMounted(async () => {
     stateStore.rightDrawer = true;
-    // const filteredColumns = columns.value.filter((col) => col.name !== 'picture');
-    // allColumnNames.value = filteredColumns.map((col) => col.name);
-    // await arrayData.fetch({ append: false });
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));

From 3965608a188ed72b2d2bd8cd8deeb58b77691ddf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 12:15:05 +0200
Subject: [PATCH 26/44] refs #7366 fix travelList

---
 src/pages/Travel/TravelList.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 2b2af9dbf..a1d008302 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -134,6 +134,11 @@ const columns = computed(() => [
                 icon: 'contact_support',
                 action: redirectCreateEntryView,
             },
+            {
+                title: t('View Summary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, TravelSummary),
+            },
         ],
     },
 ]);

From 0c31755fdb3835a14bea2800c39dc040a441d164 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 12:21:18 +0200
Subject: [PATCH 27/44] refs #7366 fix summary

---
 src/pages/Travel/TravelList.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index a1d008302..872e6c06d 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -4,15 +4,13 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
-
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { computed } from 'vue';
-
+const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
 const stateStore = useStateStore();
 
-const warehouses = ref([]);
-
 const cloneTravel = (travelData) => {
     const stringifiedTravelData = JSON.stringify(travelData);
     redirectToCreateView(stringifiedTravelData);
@@ -26,10 +24,6 @@ const redirectCreateEntryView = (travelData) => {
     router.push({ name: 'EntryCreate', query: { travelFk: travelData.id } });
 };
 
-const getWarehouseName = (id) => {
-    return warehouses.value.find((warehouse) => warehouse.id === id).name;
-};
-
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });

From 31cd266ec7a6c7494b8f9c1a3f66bba392a13338 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 12:44:09 +0200
Subject: [PATCH 28/44] refs #7366 fix component

---
 src/pages/Travel/TravelList.vue | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 872e6c06d..980840b46 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -6,6 +6,8 @@ import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { computed } from 'vue';
+import TravelSummary from './Card/TravelSummary.vue';
+import { dashIfEmpty, toDate } from 'src/filters';
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
@@ -43,6 +45,9 @@ const columns = computed(() => [
         label: t('travel.travelList.tableVisibleColumns.ref'),
         field: 'ref',
         component: 'input',
+        columnField: {
+            component: null,
+        },
         cardVisible: true,
         create: true,
     },
@@ -56,6 +61,9 @@ const columns = computed(() => [
             url: 'agencyModes',
             fields: ['id', 'name'],
         },
+        columnField: {
+            component: null,
+        },
         cardVisible: true,
         create: true,
     },
@@ -65,8 +73,12 @@ const columns = computed(() => [
         label: t('travel.travelList.tableVisibleColumns.shipped'),
         field: 'shipped',
         component: 'date',
+        columnField: {
+            component: null,
+        },
         cardVisible: true,
         create: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.shipped)),
     },
     {
         align: 'left',
@@ -74,8 +86,12 @@ const columns = computed(() => [
         label: t('travel.travelList.tableVisibleColumns.landed'),
         field: 'landed',
         component: 'date',
+        columnField: {
+            component: null,
+        },
         cardVisible: true,
         create: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landed)),
     },
     {
         align: 'left',
@@ -87,6 +103,9 @@ const columns = computed(() => [
             url: 'warehouses',
             fields: ['id', 'name'],
         },
+        columnField: {
+            component: null,
+        },
         cardVisible: true,
         create: true,
     },
@@ -100,6 +119,9 @@ const columns = computed(() => [
             url: 'warehouses',
             fields: ['id', 'name'],
         },
+        columnField: {
+            component: null,
+        },
         cardVisible: true,
         create: true,
     },
@@ -109,6 +131,9 @@ const columns = computed(() => [
         label: t('travel.travelList.tableVisibleColumns.totalEntries'),
         field: 'totalEntries',
         component: 'input',
+        columnField: {
+            component: null,
+        },
         cardVisible: true,
         create: true,
     },

From 95a3043359cc30e1f4d0f6b6f87aabf66d8f9aee Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 13:16:25 +0200
Subject: [PATCH 29/44] refs #6898 fix colmns subtoolbar

---
 src/pages/Supplier/SupplierList.vue | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index efb86b4bb..9a135f1a5 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -2,6 +2,7 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
+import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -19,24 +20,36 @@ const columns = computed(() => [
         name: 'name',
         create: true,
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nif'),
         name: 'nif',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nickname'),
         name: 'nickname',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.account'),
         name: 'account',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
@@ -47,17 +60,24 @@ const columns = computed(() => [
             url: 'payMethods',
             fields: ['id', 'name'],
         },
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payDay'),
         name: 'payDat',
         component: 'input',
+        columnField: {
+            component: null,
+        },
     },
 ]);
 </script>
 
 <template>
+    <VnSubToolbar />
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"

From 56017645c24f51a4295e7575393db59817051fda Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 13:20:55 +0200
Subject: [PATCH 30/44] refs #6898 fix search

---
 src/pages/Supplier/SupplierList.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 9a135f1a5..d7ff17ca7 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -2,7 +2,8 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import RightMenu from 'components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -77,7 +78,12 @@ const columns = computed(() => [
 </script>
 
 <template>
-    <VnSubToolbar />
+    <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
+    <RightMenu>
+        <template #right-panel>
+            <SupplierListFilter data-key="SuppliersList" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"

From f4a77f5030d1dfbf677ebadb834beb533a6f9d96 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 1 Jul 2024 13:31:24 +0200
Subject: [PATCH 31/44] refs #6898 fix search datakey

---
 src/pages/Supplier/SupplierList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index d7ff17ca7..c2b63e1b9 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import RightMenu from 'components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();

From 363abb899f955465724d457567350a572456157c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 3 Jul 2024 08:20:16 +0200
Subject: [PATCH 32/44] fix: refs #7543 fix changed descriptors

---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 13 +------------
 src/pages/Ticket/Card/TicketDescriptor.vue       |  4 ----
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index e8428dca1..68dc5be4b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -9,7 +9,6 @@ import { useRole } from 'src/composables/useRole';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
-import useCardDescription from 'src/composables/useCardDescription';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import FetchData from 'src/components/FetchData.vue';
@@ -20,12 +19,7 @@ import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceInToBook from '../InvoiceInToBook.vue';
 
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: null,
-    },
-});
+const $props = defineProps({ id: { type: Number, default: null } });
 
 const { push, currentRoute } = useRouter();
 
@@ -258,9 +252,6 @@ const createInvoiceInCorrection = async () => {
     );
     push({ path: `/invoice-in/${correctingId}/summary` });
 };
-
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
 </script>
 <template>
     <FetchData
@@ -292,8 +283,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         :url="`InvoiceIns/${entityId}`"
         :filter="filter"
         title="supplierRef"
-        @on-fetch="setData"
-        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <InvoiceInToBook>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 46dbf04f9..b753d0b4c 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -70,8 +70,6 @@ const filter = {
 };
 
 const data = ref(useCardDescription());
-const setData = (entity) =>
-    (data.value = useCardDescription(entity.client?.name, entity.id));
 </script>
 
 <template>
@@ -82,8 +80,6 @@ const setData = (entity) =>
         :title="data.title"
         :subtitle="data.subtitle"
         data-key="ticketData"
-        @on-fetch="setData"
-        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />

From ad2265fe7c6d4db98c02653b3d3be9eaf49653a1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jul 2024 08:43:23 +0200
Subject: [PATCH 33/44] refs #7366 fix travel migration

---
 src/composables/useArrayData.js         |  1 -
 src/pages/Travel/Card/TravelCard.vue    |  6 +++++-
 src/pages/Travel/Card/TravelSummary.vue |  2 --
 src/pages/Travel/TravelList.vue         | 27 ++++++++++++++++++++-----
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index f6f476f87..cdf965417 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -21,7 +21,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     onMounted(() => {
         setOptions();
         store.skip = 0;
-
         const query = route.query;
         const searchUrl = store.searchUrl;
         if (query[searchUrl]) {
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index bf7e6d57a..a3c1430e9 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -33,8 +33,12 @@ const filter = {
 <template>
     <VnCard
         data-key="Travel"
-        :filter="filter"
         base-url="Travels"
+        search-data-key="TravelList"
+        searchbar-label="Search travel"
+        searchbar-info="You can search by travel id or name"
+        search-url="Travels"
+        :filter="filter"
         :descriptor="TravelDescriptor"
     />
 </template>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 88ddee9a2..7900688cb 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -12,8 +12,6 @@ import FetchData from 'src/components/FetchData.vue';
 import { toDate, toCurrency } from 'src/filters';
 import axios from 'axios';
 
-onUpdated(() => summaryRef.value.fetch());
-
 const $props = defineProps({
     id: {
         type: Number,
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 980840b46..78844d4b6 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -2,17 +2,27 @@
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { computed } from 'vue';
 import TravelSummary from './Card/TravelSummary.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { dashIfEmpty, toDate } from 'src/filters';
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
 const stateStore = useStateStore();
-
+const route = useRoute();
+const tableRef = ref();
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+const entityId = computed(() => $props.id || route.params.id);
 const cloneTravel = (travelData) => {
     const stringifiedTravelData = JSON.stringify(travelData);
     redirectToCreateView(stringifiedTravelData);
@@ -164,16 +174,21 @@ const columns = computed(() => [
 </script>
 
 <template>
+    <VnSearchbar
+        :info="t('You can search by travel id or name')"
+        :label="t('Search travel')"
+        data-key="TravelList"
+    />
     <VnTable
         ref="tableRef"
-        data-key="Travels"
-        :url="`Travels`"
+        data-key="TravelList"
+        url="Travels"
         :create="{
             urlCreate: 'Travels',
             title: t('Create Travels'),
-            onDataSaved: () => tableRef.reload(),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {
-                workerFk: entityId,
+                editorFk: entityId,
             },
         }"
         order="landed DESC"
@@ -195,4 +210,6 @@ en:
 es:
     addEntry: Añadir entrada
     searchByIdOrReference: Buscar por ID o por referencia
+    You can search by travel id or name: Buscar por envio por id o nombre
+    Search travel: Buscar envio
 </i18n>

From 11266b602ce3c0fe704f42cb01cf3e638236b4e3 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 3 Jul 2024 09:33:48 +0200
Subject: [PATCH 34/44] refactor: refs #7404 route list add table

---
 src/components/ui/VnSubToolbar.vue            |  8 +--
 src/pages/Route/RouteList.vue                 | 62 ++++++++++---------
 src/pages/Route/RouteMain.vue                 |  3 +-
 src/stores/useStateStore.js                   |  2 +-
 .../integration/route/routeList.spec.js       | 39 ++++++++++++
 .../vnComponent/vnBreadcrumbs.spec.js         | 21 +++++++
 .../vnComponent/vnLocation.spec.js            | 56 +++++++++++++++++
 .../integration/vnComponent/vnLog.spec.js     | 25 ++++++++
 .../vnComponent/vnSearchBar.spec.js           | 36 +++++++++++
 9 files changed, 213 insertions(+), 39 deletions(-)
 create mode 100644 test/cypress/integration/route/routeList.spec.js
 create mode 100644 test/cypress/integration/vnComponent/vnBreadcrumbs.spec.js
 create mode 100644 test/cypress/integration/vnComponent/vnLocation.spec.js
 create mode 100644 test/cypress/integration/vnComponent/vnLog.spec.js
 create mode 100644 test/cypress/integration/vnComponent/vnSearchBar.spec.js

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 427673345..df6fcbcb7 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -1,7 +1,6 @@
 <script setup>
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onMounted, onBeforeUnmount, ref, nextTick } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
-import { onBeforeRouteLeave } from 'vue-router';
 
 const stateStore = useStateStore();
 const actions = ref(null);
@@ -26,10 +25,7 @@ onMounted(() => {
     if (data.value) observer.observe(data.value, opts);
 });
 
-onUnmounted(() => {
-    stateStore.toggleSubToolbar();
-});
-onBeforeRouteLeave((to, from) => {});
+onBeforeUnmount(() => stateStore.toggleSubToolbar());
 </script>
 
 <template>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 80eb3bf62..a2e938d7d 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -240,35 +240,7 @@ onMounted(() => {
     />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
     <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
-    <VnSubToolbar>
-        <QBtn
-            icon="vn:clone"
-            color="primary"
-            class="q-mr-sm"
-            :disable="!selectedRows?.length"
-            @click="confirmationDialog = true"
-        >
-            <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
-        </QBtn>
-        <QBtn
-            icon="cloud_download"
-            color="primary"
-            class="q-mr-sm"
-            :disable="!selectedRows?.length"
-            @click="showRouteReport"
-        >
-            <QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
-        </QBtn>
-        <QBtn
-            icon="check"
-            color="primary"
-            class="q-mr-sm"
-            :disable="!selectedRows?.length"
-            @click="markAsServed()"
-        >
-            <QTooltip>{{ t('Mark as served') }}</QTooltip>
-        </QBtn>
-    </VnSubToolbar>
+    <VnSubToolbar />
     <VnTable
         ref="tableRef"
         data-key="RouteList"
@@ -284,7 +256,37 @@ onMounted(() => {
         }"
         save-url="WorkerIncomes/crud"
         :disable-option="{ card: true }"
-    />
+    >
+        <template #moreBeforeActions>
+            <QBtn
+                icon="vn:clone"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="confirmationDialog = true"
+            >
+                <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                icon="cloud_download"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="showRouteReport"
+            >
+                <QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                icon="check"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="markAsServed()"
+            >
+                <QTooltip>{{ t('Mark as served') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnTable>
 
     <!--  >
             <VnPaginate
diff --git a/src/pages/Route/RouteMain.vue b/src/pages/Route/RouteMain.vue
index 19ae5ec23..aace646fb 100644
--- a/src/pages/Route/RouteMain.vue
+++ b/src/pages/Route/RouteMain.vue
@@ -14,7 +14,6 @@ onMounted(() => (stateStore.leftDrawer = false));
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <VnSubToolbar />
-        <RouterView v-if="stateStore.isSubToolbarShown()"></RouterView>
+        <RouterView></RouterView>
     </QPageContainer>
 </template>
diff --git a/src/stores/useStateStore.js b/src/stores/useStateStore.js
index 76840c96a..9f232e1dc 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -17,7 +17,7 @@ export const useStateStore = defineStore('stateStore', () => {
 
     function toggleSubToolbar() {
         subToolbar.value = !subToolbar.value;
-        /*  console.log('subToolbar.value: ', subToolbar.value); */
+        console.log('subToolbar.value: ', subToolbar.value);
     }
 
     function setMounted() {
diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
new file mode 100644
index 000000000..6d33dbc39
--- /dev/null
+++ b/test/cypress/integration/route/routeList.spec.js
@@ -0,0 +1,39 @@
+describe('AgencyWorkCenter', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/agency/11/workCenter`);
+    });
+
+    it('assign workCenter', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(
+            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('workCenterOne{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
+
+    it('delete workCenter', () => {
+        cy.get('.q-item__section--side > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'WorkCenter removed successfully'
+        );
+    });
+
+    it('error on duplicate workCenter', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(
+            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('workCenterOne{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(
+            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('workCenterOne{enter}');
+
+        cy.get(
+            ':nth-child(2) > .q-notification__wrapper > .q-notification__content > .q-notification__message'
+        ).should('have.text', 'This workCenter is already assigned to this agency');
+    });
+});
diff --git a/test/cypress/integration/vnComponent/vnBreadcrumbs.spec.js b/test/cypress/integration/vnComponent/vnBreadcrumbs.spec.js
new file mode 100644
index 000000000..3c839c1c7
--- /dev/null
+++ b/test/cypress/integration/vnComponent/vnBreadcrumbs.spec.js
@@ -0,0 +1,21 @@
+/// <reference types="cypress" />
+describe('VnBreadcrumbs', () => {
+    const firstCard = '.q-infinite-scroll > :nth-child(1)';
+    const lastBreadcrumb = '.q-breadcrumbs--last > .q-breadcrumbs__el';
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit('/');
+    });
+
+    it('should not be breadcrumbs', () => {
+        cy.get('.q-breadcrumbs').should('not.exist');
+    });
+
+    it('should get the correct breadcrumbs', () => {
+        cy.visit('#/customer/list');
+        cy.get('.q-breadcrumbs__el').should('have.length', 2);
+
+        cy.get(firstCard).click();
+        cy.get(`${lastBreadcrumb} > .q-icon`).should('have.text', 'launch');
+    });
+});
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
new file mode 100644
index 000000000..6719d8391
--- /dev/null
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -0,0 +1,56 @@
+const locationOptions = '[role="listbox"] > div.q-virtual-scroll__content > .q-item';
+describe('VnLocation', () => {
+    const dialogInputs = '.q-dialog label input';
+    describe('Worker Create', () => {
+        const inputLocation = '.q-form input[aria-label="Location"]';
+        beforeEach(() => {
+            cy.viewport(1280, 720);
+            cy.login('developer');
+            cy.visit('/#/worker/create', { timeout: 5000 });
+            cy.waitForElement('.q-card');
+        });
+        it('Show all options', function () {
+            cy.get(inputLocation).click();
+            cy.get(locationOptions).should('have.length.at.least', 5);
+        });
+        it('input filter location as "al"', function () {
+            cy.get(inputLocation).click();
+            cy.get(inputLocation).clear();
+            cy.get(inputLocation).type('al');
+            cy.get(locationOptions).should('have.length.at.least', 3);
+        });
+        it('input filter location as "ecuador"', function () {
+            cy.get(inputLocation).click();
+            cy.get(inputLocation).clear();
+            cy.get(inputLocation).type('ecuador');
+            cy.get(locationOptions).should('have.length.at.least', 1);
+        });
+    });
+    describe('Fiscal-data', () => {
+        beforeEach(() => {
+            cy.viewport(1280, 720);
+            cy.login('developer');
+            cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
+            cy.waitForElement('.q-form');
+        });
+        it('Create postCode', function () {
+            cy.get('.q-form > .q-card > .vn-row:nth-child(6) .--add-icon').click();
+            cy.get('.q-card > h1').should('have.text', 'New postcode');
+            cy.get(dialogInputs).eq(0).clear('12');
+            cy.get(dialogInputs).eq(0).type('1234453');
+            cy.selectOption(
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4)   > .q-select > .q-field__inner > .q-field__control ',
+                'Valencia'
+            );
+            cy.selectOption(
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5)   > .q-select > .q-field__inner > .q-field__control ',
+                'Province one'
+            );
+            cy.selectOption(
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(6)  > .q-select > .q-field__inner > .q-field__control ',
+                'España'
+            );
+            cy.get('.q-mt-lg > .q-btn--standard').click();
+        });
+    });
+});
diff --git a/test/cypress/integration/vnComponent/vnLog.spec.js b/test/cypress/integration/vnComponent/vnLog.spec.js
new file mode 100644
index 000000000..4db724e99
--- /dev/null
+++ b/test/cypress/integration/vnComponent/vnLog.spec.js
@@ -0,0 +1,25 @@
+/// <reference types="cypress" />
+describe('VnLog', () => {
+    const chips = [
+        ':nth-child(1) > :nth-child(1) > .q-item__label > .q-chip > .q-chip__content',
+        ':nth-child(2) > :nth-child(1) > .q-item__label > .q-chip > .q-chip__content',
+    ];
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit(`/#/claim/${1}/log`);
+        cy.openRightMenu();
+    });
+    // Se tiene que cambiar el Accept-Language a 'en', ya hay una tarea para eso #7189.
+    xit('should filter by insert actions', () => {
+        cy.checkOption(':nth-child(7) > .q-checkbox');
+        cy.get('.q-page').click();
+        cy.validateContent(chips[0], 'Document');
+        cy.validateContent(chips[1], 'Beginning');
+    });
+
+    xit('should filter by entity', () => {
+        cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim');
+        cy.get('.q-page').click();
+        cy.validateContent(chips[0], 'Claim');
+    });
+});
diff --git a/test/cypress/integration/vnComponent/vnSearchBar.spec.js b/test/cypress/integration/vnComponent/vnSearchBar.spec.js
new file mode 100644
index 000000000..580199bc3
--- /dev/null
+++ b/test/cypress/integration/vnComponent/vnSearchBar.spec.js
@@ -0,0 +1,36 @@
+/// <reference types="cypress" />
+describe('VnSearchBar', () => {
+    const employeeId = ' #1';
+    const salesPersonId = ' #18';
+    const idGap = '.q-item > .q-item__label';
+    const vnTableRow = '.q-virtual-scroll__content';
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit('#/customer/list');
+    });
+
+    it('should redirect to customer summary page', () => {
+        searchAndCheck('1', employeeId);
+        searchAndCheck('salesPerson', salesPersonId);
+    });
+
+    it('should stay on the list page if there are several results or none', () => {
+        cy.writeSearchbar('salesA{enter}');
+        checkTableLength(2);
+
+        cy.clearSearchbar();
+
+        cy.writeSearchbar('0{enter}');
+        checkTableLength(0);
+    });
+
+    const searchAndCheck = (searchTerm, expectedText) => {
+        cy.clearSearchbar();
+        cy.writeSearchbar(`${searchTerm}{enter}`);
+        cy.get(idGap).should('have.text', expectedText);
+    };
+
+    const checkTableLength = (expectedLength) => {
+        cy.get(vnTableRow).find('tr').should('have.length', expectedLength);
+    };
+});

From a192c1e9949a61822d18a3bc420c601c6f3d1ad2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 3 Jul 2024 09:39:49 +0200
Subject: [PATCH 35/44] remove: refs #7404 remove spec

---
 .../integration/route/routeList.spec.js       | 39 -------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 test/cypress/integration/route/routeList.spec.js

diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
deleted file mode 100644
index 6d33dbc39..000000000
--- a/test/cypress/integration/route/routeList.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-describe('AgencyWorkCenter', () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('developer');
-        cy.visit(`/#/agency/11/workCenter`);
-    });
-
-    it('assign workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
-    });
-
-    it('delete workCenter', () => {
-        cy.get('.q-item__section--side > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('.q-notification__message').should(
-            'have.text',
-            'WorkCenter removed successfully'
-        );
-    });
-
-    it('error on duplicate workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
-
-        cy.get(
-            ':nth-child(2) > .q-notification__wrapper > .q-notification__content > .q-notification__message'
-        ).should('have.text', 'This workCenter is already assigned to this agency');
-    });
-});

From dff77277ac3bc0a4cc94da586f96850aad38a592 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jul 2024 10:05:05 +0200
Subject: [PATCH 36/44] refs #6897 fix summary, list, inputs

---
 src/components/VnTable/VnColumn.vue   |  6 +++++-
 src/components/common/VnInputDate.vue | 10 ++++++++++
 src/components/common/VnInputTime.vue |  9 +++++++++
 src/i18n/locale/en.yml                |  8 --------
 src/pages/Entry/Card/EntrySummary.vue |  2 --
 src/pages/Entry/EntryList.vue         | 13 +++++++------
 6 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index 6cd62d83e..2e60a9815 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -46,6 +46,7 @@ const defaultComponents = {
         component: markRaw(VnInput),
         attrs: {
             disable: !$props.isEditable,
+            class: 'fit',
         },
         forceAttrs: {
             label: $props.showLabel && $props.column.label,
@@ -55,6 +56,7 @@ const defaultComponents = {
         component: markRaw(VnInput),
         attrs: {
             disable: !$props.isEditable,
+            class: 'fit',
         },
         forceAttrs: {
             label: $props.showLabel && $props.column.label,
@@ -66,6 +68,7 @@ const defaultComponents = {
             readonly: true,
             disable: !$props.isEditable,
             style: 'min-width: 125px',
+            class: 'fit',
         },
         forceAttrs: {
             label: $props.showLabel && $props.column.label,
@@ -77,7 +80,7 @@ const defaultComponents = {
             const defaultAttrs = {
                 disable: !$props.isEditable,
                 'model-value': Boolean(prop),
-                class: 'no-padding',
+                class: 'no-padding fit',
             };
 
             if (typeof prop == 'number') {
@@ -94,6 +97,7 @@ const defaultComponents = {
         component: markRaw(VnSelect),
         attrs: {
             disable: !$props.isEditable,
+            class: 'fit',
         },
         forceAttrs: {
             label: $props.showLabel && $props.column.label,
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index a88540ebf..184f8a158 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -131,3 +131,13 @@ watch(
         </QInput>
     </div>
 </template>
+
+<style lang="scss">
+.vn-input-date.q-field--standard.q-field--readonly .q-field__control:before {
+    border-bottom-style: solid;
+}
+
+.vn-input-date.q-field--outlined.q-field--readonly .q-field__control:before {
+    border-style: solid;
+}
+</style>
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 3d482933a..9344ff869 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -111,3 +111,12 @@ watch(
         </QInput>
     </div>
 </template>
+<style lang="scss">
+.vn-input-time.q-field--standard.q-field--readonly .q-field__control:before {
+    border-bottom-style: solid;
+}
+
+.vn-input-time.q-field--outlined.q-field--readonly .q-field__control:before {
+    border-style: solid;
+}
+</style>
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3e95a1e8b..e0397db82 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -409,14 +409,6 @@ customer:
             hasCoreVnl: VNL core received
             hasSepaVnl: VNL B2B received
 entry:
-        tableVisibleColumns:
-            id: Id
-            reference: Reference
-            created: Creation
-            supplierFk: Supplier
-            isBooked: Booked
-            isConfirmed: Confirmed
-            isOrdered: Ordered
     list:
         newEntry: New entry
         landed: Landed
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index d08b7eed2..7b92b29d4 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -11,8 +11,6 @@ import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 
-onUpdated(() => summaryRef.value.fetch());
-
 const route = useRoute();
 const { t } = useI18n();
 
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 997d58f37..fe719db6e 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -14,6 +14,7 @@ const stateStore = useStateStore();
 const { t } = useI18n();
 const route = useRoute();
 const entityId = computed(() => route.params.id);
+const tableRef = ref();
 
 const entryFilter = {
     include: [
@@ -51,6 +52,10 @@ const columns = computed(() => [
         label: t('entry.list.tableVisibleColumns.reference'),
         name: 'reference',
         isTitle: true,
+        component: 'input',
+        columnField: {
+            component: null,
+        },
         create: true,
         cardVisible: true,
     },
@@ -188,16 +193,12 @@ onMounted(async () => {
         ref="tableRef"
         data-key="EntryList"
         url="Entries/filter"
-        url-create="Entries"
-        save-url="Entries/crud"
         :filter="entryFilter"
         :create="{
             urlCreate: 'Entries',
             title: 'Create entry',
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: {
-                workerFk: entityId,
-            },
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
         }"
         order="id DESC"
         :columns="columns"

From 7d8f9d4072572bf9259d5863f3ea459c0c3dfe09 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 3 Jul 2024 10:06:54 +0200
Subject: [PATCH 37/44] fix: refs #7404 fix create

---
 src/pages/Route/RouteList.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index a2e938d7d..65385d90a 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -194,11 +194,6 @@ const openTicketsDialog = (id) => {
         })
         .onOk(() => refreshKey.value++);
 };
-
-const isMounted = ref(false);
-onMounted(() => {
-    console.log('Lo impoosible si  es posible ');
-});
 </script>
 
 <template>
@@ -254,7 +249,7 @@ onMounted(() => {
             title: t('Create route'),
             onDataSaved: () => tableRef.reload(),
         }"
-        save-url="WorkerIncomes/crud"
+        save-url="routes"
         :disable-option="{ card: true }"
     >
         <template #moreBeforeActions>

From 937167ce95ac80baacf2de7376e66898d635ec5e Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 3 Jul 2024 10:19:47 +0200
Subject: [PATCH 38/44] remove: refs #7404 remove traductions

---
 src/components/CrudModel.vue    |  71 -----------
 src/i18n/locale/en.yml          |   3 +-
 src/i18n/locale/es.yml          |   3 +-
 src/pages/Route/Cmr/CmrList.vue |   1 -
 src/pages/Route/RouteList.vue   | 214 --------------------------------
 5 files changed, 2 insertions(+), 290 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 9ef932e21..fa7761c5f 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -318,77 +318,6 @@ watch(formUrl, async () => {
         v-if="!formData && $attrs.autoLoad"
         :columns="$attrs.columns?.length"
     />
-    {{ stateStore?.isSubToolbarShown() && hasSubToolbar }}
-    <!-- <VnSubToolbar>
-        <template #st-actions>
-            <QBtnGroup push style="column-gap: 10px">
-            <slot name="moreBeforeActions" />
-            <QBtn
-                :label="tMobile('globals.remove')"
-                color="primary"
-                icon="delete"
-                flat
-                @click="remove(selected)"
-                :disable="!selected?.length"
-                :title="t('globals.remove')"
-                v-if="$props.defaultRemove"
-            />
-            <QBtn
-                :label="tMobile('globals.reset')"
-                color="primary"
-                icon="restart_alt"
-                flat
-                @click="reset"
-                :disable="!hasChanges"
-                :title="t('globals.reset')"
-                v-if="$props.defaultReset"
-            />
-            <QBtnDropdown
-                v-if="$props.goTo && $props.defaultSave"
-                @click="onSubmitAndGo"
-                :label="tMobile('globals.saveAndContinue')"
-                :title="t('globals.saveAndContinue')"
-                :disable="!hasChanges"
-                color="primary"
-                icon="save"
-                split
-            >
-                <QList>
-                    <QItem
-                        color="primary"
-                        clickable
-                        v-close-popup
-                        @click="onSubmit"
-                        :title="t('globals.save')"
-                    >
-                        <QItemSection>
-                            <QItemLabel>
-                                <QIcon
-                                    name="save"
-                                    color="white"
-                                    class="q-mr-sm"
-                                    size="sm"
-                                />
-                                {{ t('globals.save').toUpperCase() }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </QList>
-            </QBtnDropdown>
-            <QBtn
-                v-else-if="!$props.goTo && $props.defaultSave"
-                :label="tMobile('globals.save')"
-                ref="saveButtonRef"
-                color="primary"
-                icon="save"
-                @click="onSubmit"
-                :disable="!hasChanges"
-                :title="t('globals.save')"
-            />
-            <slot name="moreAfterActions" />
-        </QBtnGroup>
-        </template>
-    </VnSubToolbar> -->
     <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b04e803ca..5c417be9a 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -90,6 +90,7 @@ globals:
     send: Send
     code: Code
     pageTitles:
+        logIn: Login
         summary: Summary
         basicData: Basic data
         log: Logs
@@ -262,8 +263,6 @@ login:
     loginError: Invalid username or password
     fieldRequired: This field is required
     twoFactorRequired: Two-factor verification required
-    pageTitles:
-        logIn: Login
 twoFactor:
     code: Code
     validate: Validate
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e13b36c40..16c8c13f6 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -90,6 +90,7 @@ globals:
     send: Enviar
     code: Código
     pageTitles:
+        logIn: Inicio de sesión
         summary: Resumen
         basicData: Datos básicos
         log: Historial
@@ -263,8 +264,6 @@ login:
     loginError: Nombre de usuario o contraseña incorrectos
     fieldRequired: Este campo es obligatorio
     twoFactorRequired: Verificación de doble factor requerida
-    pageTitles:
-        logIn: Inicio de sesión
 twoFactor:
     code: Código
     validate: Validar
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index e61525dcf..7a8a0435c 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -118,7 +118,6 @@ function downloadPdfs() {
         :right-search="true"
         :use-model="true"
     />
-    <!-- <RightMenu>
         <template #right-panel>
             <CmrFilter data-key="CmrList" />
         </template>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 65385d90a..e116fd823 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -198,11 +198,6 @@ const openTicketsDialog = (id) => {
 
 <template>
     <RouteSearchbar />
-    <!--     <RightMenu>
-        <template #right-panel>
-            <RouteFilter data-key="RouteList" />
-        </template>
-    </RightMenu> -->
     <QDialog v-model="confirmationDialog">
         <QCard style="min-width: 350px">
             <QCardSection>
@@ -282,215 +277,6 @@ const openTicketsDialog = (id) => {
             </QBtn>
         </template>
     </VnTable>
-
-    <!--  >
-            <VnPaginate
-                :key="refreshKey"
-                data-key="RouteList"
-                url="Routes/filter"
-                :order="['created ASC', 'started ASC', 'id ASC']"
-                :limit="20"
-            >
-                <template #body="{ rows }">
-                    <div class="q-pa-md route-table">
-                        <QTable
-                            v-model:selected="selectedRows"
-                            :columns="columns"
-                            :rows="rows"
-                            flat
-                            row-key="id"
-                            selection="multiple"
-                            :rows-per-page-options="[0]"
-                            :visible-columns="visibleColumns"
-                            hide-pagination
-                            :no-data-label="t('globals.noResults')"
-                            style="max-height: 82vh"
-                        >
-                            <template #body-cell-worker="{ row }">
-                                <QTd class="table-input-cell">
-                                    <VnSelect
-                                        :label="t('Worker')"
-                                        v-model="row.workerFk"
-                                        :options="workers"
-                                        option-value="id"
-                                        option-label="nickname"
-                                        hide-selected
-                                        dense
-                                        :emit-value="false"
-                                        :rules="validate('Route.workerFk')"
-                                        :is-clearable="false"
-                                        @update:model-value="updateRoute(row)"
-                                    >
-                                        <template #option="{ opt, itemProps }">
-                                            <QItem
-                                                v-bind="itemProps"
-                                                class="q-pa-xs row items-center"
-                                            >
-                                                <QItemSection
-                                                    class="col-9 justify-center"
-                                                >
-                                                    <span>{{ opt.name }}</span>
-                                                    <span class="text-grey">{{
-                                                        opt.nickname
-                                                    }}</span>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </QTd>
-                            </template>
-                            <template #body-cell-agency="{ row }">
-                                <QTd class="table-input-cell">
-                                    <VnSelect
-                                        :label="t('Agency')"
-                                        v-model="row.agencyModeFk"
-                                        :options="agencyList"
-                                        option-value="id"
-                                        option-label="name"
-                                        hide-selected
-                                        dense
-                                        :emit-value="false"
-                                        :rules="validate('route.agencyFk')"
-                                        :is-clearable="false"
-                                        @update:model-value="updateRoute(row)"
-                                    />
-                                </QTd>
-                            </template>
-                            <template #body-cell-vehicle="{ row }">
-                                <QTd class="table-input-cell small-column">
-                                    <VnSelect
-                                        :label="t('Vehicle')"
-                                        v-model="row.vehicleFk"
-                                        :options="vehicleList"
-                                        option-value="id"
-                                        option-label="numberPlate"
-                                        hide-selected
-                                        dense
-                                        :emit-value="false"
-                                        :rules="validate('route.vehicleFk')"
-                                        :is-clearable="false"
-                                        @update:model-value="updateRoute(row)"
-                                    />
-                                </QTd>
-                            </template>
-                            <template #body-cell-date="{ row }">
-                                <QTd class="table-input-cell small-column">
-                                    <VnInputDate
-                                        v-model="row.created"
-                                        hide-bottom-space
-                                        dense
-                                        :label="t('Date')"
-                                        :rules="validate('route.created')"
-                                        :is-clearable="false"
-                                        @update:model-value="updateRoute(row)"
-                                    />
-                                </QTd>
-                            </template>
-                            <template #body-cell-description="{ row }">
-                                <QTd class="table-input-cell">
-                                    <VnInput
-                                        v-model="row.description"
-                                        :label="t('Description')"
-                                        :rules="validate('route.description')"
-                                        :is-clearable="false"
-                                        dense
-                                        @update:model-value="updateRoute(row)"
-                                    />
-                                </QTd>
-                            </template>
-                            <template #body-cell-started="{ row }">
-                                <QTd class="table-input-cell small-column">
-                                    <VnInputTime
-                                        v-model="row.started"
-                                        :label="t('hourStarted')"
-                                        :rules="validate('route.started')"
-                                        :is-clearable="false"
-                                        hide-bottom-space
-                                        dense
-                                        @update:model-value="updateRoute(row)"
-                                    />
-                                </QTd>
-                            </template>
-                            <template #body-cell-finished="{ row }">
-                                <QTd class="table-input-cell small-column">
-                                    <VnInputTime
-                                        v-model="row.finished"
-                                        autofocus
-                                        :label="t('hourFinished')"
-                                        :rules="validate('route.finished')"
-                                        :is-clearable="false"
-                                        hide-bottom-space
-                                        dense
-                                        @update:model-value="updateRoute(row)"
-                                    />
-                                </QTd>
-                            </template>
-                            <template #body-cell-isServed="props">
-                                <QTd class="table-input-cell small-column">
-                                    <QCheckbox v-model="props.value" disable>
-                                        <QTooltip>
-                                            {{
-                                                props.value
-                                                    ? t('Route is closed')
-                                                    : t('Route is not served')
-                                            }}
-                                        </QTooltip>
-                                    </QCheckbox>
-                                </QTd>
-                            </template>
-                            <template #body-cell-actions="props">
-                                <QTd :props="props">
-                                    <div class="flex items-center no-wrap table-actions">
-                                        <QIcon
-                                            name="vn:ticketAdd"
-                                            size="sm"
-                                            color="primary"
-                                            class="cursor-pointer"
-                                            @click="openTicketsDialog(props?.row?.id)"
-                                        >
-                                            <QTooltip>{{ t('Add ticket') }}</QTooltip>
-                                        </QIcon>
-                                        <QIcon
-                                            name="preview"
-                                            size="sm"
-                                            color="primary"
-                                            @click="
-                                                viewSummary(props?.row?.id, RouteSummary)
-                                            "
-                                            class="cursor-pointer"
-                                        >
-                                            <QTooltip>{{ t('Preview') }}</QTooltip>
-                                        </QIcon>
-                                        <RouterLink
-                                            :to="{
-                                                name: 'RouteSummary',
-                                                params: { id: props?.row?.id },
-                                            }"
-                                        >
-                                            <QIcon
-                                                name="vn:eye"
-                                                size="xs"
-                                                color="primary"
-                                            >
-                                                <QTooltip>{{ t('Summary') }}</QTooltip>
-                                            </QIcon>
-                                        </RouterLink>
-                                    </div>
-                                </QTd>
-                            </template>
-                        </QTable>
-                    </div> 
-                </template>
-            </VnPaginate>
-        </div>-->
-    <!-- <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'RouteCreate' }">
-                <QBtn fab icon="add" color="primary" />
-                <QTooltip>
-                    {{ t('newRoute') }}
-                </QTooltip>
-            </RouterLink>
-        </QPageSticky> -->
 </template>
 
 <style lang="scss" scoped>

From 352580270b7c9c8793520f8c06bc94d0fb46e874 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jul 2024 10:25:21 +0200
Subject: [PATCH 39/44] refs #6989 fix reload

---
 src/pages/Supplier/Card/SupplierSummary.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index d007ad08f..9337724b0 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -9,8 +9,6 @@ import { dashIfEmpty } from 'src/filters';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
-onUpdated(() => summaryRef.value.fetch());
-
 const route = useRoute();
 const roleState = useRole();
 const { t } = useI18n();

From 5b98e968edfc27da064fd0eca6d01b45cda644e4 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 3 Jul 2024 10:27:11 +0200
Subject: [PATCH 40/44] remove: refs #7404 remove comments

---
 src/pages/Route/Cmr/CmrList.vue | 81 ---------------------------------
 src/stores/useStateStore.js     |  1 -
 2 files changed, 82 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 7a8a0435c..74a070cbf 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -118,87 +118,6 @@ function downloadPdfs() {
         :right-search="true"
         :use-model="true"
     />
-        <template #right-panel>
-            <CmrFilter data-key="CmrList" />
-        </template>
-    </RightMenu>
-    <div class="column items-center">
-        <div class="list">
-            <VnPaginate data-key="CmrList" :url="`Routes/cmrs`" order="cmrFk DESC">
-                <template #body="{ rows }">
-                    <QTable
-                        :columns="columns"
-                        :rows="rows"
-                        :dense="$q.screen.lt.md"
-                        row-key="cmrFk"
-                        selection="multiple"
-                        v-model:selected="selected"
-                        :grid="$q.screen.lt.md"
-                        auto-load
-                    >
-                        <template #top>
-                            <div style="width: 100%; display: table">
-                                <div style="float: right; color: lightgray">
-                                    {{ `${rows.length} ${t('route.cmr.list.results')}` }}
-                                </div>
-                            </div>
-                        </template>
-                        <template #body-cell-hasCmrDms="{ value }">
-                            <QTd align="center">
-                                <QBadge
-                                    text-color="black"
-                                    :id="value ? 'true' : 'false'"
-                                    :label="
-                                        value
-                                            ? t('route.cmr.list.true')
-                                            : t('route.cmr.list.false')
-                                    "
-                                />
-                            </QTd>
-                        </template>
-                        <template #body-cell-ticketFk="{ value }">
-                            <QTd align="right" class="text-primary">
-                                <span class="text-primary link">{{ value }}</span>
-                                <TicketDescriptorProxy :id="value" />
-                            </QTd>
-                        </template>
-                        <template #body-cell-clientFk="{ value }">
-                            <QTd align="right" class="text-primary">
-                                <span class="text-primary link">{{ value }}</span>
-                                <CustomerDescriptorProxy :id="value" />
-                            </QTd>
-                        </template>
-                        <template #body-cell-warehouseFk="{ value }">
-                            <QTd align="center">
-                                {{ warehouses.find(({ id }) => id === value)?.name }}
-                            </QTd>
-                        </template>
-                        <template #body-cell-icons="{ value }">
-                            <QTd align="center">
-                                <a :href="getCmrUrl(value)" target="_blank">
-                                    <QIcon
-                                        name="visibility"
-                                        color="primary"
-                                        size="md"
-                                        class="q-mr-sm q-ml-sm"
-                                    />
-                                    <QTooltip>
-                                        {{ t('route.cmr.list.viewCmr') }}
-                                    </QTooltip>
-                                </a>
-                            </QTd>
-                        </template>
-                    </QTable>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn @click="downloadPdfs" fab icon="cloud_download" color="primary" />
-            <QTooltip>
-                {{ t('route.cmr.list.downloadCmrs') }}
-            </QTooltip>
-        </QPageSticky> 
-    </div> -->
 </template>
 <style lang="scss" scoped>
 .list {
diff --git a/src/stores/useStateStore.js b/src/stores/useStateStore.js
index 9f232e1dc..328df9978 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -17,7 +17,6 @@ export const useStateStore = defineStore('stateStore', () => {
 
     function toggleSubToolbar() {
         subToolbar.value = !subToolbar.value;
-        console.log('subToolbar.value: ', subToolbar.value);
     }
 
     function setMounted() {

From 109544f475194b4b818f13ba03c9fbcce3406f43 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jul 2024 13:18:17 +0200
Subject: [PATCH 41/44] fix searchbar

---
 src/pages/Supplier/SupplierList.vue | 2 +-
 src/pages/Travel/TravelList.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index c2b63e1b9..b8a6f7a92 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -88,7 +88,7 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"
-        :url="`Suppliers`"
+        :url="`Suppliers/filter`"
         save-url="Suppliers/crud"
         redirect="supplier"
         :create="{
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 78844d4b6..12a5fafa5 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -182,7 +182,7 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="TravelList"
-        url="Travels"
+        url="Travels/filter"
         :create="{
             urlCreate: 'Travels',
             title: t('Create Travels'),

From 161ebdc88ad1e197b3379a22580a86ef33008c8a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jul 2024 13:44:13 +0200
Subject: [PATCH 42/44] refs #6898  fix

---
 src/pages/Supplier/SupplierList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index b8a6f7a92..ce7d234c8 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -19,7 +19,7 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.name'),
-        name: 'name',
+        name: 'socialName',
         create: true,
         component: 'input',
         columnField: {
@@ -38,7 +38,7 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nickname'),
-        name: 'nickname',
+        name: 'alias',
         component: 'input',
         columnField: {
             component: null,
@@ -56,7 +56,7 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payMethod'),
-        name: 'payMethodFk',
+        name: 'payMethod',
         component: 'select',
         attrs: {
             url: 'payMethods',
@@ -88,7 +88,7 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"
-        :url="`Suppliers/filter`"
+        url="Suppliers/filter"
         save-url="Suppliers/crud"
         redirect="supplier"
         :create="{

From 218cc47834eedff76ac444cd19fa5eed72bc3c75 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 3 Jul 2024 13:44:35 +0200
Subject: [PATCH 43/44] fix: refs #6151 searchbar

---
 src/pages/Order/Card/OrderCard.vue   | 9 ++++++---
 src/pages/Travel/Card/TravelCard.vue | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 12b61e913..5b6896656 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
 import OrderFilter from './OrderFilter.vue';
+import OrderSearchbar from './OrderSearchbar.vue';
 </script>
 <template>
     <VnCard
@@ -10,7 +11,9 @@ import OrderFilter from './OrderFilter.vue';
         :descriptor="OrderDescriptor"
         :filter-panel="OrderFilter"
         search-data-key="OrderList"
-        searchbar-label="Search order"
-        searchbar-info="ypu can search by order id or name"
-    />
+    >
+        <template #searchbar>
+            <OrderSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index a3c1430e9..b87d2b9cc 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -37,7 +37,7 @@ const filter = {
         search-data-key="TravelList"
         searchbar-label="Search travel"
         searchbar-info="You can search by travel id or name"
-        search-url="Travels"
+        search-url="Travels/filter"
         :filter="filter"
         :descriptor="TravelDescriptor"
     />

From 95f488ba7666d37ea683667243af7ecb13f5572d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 3 Jul 2024 13:47:33 +0200
Subject: [PATCH 44/44] chore: refs #6151 rollback

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

diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index b87d2b9cc..a3c1430e9 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -37,7 +37,7 @@ const filter = {
         search-data-key="TravelList"
         searchbar-label="Search travel"
         searchbar-info="You can search by travel id or name"
-        search-url="Travels/filter"
+        search-url="Travels"
         :filter="filter"
         :descriptor="TravelDescriptor"
     />