Merge branch 'test' into hotfix_ItemDiary

package.json

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

src/components/CreateBankEntityForm.vue

@@ -52,7 +52,7 @@ onMounted(async () => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('name')"
                     v-model="data.name"
@@ -67,7 +67,7 @@ onMounted(async () => {
                     :rules="validate('bankEntity.bic')"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnSelect
                         :label="t('country')"

src/components/CreateManualInvoiceForm.vue

@@ -59,7 +59,7 @@ const onDataSaved = async (formData, requestResponse) => {
                 <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
                 {{ t('Invoicing in progress...') }}
             </span>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Ticket')"
                     :options="ticketsOptions"
@@ -99,7 +99,7 @@ const onDataSaved = async (formData, requestResponse) => {
                 />
                 <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Serial')"
                     :options="invoiceOutSerialsOptions"
@@ -117,7 +117,7 @@ const onDataSaved = async (formData, requestResponse) => {
                     v-model="data.taxArea"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('Reference')"
                     type="textarea"

src/components/CreateNewCityForm.vue

@@ -39,7 +39,7 @@ const onDataSaved = (...args) => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('Name')"
                     v-model="data.name"

src/components/CreateNewProvinceForm.vue

@@ -42,7 +42,7 @@ const onDataSaved = (dataSaved, requestResponse) => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('Name')"
                     v-model="data.name"

src/components/CreateThermographForm.vue

@@ -53,7 +53,7 @@ const onDataSaved = (dataSaved) => {
         @on-data-saved="onDataSaved($event)"
     >
         <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('Identifier')"
                     v-model="data.thermographId"

src/components/CrudModel.vue

@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, watch } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@@ -97,6 +97,19 @@ defineExpose({
     vnPaginateRef,
 });
 
+onBeforeRouteLeave((to, from, next) => {
+    if (hasChanges.value)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('globals.unsavedPopup.title'),
+                message: t('globals.unsavedPopup.subtitle'),
+                promise: () => next(),
+            },
+        });
+    else next();
+});
+
 async function fetch(data) {
     resetData(data);
     emit('onFetch', data);

src/components/EditPictureForm.vue

@@ -245,14 +245,14 @@ const makeRequest = async () => {
                 </div>
 
                 <div class="column">
-                    <VnRow class="row q-gutter-md q-mb-md">
+                    <VnRow>
                         <QOptionGroup
                             :options="uploadMethodsOptions"
                             type="radio"
                             v-model="uploadMethodSelected"
                         />
                     </VnRow>
-                    <VnRow class="row q-gutter-md q-mb-md">
+                    <VnRow>
                         <QFile
                             v-if="uploadMethodSelected === 'computer'"
                             ref="inputFileRef"
@@ -287,7 +287,7 @@ const makeRequest = async () => {
                             placeholder="https://"
                         />
                     </VnRow>
-                    <VnRow class="row q-gutter-md q-mb-md">
+                    <VnRow>
                         <VnSelect
                             :label="t('Orientation')"
                             :options="viewportTypes"

src/components/EditTableCellValueForm.vue

@@ -82,7 +82,7 @@ const closeForm = () => {
             <span class="title">{{ t('Edit') }}</span>
             <span class="countLines">{{ ` ${rows.length} ` }}</span>
             <span class="title">{{ t('buy(s)') }}</span>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Field to edit')"
                     :options="fieldsOptions"

src/components/FilterItemForm.vue

@@ -151,7 +151,7 @@ const selectItem = ({ id }) => {
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('Filter item') }}</h1>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
                 <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
                 <VnSelect

src/components/FilterTravelForm.vue

@@ -144,7 +144,7 @@ const selectTravel = ({ id }) => {
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('Filter travels') }}</h1>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('entry.basicData.agency')"
                     :options="agenciesOptions"

src/components/FormModel.vue

@@ -159,8 +159,8 @@ onBeforeRouteLeave((to, from, next) => {
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
-                title: t('Unsaved changes will be lost'),
+                title: t('globals.unsavedPopup.title'),
-                message: t('Are you sure exit without saving?'),
+                message: t('globals.unsavedPopup.subtitle'),
                 promise: () => next(),
             },
         });
@@ -356,8 +356,3 @@ defineExpose({
     padding: 32px;
 }
 </style>
-<i18n>
-es:
-    Unsaved changes will be lost: Los cambios que no haya guardado se perderán
-    Are you sure exit without saving?: ¿Seguro que quiere salir sin guardar?
-</i18n>

src/components/ItemsFilterPanel.vue

@@ -112,6 +112,7 @@ const getCategoryClass = (category, params) => {
 
 const getSelectedTagValues = async (tag) => {
     try {
+        if (!tag?.selectedTag?.id) return;
         tag.value = null;
         const filter = {
             fields: ['value'],

src/components/RegularizeStockForm.vue

@@ -49,7 +49,7 @@ const onDataSaved = (data) => {
         @on-data-saved="onDataSaved($event)"
     >
         <template #form-inputs="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QInput
                     :label="t('Type the visible quantity')"
                     v-model.number="data.quantity"
@@ -57,7 +57,7 @@ const onDataSaved = (data) => {
                     autofocus
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnSelect
                         :label="t('Warehouse')"

src/components/TransferInvoiceForm.vue

@@ -118,13 +118,13 @@ const makeInvoice = async () => {
     />
     <QDialog ref="dialogRef">
         <FormPopup
-        @on-submit="makeInvoice()"
+            @on-submit="makeInvoice()"
-        :title="t('Transfer invoice')"
+            :title="t('Transfer invoice')"
-        :custom-submit-button-label="t('Transfer client')"
+            :custom-submit-button-label="t('Transfer client')"
-        :default-cancel-button="false"
+            :default-cancel-button="false"
         >
-        <template #form-inputs>
+            <template #form-inputs>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnSelect
                         :label="t('Client')"
                         :options="clientsOptions"
@@ -160,7 +160,7 @@ const makeInvoice = async () => {
                         :required="true"
                     />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnSelect
                         :label="t('Class')"
                         :options="siiTypeInvoiceOutsOptions"
@@ -191,9 +191,12 @@ const makeInvoice = async () => {
                         :required="true"
                     />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div>
-                        <QCheckbox :label="t('Bill destination client')" v-model="checked" />
+                        <QCheckbox
+                            :label="t('Bill destination client')"
+                            v-model="checked"
+                        />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
                         </QIcon>

src/components/VnTable/VnChip.vue

@@ -35,7 +35,9 @@ function stopEventPropagation(event) {
             dense
             square
         >
-            <span v-if="!col.chip.icon">{{ row[col.name] }}</span>
+            <span v-if="!col.chip.icon">
+                {{ col.format ? col.format(row) : row[col.name] }}
+            </span>
             <QIcon v-else :name="col.chip.icon" color="primary-light" />
         </QChip>
     </span>

src/components/VnTable/VnColumn.vue

@@ -147,7 +147,7 @@ const col = computed(() => {
     }
     if (
         (newColumn.name.startsWith('is') || newColumn.name.startsWith('has')) &&
-        !newColumn.component
+        newColumn.component == null
     )
         newColumn.component = 'checkbox';
     if ($props.default && !newColumn.component) newColumn.component = $props.default;

src/components/VnTable/VnFilter.vue

@@ -75,6 +75,7 @@ const components = {
         attrs: {
             ...defaultAttrs,
             clearable: true,
+            type: 'number',
         },
         forceAttrs,
     },

src/components/VnTable/VnOrder.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useArrayData } from 'composables/useArrayData';
-const model = defineModel({ type: Object, required: true });
+const model = defineModel({ type: Object });
 const $props = defineProps({
     name: {
         type: String,
@@ -56,7 +56,7 @@ defineExpose({ orderBy });
         <span :title="label">{{ label }}</span>
         <QChip
             v-if="name"
-            :label="!vertical && model?.index"
+            :label="!vertical ? model?.index : ''"
             :icon="
                 (model?.index || hover) && !vertical
                     ? model?.direction == 'DESC'

src/components/VnTable/VnTable.vue

@@ -96,9 +96,9 @@ const route = useRoute();
 const router = useRouter();
 const quasar = useQuasar();
 
-const DEFAULT_MODE = 'card';
+const CARD_MODE = 'card';
 const TABLE_MODE = 'table';
-const mode = ref(DEFAULT_MODE);
+const mode = ref(CARD_MODE);
 const selected = ref([]);
 const hasParams = ref(false);
 const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
@@ -118,7 +118,7 @@ const tableModes = [
     {
         icon: 'grid_view',
         title: t('grid view'),
-        value: DEFAULT_MODE,
+        value: CARD_MODE,
         disable: $props.disableOption?.card,
     },
 ];
@@ -128,7 +128,10 @@ onBeforeMount(() => {
 });
 
 onMounted(() => {
-    mode.value = quasar.platform.is.mobile ? DEFAULT_MODE : $props.defaultMode;
+    mode.value =
+        quasar.platform.is.mobile && !$props.disableOption?.card
+            ? CARD_MODE
+            : $props.defaultMode;
     stateStore.rightDrawer = true;
     columnsVisibilitySkiped.value = [
         ...splittedColumns.value.columns
@@ -230,6 +233,7 @@ function stopEventPropagation(event) {
 }
 
 function reload(params) {
+    selected.value = [];
     CrudModelRef.value.reload(params);
 }
 
@@ -281,7 +285,9 @@ defineExpose({
                 <template #body>
                     <div
                         class="row no-wrap flex-center"
-                        v-for="col of splittedColumns.columns"
+                        v-for="col of splittedColumns.columns.filter(
+                            (c) => c.columnFilter ?? true
+                        )"
                         :key="col.id"
                     >
                         <VnTableFilter
@@ -378,7 +384,7 @@ defineExpose({
                         />
                     </template>
                     <template #header-cell="{ col }">
-                        <QTh v-if="col.visible ?? true" auto-width>
+                        <QTh v-if="col.visible ?? true">
                             <div
                                 class="column self-start q-ml-xs ellipsis"
                                 :class="`text-${col?.align ?? 'left'}`"
@@ -403,6 +409,7 @@ defineExpose({
                                     :data-key="$attrs['data-key']"
                                     v-model="params[columnName(col)]"
                                     :search-url="searchUrl"
+                                    class="full-width"
                                 />
                             </div>
                         </QTh>
@@ -427,7 +434,7 @@ defineExpose({
                         <QTd
                             auto-width
                             class="no-margin q-px-xs"
-                            :class="[getColAlign(col), col.class, col.columnField?.class]"
+                            :class="[getColAlign(col), col.columnClass]"
                             v-if="col.visible ?? true"
                             @click.ctrl="
                                 ($event) =>
@@ -455,6 +462,7 @@ defineExpose({
                         >
                             <QBtn
                                 v-for="(btn, index) of col.actions"
+                                v-show="btn.show ? btn.show(row) : true"
                                 :key="index"
                                 :title="btn.title"
                                 :icon="btn.icon"

src/components/common/VnComponent.vue

@@ -17,15 +17,17 @@ const $props = defineProps({
     },
 });
 
+let mixed;
 const componentArray = computed(() => {
     if (typeof $props.prop === 'object') return [$props.prop];
     return $props.prop;
 });
 
 function mix(toComponent) {
+    if (mixed) return mixed;
     const { component, attrs, event } = toComponent;
     const customComponent = $props.components[component];
-    return {
+    mixed = {
         component: customComponent?.component ?? component,
         attrs: {
             ...toValueAttrs(attrs),
@@ -35,6 +37,7 @@ function mix(toComponent) {
         },
         event: event ?? customComponent?.event,
     };
+    return mixed;
 }
 
 function toValueAttrs(attrs) {

src/components/common/VnInputTime.vue

@@ -50,7 +50,7 @@ const formattedTime = computed({
             }
             if (!props.timeOnly) {
                 const [hh, mm] = time.split(':');
-                const date = new Date(model.value ? model.value : null);
+                const date = model.value ?? Date.vnNew();
                 date.setHours(hh, mm, 0);
                 time = date?.toISOString();
             }
@@ -62,7 +62,7 @@ const formattedTime = computed({
 function dateToTime(newDate) {
     return date.formatDate(new Date(newDate), dateFormat);
 }
-
+const timeField = ref();
 watch(
     () => model.value,
     (val) => (formattedTime.value = val),

src/components/common/VnSectionMain.vue

@@ -1,8 +1,16 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'components/LeftMenu.vue';
+import { onMounted } from 'vue';
 
 const stateStore = useStateStore();
+const $props = defineProps({
+    leftDrawer: {
+        type: Boolean,
+        default: true,
+    },
+});
+onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
 </script>
 
 <template>

src/components/common/VnSelect.vue

@@ -31,7 +31,7 @@ const $props = defineProps({
     },
     url: {
         type: String,
-        default: '',
+        default: null,
     },
     filterOptions: {
         type: [Array],
@@ -119,7 +119,7 @@ function setOptions(data) {
 }
 
 function filter(val, options) {
-    const search = val.toString().toLowerCase();
+    const search = val?.toString()?.toLowerCase();
 
     if (!search) return options;
 

src/components/common/VnSelectCache.vue

@@ -10,6 +10,7 @@ const $props = defineProps({
     find: {
         type: [String, Object],
         default: null,
+        description: 'search in row to add default options',
     },
 });
 const options = ref([]);

src/components/common/VnTitle.vue

@@ -7,7 +7,7 @@ defineProps({
 </script>
 <template>
     <div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
-        <div class="header-link">
+        <div class="header-link" :style="{ cursor: url ? 'pointer' : 'default' }">
             <a :href="url" :class="url ? 'link' : 'color-vn-text'">
                 {{ text }}
                 <QIcon v-if="url" :name="icon" />

src/components/ui/CardDescriptor.vue

@@ -120,7 +120,7 @@ const toModule = computed(() =>
                         :icon="iconModule"
                         color="white"
                         class="link"
-                        :to="toModule"
+                        :to="$attrs['to-module'] ?? toModule"
                     >
                         <QTooltip>
                             {{ t('globals.goToModuleIndex') }}

src/components/ui/QCalendarMonthWrapper.vue

@@ -52,8 +52,8 @@ const containerClasses = computed(() => {
     --calendar-border-current: #84d0e2 2px solid;
     --calendar-current-color-dark: #84d0e2;
     // Colores de fondo del calendario en dark mode
-    --calendar-outside-background-dark: #222;
+    --calendar-outside-background-dark: var(--vn-section-color);
-    --calendar-background-dark: #222;
+    --calendar-background-dark: var(--vn-section-color);
 }
 
 // Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
@@ -70,8 +70,27 @@ const containerClasses = computed(() => {
     text-transform: capitalize;
 }
 
+.q-calendar-month__head--workweek,
+.q-calendar-month__head--weekday,
+// .q-calendar-month__workweek.q-past-day,
+.q-calendar-month__week :nth-child(6),
+:nth-child(7) {
+    color: var(--vn-label-color);
+}
+
+.q-calendar-month__head--weekdays > div[aria-label='miércoles'] > span {
+    /* color: transparent; */
+    visibility: hidden;
+    // position: absolute;
+}
+.q-calendar-month__head--weekdays > div[aria-label='miércoles'] > span:after {
+    content: 'X';
+    visibility: visible;
+    left: 33%;
+    position: absolute;
+}
 .transparent-background {
-    --calendar-background-dark: transparent;
+    // --calendar-background-dark: transparent;
     --calendar-background: transparent;
     --calendar-outside-background-dark: transparent;
 }
@@ -110,11 +129,6 @@ const containerClasses = computed(() => {
             cursor: pointer;
         }
     }
-    .q-calendar-month__week--days > div:nth-child(6),
-    .q-calendar-month__week--days > div:nth-child(7) {
-        // Cambia el color de los días sábado y domingo
-        color: #777777;
-    }
 
     .q-calendar-month__week--wrapper {
         margin-bottom: 4px;
@@ -124,6 +138,7 @@ const containerClasses = computed(() => {
         height: 32px;
         display: flex;
         justify-content: center;
+        color: var(--vn-label-color);
     }
 
     .q-calendar__button--bordered {
@@ -147,7 +162,7 @@ const containerClasses = computed(() => {
     .q-calendar-month__head--workweek,
     .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
         text-transform: capitalize;
-        color: $color-font-secondary;
+        color: var(--vn-label-color);
         font-weight: bold;
         font-size: 0.8rem;
         text-align: center;

src/components/ui/VnFilterPanel.vue

@@ -110,9 +110,11 @@ async function search(evt) {
 
     store.filter.where = {};
     isLoading.value = true;
-    const filter = { ...userParams.value };
+    const filter = { ...userParams.value, ...$props.modelValue };
     store.userParamsChanged = true;
-    const { params: newParams } = await arrayData.addFilter({ params: userParams.value });
+    const { params: newParams } = await arrayData.addFilter({
+        params: filter,
+    });
     userParams.value = newParams;
 
     if (!$props.showAll && !Object.values(filter).length) store.data = [];

src/components/ui/VnNotes.vue

@@ -1,13 +1,18 @@
 <script setup>
-import VnAvatar from 'src/components/ui/VnAvatar.vue';
-import { toDateHourMin } from 'src/filters';
-import { ref } from 'vue';
 import axios from 'axios';
+import { ref } from 'vue';
+import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnPaginate from './VnPaginate.vue';
+import { useQuasar } from 'quasar';
-import VnUserLink from '../ui/VnUserLink.vue';
+
+import { toDateHourMin } from 'src/filters';
 import { useState } from 'src/composables/useState';
 
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnUserLink from 'components/ui/VnUserLink.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnAvatar from 'components/ui/VnAvatar.vue';
+
 const $props = defineProps({
     url: { type: String, default: null },
     filter: { type: Object, default: () => {} },
@@ -17,6 +22,7 @@ const $props = defineProps({
 
 const { t } = useI18n();
 const state = useState();
+const quasar = useQuasar();
 const currentUser = ref(state.getUser());
 const newNote = ref('');
 const vnPaginateRef = ref();
@@ -33,6 +39,19 @@ async function insert() {
     await vnPaginateRef.value.fetch();
     newNote.value = '';
 }
+
+onBeforeRouteLeave((to, from, next) => {
+    if (newNote.value)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('globals.unsavedPopup.title'),
+                message: t('globals.unsavedPopup.subtitle'),
+                promise: () => next(),
+            },
+        });
+    else next();
+});
 </script>
 <template>
     <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">

src/components/ui/VnPaginate.vue

@@ -115,8 +115,8 @@ watch(
 );
 
 watch(
-    () => props.url,
+    () => [props.url, props.filter],
-    (url) => fetch({ url })
+    ([url, filter]) => fetch({ url, filter })
 );
 
 const addFilter = async (filter, params) => {

src/components/ui/VnRow.vue

@@ -1,5 +1,8 @@
+<script setup>
+defineProps({ wrap: { type: Boolean, default: false } });
+</script>
 <template>
-    <div class="vn-row q-gutter-md q-mb-md">
+    <div class="vn-row q-gutter-md q-mb-md" :class="{ wrap }">
         <slot></slot>
     </div>
 </template>

src/css/app.scss

@@ -153,6 +153,12 @@ select:-webkit-autofill {
     background-color: var(--vn-section-color);
 }
 
+.q-table td[shrink] {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    max-width: 80px;
+}
+
 .tr-header {
     color: var(--vn-label-color);
 }
@@ -188,13 +194,6 @@ select:-webkit-autofill {
     justify-content: center;
 }
 
-.q-card,
-.q-table,
-.q-table__bottom,
-.q-drawer {
-    background-color: var(--vn-section-color);
-}
-
 input[type='number'] {
     -moz-appearance: textfield;
 }
@@ -235,27 +234,33 @@ input::-webkit-inner-spin-button {
 }
 
 .q-table {
-    thead,
+    th,
-    tbody {
+    td {
-        th {
+        padding: 1px 10px 1px 10px;
-            .q-select {
+        max-width: 100px;
-                max-width: 120px;
+        div span {
-            }
-        }
-        td {
-            padding: 1px 10px 1px 10px;
-            max-width: 100px;
-            div span {
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-            }
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
         }
-        .expand {
+        overflow: hidden;
-            max-width: 400px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+    tr {
+        th {
+            font-size: 11pt;
+        }
+        td {
+            font-size: 11pt;
+            border-top: 1px solid var(--vn-page-color);
+            border-collapse: collapse;
         }
     }
+    .shrink {
+        max-width: 75px;
+    }
+    .expand {
+        max-width: 400px;
+    }
 }

src/i18n/locale/en.yml

@@ -254,6 +254,9 @@ globals:
     comment: Comment
     observations: Observations
     goToModuleIndex: Go to module index
+    unsavedPopup:
+        title: Unsaved changes will be lost
+        subtitle: Are you sure exit without saving?
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -386,8 +389,8 @@ customer:
     extendedList:
         tableVisibleColumns:
             id: Identifier
-            name: Comercial name
+            name: Name
-            socialName: Business name
+            socialName: Social name
             fi: Tax number
             salesPersonFk: Salesperson
             credit: Credit
@@ -997,18 +1000,6 @@ route:
             shipped: Preparation date
             viewCmr: View CMR
             downloadCmrs: Download CMRs
-    columnLabels:
-        Id: Id
-        vehicle: Vehicle
-        description: Description
-        isServed: Served
-        worker: Worker
-        date: Date
-        started: Started
-        actions: Actions
-        agency: Agency
-        volume: Volume
-        finished: Finished
 supplier:
     list:
         payMethod: Pay method

src/i18n/locale/es.yml

@@ -256,6 +256,9 @@ globals:
     comment: Comentario
     observations: Observaciones
     goToModuleIndex: Ir al índice del módulo
+    unsavedPopup:
+        title: Los cambios que no haya guardado se perderán
+        subtitle: ¿Seguro que quiere salir sin guardar?
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -385,7 +388,7 @@ customer:
     extendedList:
         tableVisibleColumns:
             id: Identificador
-            name: Nombre Comercial
+            name: Nombre
             socialName: Razón social
             fi: NIF / CIF
             salesPersonFk: Comercial
@@ -978,18 +981,6 @@ route:
             shipped: Fecha preparación
             viewCmr: Ver CMR
             downloadCmrs: Descargar CMRs
-    columnLabels:
-        Id: Id
-        vehicle: Vehículo
-        description: Descripción
-        isServed: Servida
-        worker: Trabajador
-        date: Fecha
-        started: Iniciada
-        actions: Acciones
-        agency: Agencia
-        volume: Volumen
-        finished: Finalizada
 supplier:
     list:
         payMethod: Método de pago

src/pages/Account/Alias/AliasCreateForm.vue

@@ -34,12 +34,12 @@ const onDataSaved = ({ id }) => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
                 </div>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnInput
                         v-model="data.description"

src/pages/Account/Card/AccountMailAliasCreateForm.vue

@@ -33,7 +33,7 @@ const aliasOptions = ref([]);
         @on-submit="emit('onSubmitCreateAlias', aliasFormData)"
     >
         <template #form-inputs>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnSelect
                         :label="t('account.card.alias')"

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

@@ -10,12 +10,12 @@ const { t } = useI18n();
 <template>
     <FormModel :url="`VnRoles/${route.params.id}`" model="VnRole" auto-load>
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnInput v-model="data.name" :label="t('role.card.name')" />
                 </div>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnInput
                         v-model="data.description"
@@ -23,7 +23,7 @@ const { t } = useI18n();
                     />
                 </div>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
                 </div>

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

@@ -21,12 +21,12 @@ const { t } = useI18n();
         "
     >
         <template #form-inputs="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnInput v-model="data.name" :label="t('role.card.name')" />
                 </div>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnInput
                         v-model="data.description"

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

@@ -33,7 +33,7 @@ const rolesOptions = ref([]);
         @on-submit="emit('onSubmitCreateSubrole', subRoleFormData)"
     >
         <template #form-inputs>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnSelect
                         :label="t('account.card.role')"

src/pages/Claim/Card/ClaimAction.vue

@@ -31,7 +31,7 @@ const destinationTypes = ref([]);
 const totalClaimed = ref(null);
 const DEFAULT_MAX_RESPONSABILITY = 5;
 const DEFAULT_MIN_RESPONSABILITY = 1;
-const arrayData = useArrayData('claimData');
+const arrayData = useArrayData('Claim');
 const marker_labels = [
     { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.company') },
     { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.person') },

src/pages/Claim/Card/ClaimBasicData.vue

@@ -74,7 +74,7 @@ const statesFilter = {
         :reload="true"
     >
         <template #form="{ data, validate, filter }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     v-model="data.client.name"
                     :label="t('claim.customer')"
@@ -82,7 +82,7 @@ const statesFilter = {
                 />
                 <VnInputDate v-model="data.created" :label="t('claim.created')" />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('claim.assignedTo')"
                     v-model="data.workerFk"
@@ -120,7 +120,7 @@ const statesFilter = {
                 >
                 </QSelect>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QInput
                     v-model.number="data.packages"
                     :label="t('globals.packages')"

src/pages/Claim/Card/ClaimNotes.vue

@@ -14,22 +14,24 @@ const $props = defineProps({
 });
 const claimId = computed(() => $props.id || route.params.id);
 
-const claimFilter = {
+const claimFilter = computed(() => {
-    where: { claimFk: claimId.value },
+    return {
-    fields: ['id', 'created', 'workerFk', 'text'],
+        where: { claimFk: claimId.value },
-    include: {
+        fields: ['id', 'created', 'workerFk', 'text'],
-        relation: 'worker',
+        include: {
-        scope: {
+            relation: 'worker',
-            fields: ['id', 'firstName', 'lastName'],
+            scope: {
-            include: {
+                fields: ['id', 'firstName', 'lastName'],
-                relation: 'user',
+                include: {
-                scope: {
+                    relation: 'user',
-                    fields: ['id', 'nickname'],
+                    scope: {
+                        fields: ['id', 'nickname'],
+                    },
                 },
             },
         },
-    },
+    };
-};
+});
 
 const body = {
     claimFk: claimId.value,

src/pages/Claim/Card/ClaimPhoto.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
@@ -22,10 +22,8 @@ const claimDms = ref([
     },
 ]);
 const client = ref({});
-
 const inputFile = ref();
 const files = ref({});
-
 const spinnerRef = ref();
 const claimDmsRef = ref();
 const dmsType = ref({});
@@ -58,6 +56,14 @@ const claimDmsFilter = ref({
 const multimediaDialog = ref();
 const multimediaSlide = ref();
 
+watch(
+    () => router.currentRoute.value.params.id,
+    () => {
+        claimDmsFilter.value.where.id = router.currentRoute.value.params.id;
+        claimDmsRef.value.fetch();
+    }
+);
+
 function openDialog(dmsId) {
     multimediaSlide.value = dmsId;
     multimediaDialog.value = true;

src/pages/Claim/Card/ClaimSummary.vue

@@ -279,7 +279,7 @@ async function changeState(value) {
                 <ClaimNotes
                     :id="entityId"
                     :add-note="false"
-                    class="max-container-height"
+                    style="max-height: 300px"
                     order="created ASC"
                 />
             </QCard>
@@ -330,7 +330,7 @@ async function changeState(value) {
                 <QTable
                     :columns="detailsColumns"
                     :rows="salesClaimed"
-                    flat
+                    separator="horizontal"
                     dense
                     :rows-per-page-options="[0]"
                     hide-bottom
@@ -344,7 +344,7 @@ async function changeState(value) {
                     </template>
                     <template #body="props">
                         <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                            <QTd v-for="col in props.cols" :key="col.name" :props="props">
                                 <span v-if="col.name != 'description'">{{
                                     t(col.value)
                                 }}</span>
@@ -359,7 +359,7 @@ async function changeState(value) {
                                     :id="props.row.sale.itemFk"
                                     :sale-fk="props.row.saleFk"
                                 ></ItemDescriptorProxy>
-                            </QTh>
+                            </QTd>
                         </QTr>
                     </template>
                 </QTable>
@@ -384,7 +384,7 @@ async function changeState(value) {
                     <template #body-cell-worker="props">
                         <QTd :props="props" class="link">
                             {{ props.value }}
-                            <WorkerDescriptorProxy :id="props.row.worker.id" />
+                            <WorkerDescriptorProxy :id="props.row.worker?.id" />
                         </QTd>
                     </template>
                 </QTable>

src/pages/Claim/ClaimFilter.vue

@@ -100,6 +100,7 @@ defineExpose({ states });
                     url="Items/withName"
                     option-value="id"
                     option-label="name"
+                    :use-like="false"
                     sort-by="id DESC"
                     outlined
                     rounded

src/pages/Claim/ClaimList.vue

@@ -44,7 +44,7 @@ const columns = computed(() => [
                 fields: ['id', 'name'],
             },
         },
-        class: 'expand',
+        columnClass: 'expand',
     },
     {
         align: 'left',
@@ -125,7 +125,7 @@ const STATE_COLOR = {
     <VnTable
         data-key="ClaimList"
         url="Claims/filter"
-        :order="['priority ASC', 'created DESC']"
+        :order="['priority ASC', 'created ASC']"
         :columns="columns"
         redirect="claim"
         :right-search="false"

src/pages/Claim/ClaimMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Customer/Card/CustomerBasicData.vue

@@ -67,7 +67,7 @@ const filterOptions = {
 
     <FormModel :url="`Clients/${route.params.id}`" auto-load model="customer">
         <template #form="{ data, validate, filter }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('globals.name')"
                     :rules="validate('client.socialName')"
@@ -88,7 +88,7 @@ const filterOptions = {
                     v-model="data.businessTypeFk"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('customer.basicData.contact')"
                     :rules="validate('client.contact')"
@@ -111,7 +111,7 @@ const filterOptions = {
                     </template>
                 </VnInput>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('customer.basicData.phone')"
                     :rules="validate('client.phone')"
@@ -125,7 +125,7 @@ const filterOptions = {
                     v-model="data.mobile"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QSelect
                     :input-debounce="0"
                     :label="t('customer.basicData.salesPerson')"
@@ -162,7 +162,7 @@ const filterOptions = {
                     :input-debounce="0"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QSelect
                     :input-debounce="0"
                     :label="t('customer.basicData.previousClient')"

src/pages/Customer/Card/CustomerBillingData.vue

@@ -47,7 +47,7 @@ const getBankEntities = (data, formData) => {
         model="customer"
     >
         <template #form="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Billing data')"
                     :options="payMethods"
@@ -59,7 +59,7 @@ const getBankEntities = (data, formData) => {
                 <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput :label="t('IBAN')" clearable v-model="data.iban">
                     <template #append>
                         <QIcon name="info" class="cursor-info">
@@ -94,7 +94,7 @@ const getBankEntities = (data, formData) => {
                 </VnSelectDialog>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
                 <QCheckbox :label="t('VNL core received')" v-model="data.hasCoreVnl" />
                 <QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />

src/pages/Customer/Card/CustomerConsumption.vue

@@ -1,13 +1,14 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-
+import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
+import { useStateStore } from 'src/stores/useStateStore';
 const { t } = useI18n();
 </script>
 
 <template>
-    <h5 class="flex justify-center color-vn-label">
+    <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
-        {{ t('Enter a new search') }}
+        <CustomerConsumptionFilter data-key="CustomerConsumption" />
-    </h5>
+    </Teleport>
 </template>
 
 <i18n>

src/pages/Customer/Card/CustomerConsumptionFilter.vue

@@ -0,0 +1,91 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import { QItem } from 'quasar';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import { QItemSection } from 'quasar';
+
+const { t } = useI18n();
+defineProps({ dataKey: { type: String, required: true } });
+</script>
+<template>
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.item')"
+                        v-model="params.itemId"
+                        is-outlined
+                        lazy-rules
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.buyerId"
+                        url="TicketRequests/getItemTypeWorker"
+                        :label="t('params.buyer')"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <!--It's required to include the relation category !! There's 413 records in production-->
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.typeId"
+                        url="ItemTypes"
+                        :label="t('params.type')"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        url="ItemCategories"
+                        :label="t('params.category')"
+                        option-label="name"
+                        option-value="id"
+                        v-model="params.categoryId"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+en:
+    params:
+        item: Item id
+        buyer: Buyer
+        type: Type
+        category: Category
+es:
+    params:
+        item: Id artículo
+        buyer: Comprador
+        type: Tipo
+        category: Categoría
+</i18n>

src/pages/Customer/Card/CustomerCreditOpinion.vue

@@ -88,7 +88,7 @@ watch(
         :url-create="`Clients/${route.params.id}/setRating`"
     >
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnInput
                         :label="t('Rating')"

src/pages/Customer/Card/CustomerCredits.vue

@@ -1,20 +1,14 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
-
 import { QBtn } from 'quasar';
-
 import { toCurrency, toDateHourMin } from 'src/filters';
-
+import VnTable from 'components/VnTable/VnTable.vue';
-import FetchData from 'components/FetchData.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
-
-const rows = ref([]);
 
 const filter = {
     include: [
@@ -26,113 +20,63 @@ const filter = {
             },
         },
     ],
-    where: { clientFk: route.params.id },
+    where: { clientFk: +route.params.id },
     order: ['created DESC'],
     limit: 20,
 };
 
-const tableColumnComponents = {
-    created: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    employee: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
-        event: () => {},
-    },
-    amount: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'created',
-        label: t('Since'),
         name: 'created',
-        format: (value) => toDateHourMin(value),
+        label: t('Since'),
+        format: ({ created }) => toDateHourMin(created),
     },
     {
         align: 'left',
-        field: (value) => value.worker.user.name,
         label: t('Employee'),
         name: 'employee',
     },
     {
         align: 'left',
-        field: 'amount',
         label: t('Credit'),
         name: 'amount',
-        format: (value) => toCurrency(value),
+        format: ({ amount }) => toCurrency(amount),
     },
 ]);
-
-const toCustomerCreditCreate = () => {
-    router.push({ name: 'CustomerCreditCreate' });
-};
 </script>
-
 <template>
-    <FetchData
+    <!-- Column titles are missing -->
-        :filter="filter"
+    <VnTable
-        @on-fetch="(data) => (rows = data)"
+        ref="tableRef"
-        auto-load
+        data-key="ClientCredit"
         url="ClientCredits"
-    />
+        :filter="filter"
-
+        :columns="columns"
-    <div class="full-width flex justify-center">
+        default-mode="table"
-        <QCard class="card-width q-pa-lg">
+        auto-load
-            <QTable
+        :right-search="false"
-                :columns="columns"
+        :is-editable="false"
-                :pagination="{ rowsPerPage: 12 }"
+        :use-model="true"
-                :rows="rows"
+        :column-search="false"
-                class="full-width q-mt-md"
+        :disable-option="{ card: true }"
-                row-key="id"
+    >
-                v-if="rows?.length"
+        <template #column-employee="{ row }">
-            >
+            <VnUserLink :name="row?.worker?.user?.name" :worker-id="row.worker?.id" />
-                <template #body-cell="props">
+        </template>
-                    <QTd :props="props">
+    </VnTable>
-                        <QTr :props="props" class="cursor-pointer">
-                            <component
-                                :is="tableColumnComponents[props.col.name].component"
-                                @click="
-                                    tableColumnComponents[props.col.name].event(props)
-                                "
-                                class="rounded-borders q-pa-sm"
-                                v-bind="
-                                    tableColumnComponents[props.col.name].props(props)
-                                "
-                            >
-                                {{ props.value }}
-                                <WorkerDescriptorProxy
-                                    :id="props.row.workerFk"
-                                    v-if="props.col.name === 'employee'"
-                                />
-                            </component>
-                        </QTr>
-                    </QTd>
-                </template>
-            </QTable>
-
-            <h5 class="flex justify-center color-vn-label" v-else>
-                {{ t('globals.noResults') }}
-            </h5>
-        </QCard>
-    </div>
-
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerCreditCreate()" color="primary" fab icon="add" />
+        <QBtn
+            @click.stop="$router.push({ name: 'CustomerCreditCreate' })"
+            color="primary"
+            fab
+            icon="add"
+        />
         <QTooltip>
             {{ t('New credit') }}
         </QTooltip>
     </QPageSticky>
 </template>
-
 <i18n>
 es:
     Since: Desde

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -39,7 +39,7 @@ function handleLocation(data, location) {
         model="customer"
     >
         <template #form="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('Social name')"
                     :required="true"
@@ -56,11 +56,11 @@ function handleLocation(data, location) {
                 <VnInput :label="t('Tax number')" clearable v-model="data.fi" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput :label="t('Street')" clearable v-model="data.street" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Sage tax type')"
                     :options="typesTaxes"
@@ -90,7 +90,7 @@ function handleLocation(data, location) {
                 </VnSelect>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"

src/pages/Customer/Card/CustomerSummary.vue

@@ -9,7 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
-
+import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
 
@@ -131,41 +131,33 @@ const creditWarning = computed(() => {
                     :url="`#/customer/${entityId}/fiscal-data`"
                     :text="t('customer.summary.fiscalData')"
                 />
-                <QCheckbox
+                <VnRow>
-                    :label="t('customer.summary.isEqualizated')"
+                    <VnLv
-                    v-model="entity.isEqualizated"
+                        :label="t('customer.summary.isEqualizated')"
-                    :disable="true"
+                        :value="entity.isEqualizated"
-                />
+                    />
-                <QCheckbox
+                    <VnLv
-                    :label="t('customer.summary.isActive')"
+                        :label="t('customer.summary.isActive')"
-                    v-model="entity.isActive"
+                        :value="entity.isActive"
-                    :disable="true"
+                    />
-                />
+                </VnRow>
-                <QCheckbox
+                <VnRow>
-                    :label="t('customer.summary.invoiceByAddress')"
+                    <VnLv
-                    v-model="entity.hasToInvoiceByAddress"
+                        :label="t('customer.summary.verifiedData')"
-                    :disable="true"
+                        :value="entity.isTaxDataChecked"
-                />
+                    />
-                <QCheckbox
+                    <VnLv
-                    :label="t('customer.summary.verifiedData')"
+                        :label="t('customer.summary.hasToInvoice')"
-                    v-model="entity.isTaxDataChecked"
+                        :value="entity.hasToInvoice"
-                    :disable="true"
+                    />
-                />
+                </VnRow>
-                <QCheckbox
+                <VnRow>
-                    :label="t('customer.summary.hasToInvoice')"
+                    <VnLv
-                    v-model="entity.hasToInvoice"
+                        :label="t('customer.summary.notifyByEmail')"
-                    :disable="true"
+                        :value="entity.isToBeMailed"
-                />
+                    />
-                <QCheckbox
+                    <VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
-                    :label="t('customer.summary.notifyByEmail')"
+                </VnRow>
-                    v-model="entity.isToBeMailed"
-                    :disable="true"
-                />
-                <QCheckbox
-                    :label="t('customer.summary.vies')"
-                    v-model="entity.isVies"
-                    :disable="true"
-                />
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
@@ -178,23 +170,18 @@ const creditWarning = computed(() => {
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
-                <QCheckbox
+                <VnRow class="q-mt-sm" wrap>
-                    style="padding: 0"
+                    <VnLv :label="t('customer.summary.hasLcr')" :value="entity.hasLcr" />
-                    :label="t('customer.summary.hasLcr')"
+                    <VnLv
-                    v-model="entity.hasLcr"
+                        :label="t('customer.summary.hasCoreVnl')"
-                    :disable="true"
+                        :value="entity.hasCoreVnl"
-                />
+                    />
-                <QCheckbox
-                    :label="t('customer.summary.hasCoreVnl')"
-                    v-model="entity.hasCoreVnl"
-                    :disable="true"
-                />
 
-                <QCheckbox
+                    <VnLv
-                    :label="t('customer.summary.hasB2BVnl')"
+                        :label="t('customer.summary.hasB2BVnl')"
-                    v-model="entity.hasSepaVnl"
+                        :value="entity.hasSepaVnl"
-                    :disable="true"
+                    />
-                />
+                </VnRow>
             </QCard>
             <QCard class="vn-one" v-if="entity.defaultAddress">
                 <VnTitle

src/pages/Customer/Card/CustomerUnpaid.vue

@@ -134,7 +134,7 @@ watch(
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg">
             <QForm>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col">
                         <QCheckbox :label="t('Unpaid client')" v-model="unpaidClient" />
                     </div>

src/pages/Customer/CustomerCreate.vue

@@ -47,7 +47,7 @@ function handleLocation(data, location) {
             url-create="Clients/createWithUser"
         >
             <template #form="{ data, validate }">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <QInput :label="t('Comercial name')" v-model="data.name" />
                     <VnSelect
                         :label="t('Salesperson')"
@@ -58,7 +58,7 @@ function handleLocation(data, location) {
                         v-model="data.salesPersonFk"
                     />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnSelect
                         :label="t('Business type')"
                         :options="businessTypesOptions"
@@ -69,21 +69,21 @@ function handleLocation(data, location) {
                     />
                     <QInput v-model="data.fi" :label="t('Tax number')" />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <QInput
                         :label="t('Business name')"
                         :rules="validate('client.socialName')"
                         v-model="data.socialName"
                     />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <QInput
                         :label="t('Street')"
                         :rules="validate('client.street')"
                         v-model="data.street"
                     />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
@@ -93,7 +93,7 @@ function handleLocation(data, location) {
                     </VnLocation>
                 </VnRow>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <QInput v-model="data.userName" :label="t('Web user')" />
                     <QInput
                         :label="t('Email')"

src/pages/Customer/CustomerList.vue

@@ -41,9 +41,7 @@ const columns = computed(() => [
         name: 'name',
         isTitle: true,
         create: true,
-        columnField: {
+        columnClass: 'expand',
-            class: 'expand',
-        },
     },
     {
         align: 'left',
@@ -51,9 +49,7 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.socialName'),
         isTitle: true,
         create: true,
-        columnField: {
+        columnClass: 'expand',
-            class: 'expand',
-        },
     },
     {
         align: 'left',
@@ -135,9 +131,7 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
-        columnField: {
+        columnClass: 'expand',
-            class: 'expand',
-        },
     },
     {
         align: 'left',

src/pages/Customer/CustomerMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -1,9 +1,8 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { QBtn, QCheckbox, useQuasar } from 'quasar';
+import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -11,8 +10,9 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
-import axios from 'axios';
+import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -21,175 +21,139 @@ const dataRef = ref(null);
 const balanceDueTotal = ref(0);
 const selected = ref([]);
 
-const tableColumnComponents = {
-    clientFk: {
-        component: QBtn,
-        props: () => ({ flat: true, class: 'link', noCaps: true }),
-        event: () => {},
-    },
-    isWorker: {
-        component: QCheckbox,
-        props: (prop) => ({
-            disable: true,
-            'model-value': Boolean(prop.value),
-        }),
-        event: () => {},
-    },
-    salesPerson: {
-        component: QBtn,
-        props: () => ({ flat: true, class: 'link', noCaps: true }),
-        event: () => {},
-    },
-    departmentName: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    country: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    payMethod: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    balance: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    author: {
-        component: QBtn,
-        props: () => ({ flat: true, class: 'link', noCaps: true }),
-        event: () => {},
-    },
-    lastObservation: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    date: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    credit: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    from: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    finished: {
-        component: QCheckbox,
-
-        props: (prop) => ({
-            disable: true,
-            'model-value': prop.value,
-        }),
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'clientName',
-        label: t('Client'),
         name: 'clientFk',
-        sortable: true,
+        label: t('Client'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'name'],
+            },
+        },
     },
     {
         align: 'left',
-        field: ({ isWorker }) => Boolean(isWorker),
-        label: t('Is worker'),
         name: 'isWorker',
+        label: t('Is worker'),
     },
     {
         align: 'left',
-        field: 'salesPersonName',
+        name: 'salesPersonFk',
         label: t('Salesperson'),
-        name: 'salesPerson',
+        columnFilter: {
-        sortable: true,
+            component: 'select',
+            attrs: {
+                url: 'Workers/activeWithInheritedRole',
+                fields: ['id', 'name'],
+                where: { role: 'salesPerson' },
+                useLike: false,
+                optionValue: 'id',
+                optionLabel: 'name',
+                optionFilter: 'firstName',
+            },
+        },
     },
     {
         align: 'left',
-        field: 'departmentName',
+        name: 'departmentFk',
         label: t('Department'),
-        name: 'departmentName',
+        columnFilter: {
-        sortable: true,
+            component: 'select',
+            attrs: {
+                url: 'Departments',
+                fields: ['id', 'name'],
+            },
+        },
     },
     {
         align: 'left',
-        field: 'country',
+        name: 'countryFk',
         label: t('Country'),
-        name: 'country',
+        format: ({ country }) => country,
-        sortable: true,
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Countries',
+                fields: ['id', 'name'],
+            },
+        },
     },
     {
         align: 'left',
-        field: 'payMethod',
-        label: t('P. Method'),
         name: 'payMethod',
-        sortable: true,
+        label: t('P. Method'),
-        tooltip: t('Pay method'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Paymethods',
+            },
+        },
     },
     {
         align: 'left',
-        field: ({ amount }) => toCurrency(amount),
+        name: 'amount',
         label: t('Balance D.'),
-        name: 'balance',
+        format: ({ amount }) => toCurrency(amount),
-        sortable: true,
-        tooltip: t('Balance due'),
     },
     {
         align: 'left',
-        field: 'workerName',
+        name: 'workerFk',
         label: t('Author'),
-        name: 'author',
-        sortable: true,
         tooltip: t('Worker who made the last observation'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Workers/activeWithInheritedRole',
+                fields: ['id', 'name'],
+                useLike: false,
+                optionValue: 'id',
+                optionLabel: 'name',
+                optionFilter: 'firstName',
+            },
+        },
     },
     {
         align: 'left',
-        field: 'observation',
+        name: 'observation',
         label: t('Last observation'),
-        name: 'lastObservation',
+        columnClass: 'expand',
-        sortable: true,
     },
     {
         align: 'left',
-        field: ({ created }) => toDate(created),
+        name: 'created',
         label: t('L. O. Date'),
-        name: 'date',
+        format: ({ created }) => toDate(created),
-        sortable: true,
         tooltip: t('Last observation date'),
+        columnFilter: {
+            component: 'date',
+        },
     },
     {
         align: 'left',
-        field: ({ creditInsurance }) => toCurrency(creditInsurance),
+        name: 'creditInsurance',
+        format: ({ creditInsurance }) => toCurrency(creditInsurance),
         label: t('Credit I.'),
-        name: 'credit',
-        sortable: true,
         tooltip: t('Credit insurance'),
+        columnFilter: {
+            component: 'number',
+        },
     },
     {
         align: 'left',
-        field: ({ defaulterSinced }) => toDate(defaulterSinced),
+        name: 'defaulterSinced',
+        format: ({ defaulterSinced }) => toDate(defaulterSinced),
         label: t('From'),
-        name: 'from',
+        columnFilter: {
-        sortable: true,
+            component: 'date',
+        },
     },
     {
         align: 'left',
-        field: 'finished',
+        label: t('Has recovery'),
-        label: t('Has recover'),
+        name: 'hasRecovery',
-        name: 'finished',
     },
 ]);
 
@@ -198,22 +162,12 @@ const viewAddObservation = (rowsSelected) => {
         component: CustomerDefaulterAddObservation,
         componentProps: {
             clients: rowsSelected,
-            promise: async () => await dataRef.value.fetch(),
+            promise: async () => await dataRef.value.reload(),
         },
     });
 };
 
 const onFetch = async (data) => {
-    const recoveryData = await axios.get('Recoveries');
-    const recoveries = recoveryData.data.map(({ clientFk, finished }) => ({
-        clientFk,
-        finished,
-    }));
-
-    data.forEach((item) => {
-        const recovery = recoveries.find(({ clientFk }) => clientFk === item.clientFk);
-        item.finished = recovery?.finished === null;
-    });
     balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
 
@@ -229,7 +183,7 @@ function exprBuilder(param, value) {
         case 'payMethod':
         case 'salesPersonFk':
             return { [`d.${param}`]: value };
-        case 'date':
+        case 'created':
             return { 'd.created': { between: dateRange(value) } };
         case 'defaulterSinced':
             return { 'd.defaulterSinced': { between: dateRange(value) } };
@@ -246,123 +200,64 @@ function exprBuilder(param, value) {
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
-            <div class="flex items-center q-ml-lg">
+        </template>
-                <QBtn
+        <template #st-actions>
-                    color="primary"
+            <QBtn
-                    icon="vn:notes"
+                color="primary"
-                    :disabled="!selected.length"
+                icon="vn:notes"
-                    @click.stop="viewAddObservation(selected)"
+                :disabled="!selected.length"
-                >
+                @click.stop="viewAddObservation(selected)"
-                    <QTooltip>{{ t('Add observation') }}</QTooltip>
+            >
-                </QBtn>
+                <QTooltip>{{ t('Add observation') }}</QTooltip>
-            </div>
+            </QBtn>
         </template>
     </VnSubToolbar>
-    <QPage class="column items-center q-pa-md">
+    <VnTable
-        <VnPaginate
+        ref="dataRef"
-            ref="dataRef"
+        data-key="CustomerDefaulter"
-            @on-fetch="onFetch"
+        url="Defaulters/filter"
-            data-key="CustomerDefaulter"
+        :expr-builder="exprBuilder"
-            :filter="filter"
+        :columns="columns"
-            :expr-builder="exprBuilder"
+        @on-fetch="onFetch"
-            auto-load
+        :use-model="true"
-            url="Defaulters/filter"
+        :table="{
-        >
+            'row-key': 'clientFk',
-            <template #body="{ rows }">
+            selection: 'multiple',
-                <div class="q-pa-md">
+        }"
-                    <QTable
+        v-model:selected="selected"
-                        :columns="columns"
+        :disable-option="{ card: true }"
-                        :rows="rows"
+        auto-load
-                        class="full-width"
+        :order="['amount DESC']"
-                        row-key="clientFk"
+    >
-                        selection="multiple"
+        <template #column-clientFk="{ row }">
-                        v-model:selected="selected"
+            <span class="link" @click.stop>
-                    >
+                {{ row.clientName }}
-                        <template #header="props">
+                <CustomerDescriptorProxy :id="row.clientFk" />
-                            <QTr :props="props" class="bg" style="min-height: 200px">
+            </span>
-                                <QTh>
+        </template>
-                                    <QCheckbox v-model="props.selected" />
+        <template #column-observation="{ row }">
-                                </QTh>
+            <VnInput type="textarea" v-model="row.observation" readonly dense rows="2" />
-                                <QTh
+        </template>
-                                    v-for="col in props.cols"
+        <template #column-salesPersonFk="{ row }">
-                                    :key="col.name"
+            <span class="link" @click.stop>
-                                    :props="props"
+                {{ row.salesPersonName }}
-                                >
+                <WorkerDescriptorProxy :id="row.salesPersonFk" />
-                                    {{ t(col.label) }}
+            </span>
-                                    <QTooltip v-if="col.tooltip">{{
+        </template>
-                                        col.tooltip
+        <template #column-departmentFk="{ row }">
-                                    }}</QTooltip>
+            <span class="link" @click.stop>
-                                </QTh>
+                {{ row.departmentName }}
-                            </QTr>
+                <DepartmentDescriptorProxy :id="row.departmentFk" />
-                        </template>
+            </span>
-
+        </template>
-                        <template #body-cell="props">
+        <template #column-workerFk="{ row }">
-                            <QTd :props="props">
+            <span class="link" @click.stop>
-                                <QTr :props="props" class="cursor-pointer">
+                {{ row.workerName }}
-                                    <component
+                <WorkerDescriptorProxy :id="row.workerFk" />
-                                        :is="
+            </span>
-                                            tableColumnComponents[props.col.name]
+        </template>
-                                                .component
+    </VnTable>
-                                        "
-                                        class="col-content"
-                                        v-bind="
-                                            tableColumnComponents[props.col.name].props(
-                                                props
-                                            )
-                                        "
-                                        @click="
-                                            tableColumnComponents[props.col.name].event(
-                                                props
-                                            )
-                                        "
-                                    >
-                                        <template v-if="typeof props.value !== 'boolean'">
-                                            <div
-                                                v-if="
-                                                    props.col.name === 'lastObservation'
-                                                "
-                                            >
-                                                <VnInput
-                                                    type="textarea"
-                                                    v-model="props.value"
-                                                    readonly
-                                                    dense
-                                                    rows="2"
-                                                />
-                                            </div>
-                                            <div v-else>{{ props.value }}</div>
-                                        </template>
-
-                                        <WorkerDescriptorProxy
-                                            :id="props.row.salesPersonFk"
-                                            v-if="props.col.name === 'salesPerson'"
-                                        />
-                                        <WorkerDescriptorProxy
-                                            :id="props.row.workerFk"
-                                            v-if="props.col.name === 'author'"
-                                        />
-                                        <CustomerDescriptorProxy
-                                            :id="props.row.clientFk"
-                                            v-if="props.col.name === 'client'"
-                                        />
-                                    </component>
-                                </QTr>
-                            </QTd>
-                        </template>
-                    </QTable>
-                </div>
-            </template>
-        </VnPaginate>
-    </QPage>
 </template>
-
-<style lang="scss" scoped>
-.col-content {
-    border-radius: 4px;
-    padding: 6px;
-}
-</style>
-
 <i18n>
 es:
     Add observation:  Añadir observación
@@ -383,4 +278,5 @@ es:
     Credit I.: Crédito A.
     Credit insurance: Crédito asegurado
     From: Desde
+    Has recovery: Tiene recobro
 </i18n>

src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue

@@ -60,7 +60,7 @@ const onSubmit = async () => {
                             })
                         }}
                     </div>
-                    <VnRow class="row q-gutter-md q-mb-md">
+                    <VnRow>
                         <QInput
                             :label="t('Message')"
                             type="textarea"

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -1,92 +1,92 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { QBtn } from 'quasar';
-import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
+const dataKey = 'CustomerNotifications';
 const selected = ref([]);
-const selectedCustomerId = ref(0);
-
-const tableColumnComponents = {
-    id: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectCustomerId(prop.row.id),
-    },
-    socialName: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    city: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    phone: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    email: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'id',
         label: t('Identifier'),
         name: 'id',
+        columnClass: 'shrink',
     },
     {
         align: 'left',
-        field: 'socialName',
         label: t('Social name'),
         name: 'socialName',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'socialName'],
+                optionLabel: 'socialName',
+            },
+        },
+        columnClass: 'expand',
+        isTitle: true,
     },
     {
         align: 'left',
-        field: 'city',
         label: t('City'),
         name: 'city',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Towns',
+            },
+        },
+        cardVisible: true,
     },
     {
         align: 'left',
-        field: 'phone',
         label: t('Phone'),
         name: 'phone',
+        cardVisible: true,
     },
     {
         align: 'left',
-        field: 'email',
         label: t('Email'),
         name: 'email',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'fi',
+        label: t('Fi'),
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'postcode',
+        label: t('Postcode'),
+        visible: false,
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'salesPersonFk',
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'salesPerson' },
+            optionFilter: 'firstName',
+            useLike: false,
+        },
+        visible: false,
     },
 ]);
-
-const selectCustomerId = (id) => {
-    selectedCustomerId.value = id;
-};
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerNotifications" />
-        </template>
-    </RightMenu>
     <VnSubToolbar class="justify-end">
-        <template #st-data>
+        <template #st-actions>
             <CustomerNotificationsCampaignConsumption
                 :selected-rows="selected.length > 0"
                 :clients="selected"
@@ -94,51 +94,26 @@ const selectCustomerId = (id) => {
             />
         </template>
     </VnSubToolbar>
-    <QPage class="column items-center q-pa-md">
+    <VnTable
-        <VnPaginate data-key="CustomerNotifications" url="Clients" auto-load>
+        :data-key="dataKey"
-            <template #body="{ rows }">
+        url="Clients"
-                <div class="q-pa-md">
+        :table="{
-                    <QTable
+            'row-key': 'id',
-                        :columns="columns"
+            selection: 'multiple',
-                        :rows="rows"
+        }"
-                        class="full-width q-mt-md"
+        v-model:selected="selected"
-                        row-key="id"
+        :right-search="true"
-                        selection="multiple"
+        :columns="columns"
-                        v-model:selected="selected"
+        :use-model="true"
-                    >
+        auto-load
-                        <template #body-cell="props">
+    >
-                            <QTd :props="props">
+        <template #column-id="{ row }">
-                                <QTr :props="props" class="cursor-pointer">
+            <span class="link">
-                                    <component
+                {{ row.id }}
-                                        :is="
+                <CustomerDescriptorProxy :id="row.id" />
-                                            tableColumnComponents[props.col.name]
+            </span>
-                                                .component
+        </template>
-                                        "
+    </VnTable>
-                                        class="col-content"
-                                        v-bind="
-                                            tableColumnComponents[props.col.name].props(
-                                                props
-                                            )
-                                        "
-                                        @click="
-                                            tableColumnComponents[props.col.name].event(
-                                                props
-                                            )
-                                        "
-                                    >
-                                        {{ props.value }}
-                                        <CustomerDescriptorProxy
-                                            :id="selectedCustomerId"
-                                        />
-                                    </component>
-                                </QTr>
-                            </QTd>
-                        </template>
-                    </QTable>
-                </div>
-            </template>
-        </VnPaginate>
-    </QPage>
 </template>
 
 <style lang="scss" scoped>

src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue

@@ -99,7 +99,7 @@ onMounted(async () => {
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
                 <span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnSelect
                         :options="moreFields"
                         option-value="code"
@@ -109,7 +109,7 @@ onMounted(async () => {
                         @update:model-value="campaignChange"
                     />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnInputDate v-model="campaignParams.from" :label="t('From')" />
                     <VnInputDate v-model="campaignParams.to" :label="t('To')" />
                 </VnRow>

src/pages/Customer/Notifications/CustomerNotificationsFilter.vue

@@ -1,145 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const cities = ref();
-const clients = ref();
-</script>
-
-<template>
-    <FetchData
-        :filter="{ where: { role: 'socialName' } }"
-        @on-fetch="(data) => (clients = data)"
-        auto-load
-        url="Clients"
-    />
-    <FetchData @on-fetch="(data) => (cities = data)" auto-load url="Towns" />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-
-        <template #body="{ params, searchFn }">
-            <QItem class="q-mb-sm q-mt-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Identifier')"
-                        clearable
-                        is-outlined
-                        v-model="params.identifier"
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!clients">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="clients">
-                    <VnSelect
-                        :input-debounce="0"
-                        :label="t('Social name')"
-                        :options="clients"
-                        @update:model-value="searchFn()"
-                        dense
-                        emit-value
-                        hide-selected
-                        map-options
-                        option-label="socialName"
-                        option-value="socialName"
-                        outlined
-                        rounded
-                        use-input
-                        v-model="params.socialName"
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!cities">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="cities">
-                    <VnSelect
-                        :input-debounce="0"
-                        :label="t('City')"
-                        :options="cities"
-                        @update:model-value="searchFn()"
-                        dense
-                        emit-value
-                        hide-selected
-                        map-options
-                        option-label="name"
-                        option-value="name"
-                        outlined
-                        rounded
-                        use-input
-                        v-model="params.city"
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QItem class="q-mb-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Phone')"
-                        clearable
-                        is-outlined
-                        v-model="params.phone"
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QItem class="q-mb-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Email')"
-                        clearable
-                        is-outlined
-                        type="email"
-                        v-model="params.email"
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-        </template>
-    </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        identifier: Identifier
-        socialName: Social name
-        city: City
-        phone: Phone
-        email: Email
-es:
-    params:
-        identifier: Identificador
-        socialName: Razón social
-        city: Población
-        phone: Teléfono
-        email: Email
-    Identifier: Identificador
-    Social name: Razón social
-    City: Población
-    Phone: Teléfono
-    Email: Email
-</i18n>

src/pages/Customer/Payments/CustomerPayments.vue

@@ -1,19 +1,18 @@
 <script setup>
 import axios from 'axios';
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import { useArrayData } from 'composables/useArrayData';
+import { toDate, toCurrency } from 'filters/index';
-import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
-import { toDate, toCurrency } from 'filters/index';
 import CustomerPaymentsFilter from './CustomerPaymentsFilter.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
 const quasar = useQuasar();
 const { t } = useI18n();
-const arrayData = useArrayData('CustomerTransactions');
 
 async function confirm(transaction) {
     quasar
@@ -36,59 +35,73 @@ async function confirmTransaction({ id }) {
     });
 }
 
-const grid = ref(false);
 const columns = computed(() => [
     {
         name: 'id',
         label: t('Transaction ID'),
-        field: (row) => row.id,
+        isTitle: true,
-        sortable: true,
-    },
-    {
-        name: 'customerId',
-        label: t('Customer ID'),
-        field: (row) => row.clientFk,
-        align: 'right',
-        sortable: true,
-    },
-    {
-        name: 'customer',
-        label: t('Customer Name'),
-        field: (row) => row.customerName,
-    },
-    {
-        name: 'state',
-        label: t('State'),
-        field: (row) => row.isConfirmed,
-        format: (value) => (value ? t('Confirmed') : t('Unconfirmed')),
         align: 'left',
-        sortable: true,
+        columnFilter: {
+            inWhere: true,
+            alias: 't',
+        },
+        columnClass: 'shrink',
     },
     {
-        name: 'dated',
+        align: 'left',
+        name: 'clientFk',
+        label: t('Customer'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'name'],
+            },
+        },
+        columnClass: 'expand',
+        cardVisible: true,
+    },
+    {
+        name: 'isConfirmed',
+        label: t('State'),
+        align: 'left',
+        format: ({ isConfirmed }) => (isConfirmed ? t('Confirmed') : t('Unconfirmed')),
+        chip: {
+            condition: () => true,
+            color: ({ isConfirmed }) => (isConfirmed ? 'bg-positive' : 'bg-primary'),
+        },
+        visible: false,
+    },
+    {
+        name: 'created',
         label: t('Dated'),
-        field: (row) => toDate(row.created),
+        format: ({ created }) => toDate(created),
-        sortable: true,
+        columnFilter: false,
+        cardVisible: true,
     },
     {
         name: 'amount',
         label: t('Amount'),
-        field: (row) => row.amount,
+        format: ({ amount }) => toCurrency(amount),
-        format: (value) => toCurrency(value),
+        columnFilter: {
-        sortable: true,
+            component: 'number',
+        },
+        cardVisible: true,
     },
     {
-        name: 'actions',
+        align: 'right',
-        label: t('Actions'),
+        name: 'tableActions',
-        grid: false,
+        actions: [
+            {
+                title: t('Confirm transaction'),
+                icon: 'check',
+                action: (row) => confirm(row),
+                show: ({ isConfirmed }) => !isConfirmed,
+                isPrimary: true,
+            },
+        ],
     },
 ]);
-const isLoading = computed(() => arrayData.isLoading.value);
-
-function stateColor(row) {
-    if (row.isConfirmed) return 'positive';
-    return 'primary';
-}
 </script>
 
 <template>
@@ -97,158 +110,22 @@ function stateColor(row) {
             <CustomerPaymentsFilter data-key="CustomerTransactions" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md customer-payments">
+    <VnTable
-        <div class="vn-card-list">
+        data-key="CustomerTransactions"
-            <QToolbar class="q-pa-none justify-end">
+        url="Clients/transactions"
-                <QBtn
+        order="created DESC"
-                    @click="arrayData.refresh()"
+        :columns="columns"
-                    :loading="isLoading"
+        :right-search="false"
-                    icon="refresh"
+        auto-load
-                    color="primary"
+    >
-                    class="q-mr-sm"
+        <template #column-clientFk="{ row }">
-                    round
+            <span class="link">
-                    dense
+                {{ row.clientFk }} -
-                />
+                {{ row.customerName }}
-                <QBtn @click="grid = !grid" icon="list" color="primary" round dense>
+                <CustomerDescriptorProxy :id="row.clientFk" />
-                    <QTooltip>{{ t('Change view') }}</QTooltip>
+            </span>
-                </QBtn>
+        </template>
-            </QToolbar>
+    </VnTable>
-            <VnPaginate
-                data-key="CustomerTransactions"
-                url="Clients/transactions"
-                order="created DESC"
-                :limit="20"
-                :offset="50"
-                :auto-load="!!$route?.query.params"
-            >
-                <template #body="{ rows }">
-                    <QTable
-                        :dense="$q.screen.lt.md"
-                        :columns="columns"
-                        :rows="rows"
-                        row-key="id"
-                        :grid="grid || $q.screen.lt.sm"
-                        class="q-mt-xs custom-table"
-                    >
-                        <template #body-cell-actions="{ row }">
-                            <QTd auto-width class="text-center">
-                                <QBtn
-                                    v-if="!row.isConfirmed"
-                                    icon="check"
-                                    @click="confirm(row)"
-                                    color="primary"
-                                    size="md"
-                                    round
-                                    flat
-                                    dense
-                                >
-                                    <QTooltip>{{ t('Confirm transaction') }}</QTooltip>
-                                </QBtn>
-                            </QTd>
-                        </template>
-                        <template #body-cell-id="{ row }">
-                            <QTd auto-width align="right">
-                                <span>
-                                    {{ row.id }}
-                                </span>
-                            </QTd>
-                        </template>
-                        <template #body-cell-customerId="{ row }">
-                            <QTd align="right">
-                                <span class="link">
-                                    {{ row.clientFk }}
-                                    <CustomerDescriptorProxy :id="row.clientFk" />
-                                </span>
-                            </QTd>
-                        </template>
-                        <template #body-cell-customer="{ row }">
-                            <QTd auto-width align="left" :title="row.customerName">
-                                <span>
-                                    {{ row.customerName }}
-                                </span>
-                            </QTd>
-                        </template>
-                        <template #body-cell-state="{ row }">
-                            <QTd auto-width class="text-center">
-                                <QBadge text-color="black" :color="stateColor(row)">
-                                    {{
-                                        row.isConfirmed
-                                            ? t('Confirmed')
-                                            : t('Unconfirmed')
-                                    }}
-                                </QBadge>
-                            </QTd>
-                        </template>
-                        <template #item="{ cols, row }">
-                            <div class="q-mb-md col-12">
-                                <QCard class="q-pa-none">
-                                    <QItem class="q-pa-none items-start">
-                                        <QItemSection class="q-pa-none">
-                                            <QList>
-                                                <template
-                                                    v-for="col of cols"
-                                                    :key="col.name"
-                                                >
-                                                    <QItem
-                                                        v-if="col.grid !== false"
-                                                        class="q-pa-none"
-                                                    >
-                                                        <QItemSection>
-                                                            <QItemLabel caption>
-                                                                {{ col.label }}
-                                                            </QItemLabel>
-                                                            <QItemLabel
-                                                                v-if="col.name == 'state'"
-                                                            >
-                                                                <QBadge
-                                                                    text-color="black"
-                                                                    :color="
-                                                                        stateColor(row)
-                                                                    "
-                                                                >
-                                                                    {{ col.value }}
-                                                                </QBadge>
-                                                            </QItemLabel>
-                                                            <QItemLabel
-                                                                v-if="col.name != 'state'"
-                                                            >
-                                                                {{ col.value }}
-                                                            </QItemLabel>
-                                                        </QItemSection>
-                                                    </QItem>
-                                                </template>
-                                            </QList>
-                                        </QItemSection>
-                                        <template v-if="!row.isConfirmed">
-                                            <QSeparator vertical />
-                                            <QCardActions
-                                                vertical
-                                                class="justify-between"
-                                            >
-                                                <QBtn
-                                                    icon="check"
-                                                    @click="confirm(row)"
-                                                    color="primary"
-                                                    size="md"
-                                                    round
-                                                    flat
-                                                    dense
-                                                >
-                                                    <QTooltip>
-                                                        {{ t('Confirm transaction') }}
-                                                    </QTooltip>
-                                                </QBtn>
-                                            </QCardActions>
-                                        </template>
-                                    </QItem>
-                                </QCard>
-                            </div>
-                        </template>
-                    </QTable>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
 </template>
 
 <style lang="scss">
@@ -269,14 +146,11 @@ es:
     Web Payments: Pagos Web
     Confirm transaction: Confirmar transacción
     Transaction ID: ID transacción
-    Customer ID: ID cliente
+    Customer: cliente
-    Customer Name: Nombre cliente
     State: Estado
     Dated: Fecha
     Amount: Importe
-    Actions: Acciones
     Confirmed: Confirmada
     Unconfirmed: Sin confirmar
-    Change view: Cambiar vista
     Payment confirmed: Pago confirmado
 </i18n>

src/pages/Customer/components/CustomerAddressCreate.vue

@@ -84,7 +84,7 @@ function handleLocation(data, location) {
         <template #form="{ data, validate }">
             <QCheckbox :label="t('Default')" v-model="data.isDefaultAddress" />
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput :label="t('Consignee')" clearable v-model="data.nickname" />
 
                 <VnInput :label="t('Street address')" clearable v-model="data.street" />
@@ -117,7 +117,7 @@ function handleLocation(data, location) {
                 />
             </div>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Incoterms')"
                     :options="incoterms"

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -145,7 +145,7 @@ function handleLocation(data, location) {
         </template>
 
         <template #form="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <QCheckbox :label="t('Enabled')" v-model="data.isActive" />
                 </div>
@@ -163,7 +163,7 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnInput :label="t('Consignee')" clearable v-model="data.nickname" />
                 </div>
@@ -172,7 +172,7 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnLocation
                         :rules="validate('Worker.postcode')"
@@ -183,7 +183,7 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnSelect
                         :label="t('Agency')"
@@ -202,7 +202,7 @@ function handleLocation(data, location) {
                     <VnInput :label="t('Mobile')" clearable v-model="data.mobile" />
                 </div>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnSelect
                         :label="t('Incoterms')"

src/pages/Customer/components/CustomerCreditContractsCreate.vue

@@ -39,7 +39,7 @@ const toCustomerCreditContracts = () => {
         </template>
 
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <div class="col">
                     <VnInput
                         :label="t('Credit')"

src/pages/Customer/components/CustomerFileManagementCreate.vue

@@ -143,7 +143,7 @@ const toCustomerFileManagement = () => {
     <QCard class="q-pa-lg">
         <QCardSection>
             <QForm>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col">
                         <VnInput
                             :label="t('Reference')"
@@ -163,7 +163,7 @@ const toCustomerFileManagement = () => {
                     </div>
                 </VnRow>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col">
                         <VnSelect
                             :label="t('Warehouse')"
@@ -184,7 +184,7 @@ const toCustomerFileManagement = () => {
                     </div>
                 </VnRow>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col">
                         <VnInput
                             :label="t('Description')"
@@ -196,7 +196,7 @@ const toCustomerFileManagement = () => {
                     </div>
                 </VnRow>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col">
                         <QFile
                             ref="inputFileRef"

src/pages/Customer/components/CustomerFileManagementEdit.vue

@@ -119,7 +119,7 @@ const toCustomerFileManagement = () => {
     <QCard class="q-pa-lg">
         <QCardSection>
             <QForm>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col">
                         <VnInput
                             :label="t('Reference')"
@@ -139,7 +139,7 @@ const toCustomerFileManagement = () => {
                     </div>
                 </VnRow>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col">
                         <VnSelect
                             :label="t('Warehouse')"
@@ -160,7 +160,7 @@ const toCustomerFileManagement = () => {
                     </div>
                 </VnRow>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col">
                         <VnInput
                             :label="t('Description')"
@@ -172,7 +172,7 @@ const toCustomerFileManagement = () => {
                     </div>
                 </VnRow>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col">
                         <QFile
                             ref="inputFileRef"

src/pages/Customer/components/CustomerGreugeCreate.vue

@@ -55,7 +55,7 @@ const toCustomerGreuges = () => {
         </template>
 
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('Amount')"
                     clearable
@@ -65,7 +65,7 @@ const toCustomerGreuges = () => {
                 <VnInputDate :label="t('Date')" v-model="data.shipped" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput :label="t('Comment')" clearable v-model="data.description" />
                 <VnSelect
                     :label="t('Type')"

src/pages/Customer/components/CustomerNewCustomsAgent.vue

@@ -22,7 +22,7 @@ const onDataSaved = (dataSaved) => {
         url-create="CustomsAgents"
     >
         <template #form-inputs="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('NIF')"
                     :required="true"
@@ -36,7 +36,7 @@ const onDataSaved = (dataSaved) => {
                     v-model="data.fiscalName"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput :label="t('Street')" clearable v-model="data.street" />
                 <VnInput :label="t('Phone')" clearable v-model="data.phone" />
             </VnRow>

src/pages/Customer/components/CustomerNewPayment.vue

@@ -11,10 +11,12 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
+import { useState } from 'src/composables/useState';
 const { t } = useI18n();
 const route = useRoute();
 const { dialogRef } = useDialogPluginComponent();
+const state = useState();
+const user = state.getUser();
 
 const $props = defineProps({
     companyId: {
@@ -55,12 +57,12 @@ const filterClientFindOne = {
         id: route.params.id,
     },
 };
-
 const initialData = reactive({
     amountPaid: $props.totalCredit,
     clientFk: route.params.id,
     companyFk: $props.companyId,
     email: clientFindOne.value.email,
+    bankFk: user.value.localBankFk,
 });
 
 onBeforeMount(() => {
@@ -134,7 +136,7 @@ const onDataSaved = async () => {
 
                 <h5 class="q-mt-none">{{ t('New payment') }}</h5>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnInputDate
                         :label="t('Date')"
                         :required="true"
@@ -152,7 +154,7 @@ const onDataSaved = async () => {
                     />
                 </VnRow>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnSelect
                         :label="t('Bank')"
                         :options="bankOptions"
@@ -187,7 +189,7 @@ const onDataSaved = async () => {
                     {{ t('Compensation') }}
                 </div>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col" v-if="data.bankFk === 3 || data.bankFk === 3117">
                         <VnInput
                             :label="t('Compensation account')"
@@ -206,7 +208,7 @@ const onDataSaved = async () => {
                 <div class="q-mt-lg" v-if="data.bankFk === 2">
                     <div class="text-h6">{{ t('Cash') }}</div>
 
-                    <VnRow class="row q-gutter-md q-mb-md">
+                    <VnRow>
                         <VnInput
                             :label="t('Delivered amount')"
                             @update:model-value="calculateFromDeliveredAmount($event)"
@@ -223,7 +225,7 @@ const onDataSaved = async () => {
                         />
                     </VnRow>
 
-                    <VnRow class="row q-gutter-md q-mb-md">
+                    <VnRow>
                         <QCheckbox v-model="viewRecipt" />
                         <QCheckbox v-model="sendEmail" />
                     </VnRow>

src/pages/Customer/components/CustomerNoteCreate.vue

@@ -44,7 +44,7 @@ const toCustomerNotes = () => {
         </template>
 
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QInput :label="t('Note')" type="textarea" v-model="data.text" />
             </VnRow>
         </template>

src/pages/Customer/components/CustomerRecoverieCreate.vue

@@ -49,12 +49,12 @@ const toCustomerRecoveries = () => {
         </template>
 
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInputDate :label="t('Since')" v-model="data.started" />
                 <VnInputDate :label="t('To')" v-model="data.finished" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('Amount')"
                     clearable

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -264,7 +264,7 @@ const toCustomerSamples = () => {
                     />
                 </div>
 
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <div class="col">
                         <VnInput
                             :label="t('Recipient')"

src/pages/Department/Card/DepartmentBasicData.vue

@@ -29,7 +29,7 @@ const clientsOptions = ref([]);
         class="full-width"
     >
         <template #form="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('department.name')"
                     v-model="data.name"
@@ -44,7 +44,7 @@ const clientsOptions = ref([]);
                     clearable
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('department.chat')"
                     v-model="data.chatName"
@@ -58,7 +58,7 @@ const clientsOptions = ref([]);
                     clearable
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('department.bossDepartment')"
                     v-model="data.workerFk"
@@ -80,7 +80,7 @@ const clientsOptions = ref([]);
                     :rules="validate('department.clientFk')"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox
                     :label="t('department.telework')"
                     v-model="data.isTeleworking"
@@ -92,7 +92,7 @@ const clientsOptions = ref([]);
                     :true-value="1"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox
                     :label="t('department.worksInProduction')"
                     v-model="data.isProduction"
@@ -102,7 +102,7 @@ const clientsOptions = ref([]);
                     v-model="data.hasToRefill"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox
                     :label="t('department.hasToSendMail')"
                     v-model="data.hasToSendMail"

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -24,7 +24,7 @@ const $props = defineProps({
 
 const route = useRoute();
 const router = useRouter();
-
+const DepartmentDescriptorRef = ref();
 const { t } = useI18n();
 const { notify } = useNotify();
 
@@ -55,18 +55,20 @@ const { openConfirmationModal } = useVnConfirm();
 </script>
 <template>
     <CardDescriptor
+        ref="DepartmentDescriptorRef"
         module="Department"
-        data-key="departmentData"
         :url="`Departments/${entityId}`"
         :title="data.title"
         :subtitle="data.subtitle"
         :summary="$props.summary"
+        :to-module="{ name: 'WorkerDepartment' }"
         @on-fetch="
             (data) => {
                 department = data;
                 setData(data);
             }
         "
+        data-key="department"
     >
         <template #menu="{}">
             <QItem

src/pages/Entry/Card/EntryBasicData.vue

@@ -67,7 +67,7 @@ const onFilterTravelSelected = (formData, id) => {
         :clear-store-on-unmount="false"
     >
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('entry.basicData.supplier')"
                     v-model="data.supplierFk"
@@ -121,13 +121,13 @@ const onFilterTravelSelected = (formData, id) => {
                     </template>
                 </VnSelectDialog>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     v-model="data.reference"
                     :label="t('entry.basicData.reference')"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     v-model="data.invoiceNumber"
                     :label="t('entry.basicData.invoiceNumber')"
@@ -143,7 +143,7 @@ const onFilterTravelSelected = (formData, id) => {
                     :required="true"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('entry.basicData.currency')"
                     v-model="data.currencyFk"
@@ -159,7 +159,7 @@ const onFilterTravelSelected = (formData, id) => {
                     min="0"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QInput
                     :label="t('entry.basicData.observation')"
                     type="textarea"
@@ -169,7 +169,7 @@ const onFilterTravelSelected = (formData, id) => {
                     fill-input
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox
                     v-model="data.isOrdered"
                     :label="t('entry.basicData.ordered')"

src/pages/Entry/Card/EntryBuysImport.vue

@@ -197,7 +197,7 @@ const redirectToBuysView = () => {
             </div>
         </Teleport>
         <QCard class="q-pa-lg">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QFile
                     ref="inputFileRef"
                     :label="t('entry.buys.file')"
@@ -219,13 +219,13 @@ const redirectToBuysView = () => {
                 </QFile>
             </VnRow>
             <div v-if="importData.file">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnInput
                         :label="t('entry.buys.reference')"
                         v-model="importData.ref"
                     />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnInput
                         :label="t('entry.buys.observations')"
                         v-model="importData.observation"

src/pages/Entry/Card/EntryDescriptor.vue

@@ -115,7 +115,6 @@ watch;
         :subtitle="data.subtitle"
         @on-fetch="setData"
         data-key="entry"
-        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <QItem v-ripple clickable @click="showEntryReport(entity)">

src/pages/Entry/EntryCreate.vue

@@ -78,7 +78,7 @@ const redirectToEntryBasicData = (_, { id }) => {
             @on-data-saved="redirectToEntryBasicData"
         >
             <template #form="{ data, validate }">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnSelect
                         :label="t('Supplier')"
                         class="full-width"
@@ -102,7 +102,7 @@ const redirectToEntryBasicData = (_, { id }) => {
                         </template>
                     </VnSelect>
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnSelect
                         :label="t('Travel')"
                         class="full-width"
@@ -131,7 +131,7 @@ const redirectToEntryBasicData = (_, { id }) => {
                         </template>
                     </VnSelect>
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnSelect
                         :label="t('Company')"
                         class="full-width"

src/pages/Entry/EntryMain.vue

@@ -1,18 +0,0 @@
-<script setup>
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/InvoiceIn/Card/InvoiceInCard.vue

@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import InvoiceInFilter from '../InvoiceInFilter.vue';
+import InvoiceInSearchbar from '../InvoiceInSearchbar.vue';
 
 const filter = {
     include: [
@@ -28,8 +29,9 @@ const filter = {
         :descriptor="InvoiceInDescriptor"
         :filter-panel="InvoiceInFilter"
         search-data-key="InvoiceInList"
-        search-url="InvoiceIns/filter"
+    >
-        searchbar-label="Search invoice"
+        <template #searchbar>
-        searchbar-info="You can search by invoice reference"
+            <InvoiceInSearchbar />
-    />
+        </template>
+    </VnCard>
 </template>

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, reactive, computed, onBeforeMount } from 'vue';
-import { useRouter, onBeforeRouteLeave } from 'vue-router';
+import { useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
@@ -129,33 +129,23 @@ onBeforeMount(async () => {
     totalAmount.value = data.totalDueDay;
 });
 
-onBeforeRouteLeave(async (to, from) => {
+onBeforeRouteUpdate(async (to, from) => {
     invoiceInCorrection.correcting.length = 0;
     invoiceInCorrection.corrected = null;
-    if (to.params.id !== from.params.id) await setInvoiceCorrection(entityId.value);
+    if (to.params.id !== from.params.id) {
+        await setInvoiceCorrection(to.params.id);
+        const { data } = await axios.get(`InvoiceIns/${to.params.id}/getTotals`);
+        totalAmount.value = data.totalDueDay;
+    }
 });
 
 async function setInvoiceCorrection(id) {
-    const [{ data: correctingData }, { data: correctedData }] = await Promise.all([
+    const { data: correctingData } = await axios.get('InvoiceInCorrections', {
-        axios.get('InvoiceInCorrections', {
+        params: { filter: { where: { correctingFk: id } } },
-            params: {
+    });
-                filter: {
+    const { data: correctedData } = await axios.get('InvoiceInCorrections', {
-                    where: {
+        params: { filter: { where: { correctedFk: id } } },
-                        correctingFk: id,
+    });
-                    },
-                },
-            },
-        }),
-        axios.get('InvoiceInCorrections', {
-            params: {
-                filter: {
-                    where: {
-                        correctedFk: id,
-                    },
-                },
-            },
-        }),
-    ]);
 
     if (correctingData[0]) invoiceInCorrection.corrected = correctingData[0].correctedFk;
 
@@ -380,7 +370,7 @@ const createInvoiceInCorrection = async () => {
                 </template>
             </VnLv>
         </template>
-        <template #action="{ entity }">
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     size="md"
@@ -448,7 +438,7 @@ const createInvoiceInCorrection = async () => {
                             readonly
                         />
                         <VnSelect
-                            :label="`${useCapitalize(t('globals.class'))}*`"
+                            :label="`${useCapitalize(t('globals.class'))}`"
                             v-model="correctionFormData.invoiceClass"
                             :options="siiTypeInvoiceOuts"
                             option-value="id"
@@ -458,7 +448,7 @@ const createInvoiceInCorrection = async () => {
                     </QItemSection>
                     <QItemSection>
                         <VnSelect
-                            :label="`${useCapitalize(t('globals.type'))}*`"
+                            :label="`${useCapitalize(t('globals.type'))}`"
                             v-model="correctionFormData.invoiceType"
                             :options="cplusRectificationTypes"
                             option-value="id"
@@ -466,7 +456,7 @@ const createInvoiceInCorrection = async () => {
                             :required="true"
                         />
                         <VnSelect
-                            :label="`${useCapitalize(t('globals.reason'))}*`"
+                            :label="`${useCapitalize(t('globals.reason'))}`"
                             v-model="correctionFormData.invoiceReason"
                             :options="invoiceCorrectionTypes"
                             option-value="id"
@@ -494,6 +484,9 @@ const createInvoiceInCorrection = async () => {
     .q-card {
         max-width: 45em;
     }
+    .q-field:nth-child(1) {
+        padding-bottom: 20px;
+    }
 }
 
 @media (max-width: $breakpoint-xs) {

src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue

@@ -72,7 +72,13 @@ const columns = computed(() => [
 ]);
 
 const getTotal = (data, key) =>
-    data.reduce((acc, cur) => acc + +String(cur[key]).replace(',', '.'), 0);
+    data.reduce((acc, cur) => acc + +String(cur[key] || 0).replace(',', '.'), 0);
+
+const formatOpt = (row, { model, options }, prop) => {
+    const obj = row[model];
+    const option = options.find(({ id }) => id == obj);
+    return option ? `${obj}:${option[prop]}` : '';
+};
 </script>
 <template>
     <FetchData
@@ -92,7 +98,7 @@ const getTotal = (data, key) =>
             ref="invoiceInFormRef"
             data-key="InvoiceInIntrastats"
             url="InvoiceInIntrastats"
-            :auto-load="!currency"
+            auto-load
             :data-required="{ invoiceInFk: invoiceInId }"
             :filter="filter"
             v-model:selected="rowsSelected"
@@ -124,6 +130,9 @@ const getTotal = (data, key) =>
                                 option-value="id"
                                 option-label="description"
                                 :filter-options="['id', 'description']"
+                                :hide-selected="false"
+                                :fill-input="false"
+                                :display-value="formatOpt(row, col, 'description')"
                             >
                                 <template #option="scope">
                                     <QItem v-bind="scope.itemProps">
@@ -247,7 +256,11 @@ const getTotal = (data, key) =>
     }
 }
 </style>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+:deep(.q-table tr .q-td:nth-child(2) input) {
+    display: none;
+}
+</style>
 <i18n>
     en:
         amount: Amount

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -66,7 +66,7 @@ const vatColumns = ref([
         field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
         format: (value) => toCurrency(value, currency.value),
         sortable: true,
-        align: 'center',
+        align: 'left',
     },
     {
         name: 'currency',
@@ -339,6 +339,16 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                             </QTh>
                         </QTr>
                     </template>
+                    <template #body-cell-vat="{ value: vatCell }">
+                        <QTd :title="vatCell" shrink>
+                            {{ vatCell }}
+                        </QTd>
+                    </template>
+                    <template #body-cell-transaction="{ value: transactionCell }">
+                        <QTd :title="transactionCell" shrink>
+                            {{ transactionCell }}
+                        </QTd>
+                    </template>
                     <template #bottom-row>
                         <QTr class="bg">
                             <QTd></QTd>
@@ -347,7 +357,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                             }}</QTd>
                             <QTd></QTd>
                             <QTd></QTd>
-                            <QTd class="text-center">{{
+                            <QTd>{{
                                 toCurrency(getTotalTax(entity.invoiceInTax, currency))
                             }}</QTd>
                             <QTd></QTd>
@@ -423,6 +433,10 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
 .bg {
     background-color: var(--vn-accent-color);
 }
+.q-chip {
+    color: var(--vn-text-color);
+}
+
 @media (min-width: $breakpoint-md) {
     .summaryBody {
         .vat {

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -162,8 +162,14 @@ async function addExpense() {
     }
 }
 const getTotalTaxableBase = (rows) =>
-    rows.reduce((acc, { taxableBase }) => acc + +taxableBase, 0);
+    rows.reduce((acc, { taxableBase }) => acc + +(taxableBase || 0), 0);
 const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0);
+
+const formatOpt = (row, { model, options }, prop) => {
+    const obj = row[model];
+    const option = options.find(({ id }) => id == obj);
+    return option ? `${obj}:${option[prop]}` : '';
+};
 </script>
 <template>
     <FetchData
@@ -254,8 +260,9 @@ const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0)
                             :option-value="col.optionValue"
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'vat']"
-                            :autofocus="col.tabIndex == 1"
+                            :hide-selected="false"
-                            input-debounce="0"
+                            :fill-input="false"
+                            :display-value="formatOpt(row, col, 'vat')"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -280,6 +287,9 @@ const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0)
                             :filter-options="['id', 'transaction']"
                             :autofocus="col.tabIndex == 1"
                             input-debounce="0"
+                            :hide-selected="false"
+                            :fill-input="false"
+                            :display-value="formatOpt(row, col, 'transaction')"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -474,11 +484,16 @@ const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0)
         />
     </QPageSticky>
 </template>
+
 <style lang="scss" scoped>
 .bg {
     background-color: var(--vn-light-gray);
 }
 
+:deep(.q-table tr td:nth-child(n + 4):nth-child(-n + 5) input) {
+    display: none;
+}
+
 @media (max-width: $breakpoint-xs) {
     .q-dialog {
         .q-card {

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -7,13 +7,19 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
+import FetchData from 'components/FetchData.vue';
 
 const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
-const suppliers = ref([]);
+const activities = ref([]);
 </script>
 
 <template>
+    <FetchData
+        url="SupplierActivities"
+        auto-load
+        @on-fetch="(data) => (activities = data)"
+    />
     <VnFilterPanel :data-key="dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -29,11 +35,7 @@ const suppliers = ref([]);
                         v-model="params.supplierRef"
                         is-outlined
                         lazy-rules
-                    >
+                    />
-                        <template #prepend>
-                            <QIcon name="vn:client" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
                 </QItemSection>
             </QItem>
             <QItem>
@@ -43,11 +45,7 @@ const suppliers = ref([]);
                         v-model="params.fi"
                         is-outlined
                         lazy-rules
-                    >
+                    />
-                        <template #prepend>
-                            <QIcon name="badge" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
                 </QItemSection>
             </QItem>
             <QItem>
@@ -59,12 +57,11 @@ const suppliers = ref([]);
                         :label="t('params.supplierFk')"
                         option-value="id"
                         option-label="nickname"
-                        :options="suppliers"
                         dense
                         outlined
                         rounded
-                    >
+                        :filter-options="['id', 'name']"
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -74,11 +71,7 @@ const suppliers = ref([]);
                         v-model="params.account"
                         is-outlined
                         lazy-rules
-                    >
+                    />
-                        <template #prepend>
-                            <QIcon name="person" size="sm" />
-                        </template>
-                    </VnInput>
                 </QItemSection>
             </QItem>
             <QItem>
@@ -105,7 +98,21 @@ const suppliers = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QItem class="q-mb-md">
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.supplierActivityFk')"
+                        v-model="params.supplierActivityFk"
+                        dense
+                        outlined
+                        rounded
+                        option-value="code"
+                        option-label="name"
+                        :options="activities"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
                 <QItemSection>
                     <QCheckbox
                         :label="t('params.isBooked')"
@@ -114,6 +121,14 @@ const suppliers = ref([]);
                         toggle-indeterminate
                     />
                 </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.correctingFk')"
+                        v-model="params.correctingFk"
+                        @update:model-value="searchFn()"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
             </QItem>
             <QExpansionItem :label="t('More options')" expand-separator>
                 <QItem>
@@ -123,11 +138,7 @@ const suppliers = ref([]);
                             v-model="params.serialNumber"
                             is-outlined
                             lazy-rules
-                        >
+                        />
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
@@ -137,11 +148,7 @@ const suppliers = ref([]);
                             v-model="params.serial"
                             is-outlined
                             lazy-rules
-                        >
+                        />
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
@@ -151,11 +158,7 @@ const suppliers = ref([]);
                             v-model="params.awbCode"
                             is-outlined
                             lazy-rules
-                        >
+                        />
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
                     </QItemSection>
                 </QItem>
             </QExpansionItem>
@@ -166,7 +169,7 @@ const suppliers = ref([]);
 <i18n>
 en:
     params:
-        search: ID
+        search: Id or supplier name
         supplierRef: Supplier ref.
         supplierFk: Supplier
         fi: Supplier fiscal id
@@ -177,12 +180,17 @@ en:
         dued: Dued
         serialNumber: Serial Number
         serial: Serial
-        account: Account
+        account: Ledger account
         isBooked: is booked
-        correctedFk: Rectificatives
+        correctedFk: Rectified
+        issued: Issued
+        to: To
+        awbCode: AWB
+        correctingFk: Rectificative
+        supplierActivityFk: Supplier activity
 es:
     params:
-        search: Contiene
+        search: Id o nombre proveedor
         supplierRef: Ref. proveedor
         supplierFk: Proveedor
         clientFk: Cliente
@@ -193,10 +201,12 @@ es:
         amount: Importe
         issued: Emitida
         isBooked: Conciliada
-        account: Cuenta
+        account: Cuenta contable
         created: Creada
         dued: Vencida
-        correctedFk: Rectificativas
+        correctedFk: Rectificada
+        correctingFk: Rectificativa
+        supplierActivityFk: Actividad proveedor
     From: Desde
     To: Hasta
     Amount: Importe

src/pages/InvoiceIn/InvoiceInList.vue

@@ -1,44 +1,29 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from 'vue';
+import { onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { downloadFile } from 'src/composables/downloadFile';
 import { toDate, toCurrency } from 'src/filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import InvoiceInFilter from './InvoiceInFilter.vue';
-import { getUrl } from 'src/composables/getUrl';
 import InvoiceInSummary from './Card/InvoiceInSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import InvoiceInSearchbar from 'src/pages/InvoiceIn/InvoiceInSearchbar.vue';
 
 const stateStore = useStateStore();
-const router = useRouter();
 const { viewSummary } = useSummaryDialog();
-let url = ref();
 const { t } = useI18n();
 
-onMounted(async () => {
+onMounted(async () => (stateStore.rightDrawer = true));
-    stateStore.rightDrawer = true;
-    url.value = await getUrl('');
-});
 onUnmounted(() => (stateStore.rightDrawer = false));
-
-function navigate(id) {
-    router.push({ path: `/invoice-in/${id}` });
-}
 </script>
 
 <template>
-    <VnSearchbar
+    <InvoiceInSearchbar />
-        data-key="InvoiceInList"
-        :label="t('Search invoice')"
-        :info="t('You can search by invoice reference')"
-    />
     <RightMenu>
         <template #right-panel>
             <InvoiceInFilter data-key="InvoiceInList" />
@@ -54,10 +39,10 @@ function navigate(id) {
             >
                 <template #body="{ rows }">
                     <CardList
-                        v-for="row of rows"
+                        v-for="(row, index) of rows"
-                        :key="row.id"
+                        :key="index"
                         :title="row.supplierRef"
-                        @click="navigate(row.id)"
+                        @click="$router.push({ path: `/invoice-in/${row.id}` })"
                         :id="row.id"
                     >
                         <template #list-items>
@@ -102,7 +87,9 @@ function navigate(id) {
                         <template #actions>
                             <QBtn
                                 :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
+                                @click.stop="
+                                    $router.push({ path: `/invoice-in/${row.id}` })
+                                "
                                 outline
                                 type="reset"
                             />
@@ -115,7 +102,7 @@ function navigate(id) {
                                 class="q-mt-sm"
                             />
                             <QBtn
-                                :label="t('Download')"
+                                :label="t('globals.download')"
                                 class="q-mt-sm"
                                 @click.stop="downloadFile(row.dmsFk)"
                                 type="submit"
@@ -131,10 +118,3 @@ function navigate(id) {
         <QBtn color="primary" icon="add" size="lg" round :href="`/#/invoice-in/create`" />
     </QPageSticky>
 </template>
-
-<i18n>
-es:
-    Search invoice: Buscar factura recibida
-    You can search by invoice reference: Puedes buscar por referencia de la factura
-    Download: Descargar
-</i18n>

src/pages/InvoiceIn/InvoiceInMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/InvoiceIn/InvoiceInSearchbar.vue

@@ -0,0 +1,18 @@
+<script setup>
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import { useI18n } from 'vue-i18n';
+const { t } = useI18n();
+</script>
+<template>
+    <VnSearchbar
+        data-key="InvoiceInList"
+        :label="t('Search invoice')"
+        :info="t('Search invoices in by id or supplier fiscal name')"
+        url="InvoiceIns/filter"
+    />
+</template>
+<i18n>
+es:
+    Search invoice: Buscar factura recibida
+    Search invoices in by id or supplier fiscal name: Buscar facturas recibidas por id o por nombre fiscal del proveedor
+</i18n>

src/pages/InvoiceIn/locale/es.yml

@@ -1,2 +0,0 @@
-Search invoice: Buscar factura recibida
-You can search by invoice reference: Puedes buscar por referencia de la factura

src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue

@@ -84,7 +84,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
             />
         </template>
         <template #actions="{ entity }">
-            <QCardActions>
+            <QCardActions class="flex justify-center">
                 <QBtn
                     v-if="entity.client"
                     size="md"

src/pages/InvoiceOut/InvoiceOutMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Item/Card/CreateGenusForm.vue

@@ -31,7 +31,7 @@ onMounted(async () => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     ref="genusInputRef"
                     :label="t('Latin genus name')"

src/pages/Item/Card/CreateIntrastatForm.vue

@@ -33,7 +33,7 @@ onMounted(async () => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     ref="identifierInputRef"
                     :label="t('createIntrastatForm.identifier')"

src/pages/Item/Card/CreateSpecieForm.vue

@@ -31,7 +31,7 @@ onMounted(async () => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     ref="specieInputRef"
                     :label="t('Latin species name')"

src/pages/Item/Card/ItemBasicData.vue

@@ -71,7 +71,7 @@ const onIntrastatCreated = (response, formData) => {
         :clear-store-on-unmount="false"
     >
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('basicData.type')"
                     v-model="data.typeFk"
@@ -95,7 +95,7 @@ const onIntrastatCreated = (response, formData) => {
                 <VnInput :label="t('basicData.reference')" v-model="data.comment" />
                 <VnInput :label="t('basicData.relevancy')" v-model="data.relevancy" />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput :label="t('basicData.stems')" v-model="data.stems" />
                 <VnInput
                     :label="t('basicData.multiplier')"
@@ -127,7 +127,7 @@ const onIntrastatCreated = (response, formData) => {
                     </template>
                 </VnSelectDialog>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelectDialog
                     :label="t('basicData.intrastat')"
                     v-model="data.intrastatFk"
@@ -166,7 +166,7 @@ const onIntrastatCreated = (response, formData) => {
                     />
                 </div>
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     :label="t('basicData.weightByPiece')"
                     v-model.number="data.weightByPiece"
@@ -192,7 +192,7 @@ const onIntrastatCreated = (response, formData) => {
                     type="number"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox v-model="data.isActive" :label="t('basicData.isActive')" />
                 <QCheckbox v-model="data.hasKgPrice" :label="t('basicData.hasKgPrice')" />
                 <div>