Merge branch 'dev' into 7731-clientViesCode

2025-01-24 11:28:10 +00:00 · 2025-01-24 11:28:10 +00:00 · da0540a748
parent 9ecb734b1b c465286718
commit da0540a748
33 changed files with 956 additions and 900 deletions
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, watch } from 'vue';
+import { computed, ref, useAttrs, watch } from 'vue';
 import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@ -17,6 +17,7 @@ const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
+const $attrs = useAttrs();

 const $props = defineProps({
    model: {
@ -113,9 +114,11 @@ onBeforeRouteLeave((to, from, next) => {
 });

 async function fetch(data) {
-    resetData(data);
-    emit('onFetch', data);
-    return data;
+    const keyData = $attrs['key-data'];
+    const rows = keyData ? data[keyData] : data;
+    resetData(rows);
+    emit('onFetch', rows);
+    return rows;
 }

 function resetData(data) {
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@ -12,6 +12,7 @@ const props = defineProps({
    baseUrl: { type: String, default: undefined },
    customUrl: { type: String, default: undefined },
    filter: { type: Object, default: () => {} },
+    userFilter: { type: Object, default: () => {} },
    descriptor: { type: Object, required: true },
    filterPanel: { type: Object, default: undefined },
    searchDataKey: { type: String, default: undefined },
@ -32,6 +33,7 @@ const url = computed(() => {
 const arrayData = useArrayData(props.dataKey, {
    url: url.value,
    filter: props.filter,
+    userFilter: props.userFilter,
 });

 onBeforeMount(async () => {
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@ -78,6 +78,10 @@ const props = defineProps({
        type: String,
        default: '',
    },
+    keyData: {
+        type: String,
+        default: undefined,
+    },
 });

 const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
@ -255,7 +259,7 @@ defineExpose({
        :disable="disableInfiniteScroll || !store.hasMoreData"
        v-bind="$attrs"
    >
-        <slot name="body" :rows="store.data"></slot>
+        <slot name="body" :rows="keyData ? store.data[keyData] : store.data"></slot>
        <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
            <QSpinner color="primary" size="md" />
        </div>
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@ -202,6 +202,7 @@ export function useArrayData(key, userOptions) {
    }

    function toArray(str = []) {
+        if (!str) return [];
        if (Array.isArray(str)) return str;
        if (typeof str === 'string') return str.split(',').map((item) => item.trim());
    }
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -2,8 +2,8 @@ globals:
    lang:
        es: Spanish
        en: English        
-    quantity: Quantity
    language: Language
+    quantity: Quantity
    entity: Entity
    preview: Preview
    user: User
@ -37,7 +37,6 @@ globals:
    confirm: Confirm
    assign: Assign
    back: Back
-    downloadPdf: Download PDF
    yes: 'Yes'
    no: 'No'
    noChanges: No changes to save
@ -61,6 +60,7 @@ globals:
    downloadCSVSuccess: CSV downloaded successfully
    reference: Reference
    agency: Agency
+    entry: Entry
    warehouseOut: Warehouse Out
    warehouseIn: Warehouse In
    landed: Landed
@ -69,11 +69,11 @@ globals:
    amount: Amount
    packages: Packages
    download: Download
+    downloadPdf: Download PDF
    selectRows: 'Select all { numberRows } row(s)'
    allRows: 'All { numberRows } row(s)'
    markAll: Mark all
    requiredField: Required field
-    valueCantBeEmpty: Value cannot be empty
    class: clase
    type: Type
    reason: reason
@ -83,6 +83,9 @@ globals:
    warehouse: Warehouse
    company: Company
    fieldRequired: Field required
+    valueCantBeEmpty: Value cannot be empty
+    Value can't be blank: Value cannot be blank
+    Value can't be null: Value cannot be null
    allowedFilesText: 'Allowed file types: { allowedContentTypes }'
    smsSent: SMS sent
    confirmDeletion: Confirm deletion
@ -132,6 +135,26 @@ globals:
    medium: Medium
    big: Big
    email: Email
+    supplier: Supplier
+    ticketList: Ticket List
+    created: Created
+    worker: Worker
+    now: Now
+    name: Name
+    new: New
+    comment: Comment
+    observations: Observations
+    goToModuleIndex: Go to module index
+    createInvoiceIn: Create invoice in
+    myAccount: My account
+    noOne: No one
+    maxTemperature: Max
+    minTemperature: Min
+    changePass: Change password
+    deleteConfirmTitle: Delete selected elements
+    changeState: Change state
+    raid: 'Raid {daysInForward} days'
+    isVies: Vies
    pageTitles:
        logIn: Login
        addressEdit: Update address
@ -153,13 +176,14 @@ globals:
        subRoles: Subroles
        inheritedRoles: Inherited Roles
        customers: Customers
+        customerCreate: New customer
+        createCustomer: Create customer
+        createOrder: New order
        list: List
        webPayments: Web Payments
        extendedList: Extended list
        notifications: Notifications
        defaulter: Defaulter
-        customerCreate: New customer
-        createOrder: New order
        fiscalData: Fiscal data
        billingData: Billing data
        consignees: Consignees
@ -195,27 +219,28 @@ globals:
        claims: Claims
        claimCreate: New claim
        lines: Lines
-        photos: Photos
        development: Development
+        photos: Photos
        action: Action
        invoiceOuts: Invoice out
        negativeBases: Negative Bases
        globalInvoicing: Global invoicing
        invoiceOutCreate: Create invoice out
+        order: Orders
+        orderList: List
+        orderCreate: New order
+        catalog: Catalog
+        volume: Volume
        shelving: Shelving
        shelvingList: Shelving List
        shelvingCreate: New shelving
        invoiceIns: Invoices In
        invoiceInCreate: Create invoice in
        vat: VAT
+        labeler: Labeler
        dueDay: Due day
        intrastat: Intrastat
        corrective: Corrective
-        order: Orders
-        orderList: List
-        orderCreate: New order
-        catalog: Catalog
-        volume: Volume
        workers: Workers
        workerCreate: New worker
        department: Department
@ -228,10 +253,10 @@ globals:
        wagonsList: Wagons List
        wagonCreate: Create wagon
        wagonEdit: Edit wagon
+        wagonCounter: Trolley counter
        typesList: Types List
        typeCreate: Create type
        typeEdit: Edit type
-        wagonCounter: Trolley counter
        roadmap: Roadmap
        stops: Stops
        routes: Routes
@ -240,21 +265,16 @@ globals:
        routeCreate: New route
        RouteRoadmap: Roadmaps
        RouteRoadmapCreate: Create roadmap
+        RouteExtendedList: Router
        autonomous: Autonomous
        suppliers: Suppliers
        supplier: Supplier
-        expedition: Expedition
-        services: Service
-        components: Components
-        pictures: Pictures
-        packages: Packages
-        tracking: Tracking
-        labeler: Labeler
        supplierCreate: New supplier
        accounts: Accounts
        addresses: Addresses
        agencyTerm: Agency agreement
        travel: Travels
+        create: Create
        extraCommunity: Extra community
        travelCreate: New travel
        history: Log
@ -262,14 +282,13 @@ globals:
        items: Items
        diary: Diary
        tags: Tags
-        create: Create
-        buyRequest: Buy requests
        fixedPrice: Fixed prices
+        buyRequest: Buy requests
        wasteBreakdown: Waste breakdown
        itemCreate: New item
-        barcode: Barcodes
        tax: Tax
        botanical: Botanical
+        barcode: Barcodes
        itemTypeCreate: New item type
        family: Item Type
        lastEntries: Last entries
@ -285,13 +304,20 @@ globals:
        formation: Formation
        locations: Locations
        warehouses: Warehouses
-        saleTracking: Sale tracking
        roles: Roles
        connections: Connections
        acls: ACLs
        mailForwarding: Mail forwarding
        mailAlias: Mail alias
        privileges: Privileges
+        observation: Notes
+        expedition: Expedition
+        saleTracking: Sale tracking
+        services: Service
+        tracking: Tracking
+        components: Components
+        pictures: Pictures
+        packages: Packages
        ldap: LDAP
        samba: Samba
        twoFactor: Two factor
@ -302,27 +328,12 @@ globals:
        serial: Serial
        medical: Mutual
        pit: IRPF
-        RouteExtendedList: Router
        wasteRecalc: Waste recaclulate
        operator: Operator
        parking: Parking
-    supplier: Supplier
-    created: Created
-    worker: Worker
-    now: Now
-    name: Name
-    new: New
-    comment: Comment
-    observations: Observations
-    goToModuleIndex: Go to module index
    unsavedPopup:
        title: Unsaved changes will be lost
        subtitle: Are you sure exit without saving?
-    createInvoiceIn: Create invoice in
-    myAccount: My account
-    noOne: No one
-    maxTemperature: Max
-    minTemperature: Min
    params:
        clientFk: Client id
        salesPersonFk: Sales person
@ -340,19 +351,13 @@ globals:
        supplierFk: Supplier
        supplierRef: Supplier ref
        serial: Serial
-        amount: Importe
+        amount: Amount
        awbCode: AWB
        correctedFk: Rectified
        correctingFk: Rectificative
        daysOnward: Days onward
        countryFk: Country
        companyFk: Company
-    changePass: Change password
-    setPass: Set password
-    deleteConfirmTitle: Delete selected elements
-    changeState: Change state
-    raid: 'Raid {daysInForward} days'
-    isVies: Vies
 errors:
    statusUnauthorized: Access denied
    statusInternalServerError: An internal server error has ocurred
@ -492,21 +497,6 @@ invoiceOut:
        comercial: Comercial
        errors:
            downloadCsvFailed: CSV download failed
-shelving:
-    list:
-        parking: Parking
-        priority: Priority
-        newShelving: New Shelving
-    summary:
-        recyclable: Recyclable
-parking:
-    pickingOrder: Picking order
-    sector: Sector
-    row: Row
-    column: Column
-    searchBar:
-        info: You can search by parking code
-        label: Search parking...
 department:
    chat: Chat
    bossDepartment: Boss Department
@ -698,6 +688,9 @@ supplier:
    consumption:
        entry: Entry
 travel:
+    search: Search travel
+    searchInfo: You can search by travel id or name
+    id: Id
    travelList:
        tableVisibleColumns:
            ref: Reference
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -55,11 +55,12 @@ globals:
    today: Hoy
    yesterday: Ayer
    dateFormat: es-ES
-    noSelectedRows: No tienes ninguna línea seleccionada
    microsip: Abrir en MicroSIP
+    noSelectedRows: No tienes ninguna línea seleccionada
    downloadCSVSuccess: Descarga de CSV exitosa
    reference: Referencia
    agency: Agencia
+    entry: Entrada
    warehouseOut: Alm. salida
    warehouseIn: Alm. entrada
    landed: F. entrega
@ -134,6 +135,26 @@ globals:
    medium: Mediano/a
    big: Grande
    email: Correo
+    supplier: Proveedor
+    ticketList: Listado de tickets
+    created: Fecha creación
+    worker: Trabajador
+    now: Ahora
+    name: Nombre
+    new: Nuevo
+    comment: Comentario
+    observations: Observaciones
+    goToModuleIndex: Ir al índice del módulo
+    createInvoiceIn: Crear factura recibida
+    myAccount: Mi cuenta
+    noOne: Nadie
+    maxTemperature: Máx
+    minTemperature: Mín
+    changePass: Cambiar contraseña
+    deleteConfirmTitle: Eliminar los elementos seleccionados
+    changeState: Cambiar estado
+    raid: 'Redada {daysInForward} días'
+    isVies: Vies
    pageTitles:
        logIn: Inicio de sesión
        addressEdit: Modificar consignatario
@ -156,17 +177,17 @@ globals:
        inheritedRoles: Roles heredados
        customers: Clientes
        customerCreate: Nuevo cliente
+        createCustomer: Crear cliente
        createOrder: Nuevo pedido
        list: Listado
        webPayments: Pagos Web
        extendedList: Listado extendido
        notifications: Notificaciones
        defaulter: Morosos
-        createCustomer: Crear cliente
        fiscalData: Datos fiscales
        billingData: Forma de pago
        consignees: Consignatarios
-        'address-create': Nuevo consignatario
+        address-create: Nuevo consignatario
        notes: Notas
        credits: Créditos
        greuges: Greuges
@ -232,10 +253,10 @@ globals:
        wagonsList: Listado vagones
        wagonCreate: Crear tipo
        wagonEdit: Editar tipo
+        wagonCounter: Contador de carros
        typesList: Listado tipos
        typeCreate: Crear tipo
        typeEdit: Editar tipo
-        wagonCounter: Contador de carros
        roadmap: Troncales
        stops: Paradas
        routes: Rutas
@ -244,8 +265,8 @@ globals:
        routeCreate: Nueva ruta
        RouteRoadmap: Troncales
        RouteRoadmapCreate: Crear troncal
-        autonomous: Autónomos
        RouteExtendedList: Enrutador
+        autonomous: Autónomos
        suppliers: Proveedores
        supplier: Proveedor
        supplierCreate: Nuevo proveedor
@ -310,23 +331,9 @@ globals:
        wasteRecalc: Recalcular mermas
        operator: Operario
        parking: Parking
-    supplier: Proveedor
-    created: Fecha creación
-    worker: Trabajador
-    now: Ahora
-    name: Nombre
-    new: Nuevo
-    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?
-    createInvoiceIn: Crear factura recibida
-    myAccount: Mi cuenta
-    noOne: Nadie
-    maxTemperature: Máx
-    minTemperature: Mín
    params:
        clientFk: Id cliente
        salesPersonFk: Comercial
@ -349,12 +356,6 @@ globals:
        packing: ITP
        countryFk: País
        companyFk: Empresa
-    changePass: Cambiar contraseña
-    setPass: Establecer contraseña
-    deleteConfirmTitle: Eliminar los elementos seleccionados
-    changeState: Cambiar estado
-    raid: 'Redada {daysInForward} días'
-    isVies: Vies
 errors:
    statusUnauthorized: Acceso denegado
    statusInternalServerError: Ha ocurrido un error interno del servidor
@ -449,11 +450,15 @@ ticket:
        attender: Consignatario
    create:
        address: Dirección
-invoiceOut:
-    card:
-        issued: Fecha emisión
-        customerCard: Ficha del cliente
-        ticketList: Listado de tickets
+order:
+    field:
+        salesPersonFk: Comercial
+    form:
+        clientFk: Cliente
+        addressFk: Dirección
+        agencyModeFk: Agencia
+    list:
+        newOrder: Nuevo Pedido
    summary:
        issued: Fecha
        dued: Fecha límite
@ -464,47 +469,6 @@ invoiceOut:
        fee: Cuota
        tickets: Tickets
        totalWithVat: Importe
-    globalInvoices:
-        errors:
-            chooseValidClient: Selecciona un cliente válido
-            chooseValidCompany: Selecciona una empresa válida
-            chooseValidPrinter: Selecciona una impresora válida
-            chooseValidSerialType: Selecciona una tipo de serie válida
-            fillDates: La fecha de la factura y la fecha máxima deben estar completas
-            invoiceDateLessThanMaxDate: La fecha de la factura no puede ser menor que la fecha máxima
-            invoiceWithFutureDate: Existe una factura con una fecha futura
-            noTicketsToInvoice: No existen tickets para facturar
-            criticalInvoiceError: Error crítico en la facturación proceso detenido
-            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
-        table:
-            addressId: Id dirección
-            streetAddress: Dirección fiscal
-        statusCard:
-            percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
-            pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
-    negativeBases:
-        clientId: Id cliente
-        base: Base
-        active: Activo
-        hasToInvoice: Facturar
-        verifiedData: Datos comprobados
-        comercial: Comercial
-        errors:
-            downloadCsvFailed: Error al descargar CSV
-shelving:
-    list:
-        parking: Parking
-        priority: Prioridad
-        newShelving: Nuevo Carro
-    summary:
-        recyclable: Reciclable
-parking:
-    pickingOrder: Orden de recogida
-    row: Fila
-    column: Columna
-    searchBar:
-        info: Puedes buscar por código de parking
-        label: Buscar parking...
 department:
    chat: Chat
    bossDepartment: Jefe de departamento
@ -694,6 +658,9 @@ supplier:
    consumption:
        entry: Entrada
 travel:
+    search: Buscar envío
+    searchInfo: Buscar envío por id o nombre
+    id: Id
    travelList:
        tableVisibleColumns:
            ref: Referencia
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@ -50,7 +50,8 @@ const filterClientFindOne = {
        >
            <template #form="{ data }">
                <VnRow>
-                    <QCheckbox :label="t('Unpaid client')" v-model="data.unpaid" />
+                    <QCheckbox :label="t('Unpaid client')" v-model="data.unpaid"
+                    data-cy="UnpaidCheckBox" />
                </VnRow>

                <VnRow class="row q-gutter-md q-mb-md" v-show="data.unpaid">
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@ -11,14 +11,14 @@ import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import { useArrayData } from 'src/composables/useArrayData';

 const { t } = useI18n();
 const quasar = useQuasar();
 const dataRef = ref(null);

-const balanceDueTotal = ref(0);
 const selected = ref([]);
-
+const arrayData = useArrayData('CustomerDefaulter');
 const columns = computed(() => [
    {
        align: 'left',
@ -165,26 +165,37 @@ const viewAddObservation = (rowsSelected) => {
    });
 };

-const onFetch = async (data) => {
-    balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
-};
-
 function exprBuilder(param, value) {
    switch (param) {
-        case 'clientFk':
-            return { [`d.${param}`]: value };
-        case 'creditInsurance':
-        case 'amount':
-        case 'workerFk':
-        case 'departmentFk':
-        case 'countryFk':
-        case 'payMethod':
        case 'salesPersonFk':
+        case 'creditInsurance':
+        case 'countryFk':
+            return { [`c.${param}`]: value };
+        case 'payMethod':
+            return { [`c.payMethodFk`]: value };
+        case 'workerFk':
+            return { [`co.${param}`]: value };
+        case 'departmentFk':
+            return { [`wd.${param}`]: value };
+        case 'amount':
+        case 'clientFk':
            return { [`d.${param}`]: value };
        case 'created':
            return { 'd.created': { between: dateRange(value) } };
        case 'defaulterSinced':
            return { 'd.defaulterSinced': { between: dateRange(value) } };
+        case 'isWorker': {
+            if (value == undefined) return;
+            const search = value ? 'worker' : { neq: 'worker' };
+            return { 'c.businessTypeFk': search };
+        }
+        case 'hasRecovery': {
+            if (value == undefined) return;
+            const search = value ? null : { neq: null };
+            return { 'r.finished': search };
+        }
+        case 'observation':
+            return { 'co.text': { like: `%${value}%` } };
    }
 }
 </script>
@ -192,7 +203,7 @@ function exprBuilder(param, value) {
 <template>
    <VnSubToolbar>
        <template #st-data>
-            <CustomerBalanceDueTotal :amount="balanceDueTotal" />
+            <CustomerBalanceDueTotal :amount="arrayData.store.data?.amount" />
        </template>
        <template #st-actions>
            <QBtn
@ -211,8 +222,6 @@ function exprBuilder(param, value) {
        url="Defaulters/filter"
        :expr-builder="exprBuilder"
        :columns="columns"
-        @on-fetch="onFetch"
-        :use-model="true"
        :table="{
            'row-key': 'clientFk',
            selection: 'multiple',
@ -221,6 +230,7 @@ function exprBuilder(param, value) {
        :disable-option="{ card: true }"
        auto-load
        :order="['amount DESC']"
+        key-data="defaulters"
    >
        <template #column-clientFk="{ row }">
            <span class="link" @click.stop>
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@ -1,19 +1,11 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
-import VnCard from 'components/common/VnCard.vue';
-import InvoiceOutFilter from '../InvoiceOutFilter.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
        data-key="InvoiceOut"
        base-url="InvoiceOuts"
        :descriptor="InvoiceOutDescriptor"
-        :filter-panel="InvoiceOutFilter"
-        search-data-key="InvoiceOutList"
-        :searchbar-props="{
-            url: 'InvoiceOuts/filter',
-            label: 'Search invoice',
-            info: 'You can search by invoice reference',
-        }"
    />
 </template>
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@ -3,7 +3,6 @@ import { ref, computed, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { usePrintService } from 'src/composables/usePrintService';
@ -12,12 +11,12 @@ import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { QBtn } from 'quasar';
 import axios from 'axios';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnRadio from 'src/components/common/VnRadio.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';

 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@ -30,9 +29,11 @@ const MODEL = 'InvoiceOuts';
 const { openReport } = usePrintService();
 const addressOptions = ref([]);
 const selectedOption = ref('ticket');
+const dataKey = 'InvoiceOutList';
+
 async function fetchClientAddress(id) {
    const { data } = await axios.get(
-        `Clients/${id}/addresses?filter[order]=isActive DESC`
+        `Clients/${id}/addresses?filter[order]=isActive DESC`,
    );
    addressOptions.value = data;
 }
@ -180,16 +181,19 @@ watchEffect(selectedRows);
 </script>

 <template>
-    <VnSearchbar
-        :info="t('youCanSearchByInvoiceReference')"
-        :label="t('Search invoice')"
-        data-key="invoiceOutList"
-    />
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceOutFilter data-key="invoiceOutList" />
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="invoiceOut"
+        :array-data-props="{
+            url: 'InvoiceOuts/filter',
+            order: ['id DESC'],
+        }"
+    >
+        <template #advanced-menu>
+            <InvoiceOutFilter data-key="InvoiceOutList" />
        </template>
-    </RightMenu>
+        <template #body>
            <VnSubToolbar>
                <template #st-actions>
                    <QBtn
@ -199,14 +203,13 @@ watchEffect(selectedRows);
                        :disable="!hasSelectedCards"
                        data-cy="InvoiceOutDownloadPdfBtn"
                    >
-                <QTooltip>{{ t('downloadPdf') }}</QTooltip>
+                        <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
                    </QBtn>
                </template>
            </VnSubToolbar>
            <VnTable
                ref="tableRef"
-        data-key="invoiceOutList"
-        :url="`${MODEL}/filter`"
+                :data-key="dataKey"
                :create="{
                    urlCreate: 'InvoiceOuts/createManualInvoice',
                    title: t('createManualInvoice'),
@ -215,7 +218,6 @@ watchEffect(selectedRows);
                }"
                :right-search="false"
                v-model:selected="selectedRows"
-        order="id DESC"
                :columns="columns"
                redirect="invoice-out"
                :table="{
@ -293,13 +295,17 @@ watchEffect(selectedRows);
                                                            <QItemLabel
                                                                :class="{
                                                                    'color-vn-label':
-                                                                !scope.opt?.isActive,
+                                                                        !scope.opt
+                                                                            ?.isActive,
                                                                }"
                                                            >
                                                                {{
                                                                    `${
-                                                                !scope.opt?.isActive
-                                                                    ? t('inactive')
+                                                                        !scope.opt
+                                                                            ?.isActive
+                                                                            ? t(
+                                                                                  'inactive',
+                                                                              )
                                                                            : ''
                                                                    } `
                                                                }}
@ -308,19 +314,26 @@ watchEffect(selectedRows);
                                                                }}</span>
                                                                <span
                                                                    v-if="
-                                                                scope.opt?.province ||
+                                                                        scope.opt
+                                                                            ?.province ||
                                                                        scope.opt?.city ||
                                                                        scope.opt?.street
                                                                    "
                                                                >
-                                                            , {{ scope.opt?.street }},
+                                                                    ,
+                                                                    {{
+                                                                        scope.opt?.street
+                                                                    }},
                                                                    {{ scope.opt?.city }},
                                                                    {{
-                                                                scope.opt?.province?.name
+                                                                        scope.opt
+                                                                            ?.province
+                                                                            ?.name
                                                                    }}
                                                                    -
                                                                    {{
-                                                                scope.opt?.agencyMode
+                                                                        scope.opt
+                                                                            ?.agencyMode
                                                                            ?.name
                                                                    }}
                                                                </span>
@ -383,7 +396,9 @@ watchEffect(selectedRows);
                                <VnSelect
                                    url="TaxAreas"
                                    v-model="data.taxArea"
-                            :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
+                                    :label="
+                                        t('invoiceOutList.tableVisibleColumns.taxArea')
+                                    "
                                    :options="taxAreasOptions"
                                    option-label="code"
                                    option-value="code"
@ -397,6 +412,8 @@ watchEffect(selectedRows);
                    </div>
                </template>
            </VnTable>
+        </template>
+    </VnSection>
 </template>

 <style lang="scss" scoped>
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@ -39,7 +39,7 @@ const columns = computed(() => [
    {
        align: 'left',
        name: 'country',
-        label: t('negativeBases.country'),
+        label: t('invoiceOut.negativeBases.country'),
        component: 'select',
        attrs: {
            url: 'Countries',
@ -53,7 +53,7 @@ const columns = computed(() => [
    {
        align: 'left',
        name: 'clientId',
-        label: t('negativeBases.clientId'),
+        label: t('invoiceOut.negativeBases.clientId'),
        cardVisible: true,
    },
    {
@ -85,28 +85,28 @@ const columns = computed(() => [
    {
        align: 'left',
        name: 'taxableBase',
-        label: t('negativeBases.base'),
+        label: t('invoiceOut.negativeBases.base'),
    },
    {
        align: 'left',
        name: 'ticketFk',
-        label: t('negativeBases.ticketId'),
+        label: t('invoiceOut.negativeBases.ticketId'),
        cardVisible: true,
    },
    {
        align: 'left',
        name: 'isActive',
-        label: t('negativeBases.active'),
+        label: t('invoiceOut.negativeBases.active'),
    },
    {
        align: 'left',
        name: 'hasToInvoice',
-        label: t('negativeBases.hasToInvoice'),
+        label: t('invoiceOut.negativeBases.hasToInvoice'),
    },
    {
        align: 'left',
        name: 'hasVerifiedData',
-        label: t('negativeBases.verifiedData'),
+        label: t('invoiceOut.negativeBases.verifiedData'),
    },
    {
        align: 'left',
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@ -105,28 +105,3 @@ const props = defineProps({
        </template>
    </VnFilterPanel>
 </template>
-
-<i18n>
-en:
-    params:
-        from: From
-        to: To
-        company: Company
-        country: Country
-        clientId: Client Id
-        clientSocialName: Client
-        amount: Amount
-        comercialName: Comercial
-es:
-    params:
-        from: Desde
-        to: Hasta
-        company: Empresa
-        country: País
-        clientId: Id cliente
-        clientSocialName: Cliente
-        amount: Importe
-        comercialName: Comercial
-    Date is required: La fecha es requerida
-
-</i18n>
--- a/src/pages/InvoiceOut/locale/en.yml
+++ b/src/pages/InvoiceOut/locale/en.yml
@ -1,3 +1,60 @@
+invoiceOut:
+    search: Search invoice
+    searchInfo: You can search by invoice reference
+    params:
+        company: Company
+        country: Country
+        clientId: Client ID
+        clientSocialName: Client
+        taxableBase: Base
+        ticketFk: Ticket
+        isActive: Active
+        hasToInvoice: Has to invoice
+        hasVerifiedData: Verified data
+        workerName: Worker
+    card:
+        issued: Issued
+        customerCard: Customer card
+        ticketList: Ticket List
+    summary:
+        issued: Issued
+        dued: Due
+        booked: Booked
+        taxBreakdown: Tax breakdown
+        taxableBase: Taxable base
+        rate: Rate
+        fee: Fee
+        tickets: Tickets
+        totalWithVat: Amount
+    globalInvoices:
+        errors:
+            chooseValidClient: Choose a valid client
+            chooseValidCompany: Choose a valid company
+            chooseValidPrinter: Choose a valid printer
+            chooseValidSerialType: Choose a serial type
+            fillDates: Invoice date and the max date should be filled
+            invoiceDateLessThanMaxDate: Invoice date can not be less than max date
+            invoiceWithFutureDate: Exists an invoice with a future date
+            noTicketsToInvoice: There are not tickets to invoice
+            criticalInvoiceError: 'Critical invoicing error, process stopped'
+            invalidSerialTypeForAll: The serial type must be global when invoicing all clients
+        table:
+            addressId: Address id
+            streetAddress: Street
+        statusCard:
+            percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}'
+            pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs'
+    negativeBases:
+        country: Country
+        clientId: Client Id
+        base: Base
+        ticketId: Ticket
+        active: Active
+        hasToInvoice: Has to Invoice
+        verifiedData: Verified Data
+        comercial: Commercial
+        errors:
+            downloadCsvFailed: CSV download failed
 invoiceOutModule:
    customer: Client
    amount: Amount
@ -14,26 +71,3 @@ invoiceOutList:
        ticket: Ticket
        taxArea: Tax area
        customsAgent: Custom Agent    
-DownloadPdf: Download PDF
-InvoiceOutSummary: Summary
-negativeBases:
-    country: Country
-    clientId: Client ID
-    base: Base
-    ticketId: Ticket
-    active: Active
-    hasToInvoice: Has to invoice
-    verifiedData: Verified data
-    commercial: Commercial
-invoiceout:
-    params:
-        company: Company
-        country: Country
-        clientId: Client ID
-        clientSocialName: Client
-        taxableBase: Base
-        ticketFk: Ticket
-        isActive: Active
-        hasToInvoice: Has to invoice
-        hasVerifiedData: Verified data
-        workerName: Worker
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@ -1,5 +1,60 @@
-Search invoice: Buscar factura emitida
-You can search by invoice reference: Puedes buscar por referencia de la factura
+invoiceOut:
+    search: Buscar factura emitida
+    searchInfo: Puedes buscar por referencia de la factura
+    params:
+        company: Empresa
+        country: País
+        clientId: ID del cliente
+        clientSocialName: Cliente
+        taxableBase: Base
+        ticketFk: Ticket
+        isActive: Activo
+        hasToInvoice: Debe facturar
+        hasVerifiedData: Datos verificados
+        workerName: Comercial   
+    card:
+        issued: Fecha emisión
+        customerCard: Ficha del cliente
+        ticketList: Listado de tickets
+    summary:
+        issued: Fecha
+        dued: Fecha límite
+        booked: Contabilizada
+        taxBreakdown: Desglose impositivo
+        taxableBase: Base imp.
+        rate: Tarifa
+        fee: Cuota
+        tickets: Tickets
+        totalWithVat: Importe
+    globalInvoices:
+        errors:
+            chooseValidClient: Selecciona un cliente válido
+            chooseValidCompany: Selecciona una empresa válida
+            chooseValidPrinter: Selecciona una impresora válida
+            chooseValidSerialType: Selecciona una tipo de serie válida
+            fillDates: La fecha de la factura y la fecha máxima deben estar completas
+            invoiceDateLessThanMaxDate: La fecha de la factura no puede ser menor que la fecha máxima
+            invoiceWithFutureDate: Existe una factura con una fecha futura
+            noTicketsToInvoice: No existen tickets para facturar
+            criticalInvoiceError: Error crítico en la facturación proceso detenido
+            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
+        table:
+            addressId: Id dirección
+            streetAddress: Dirección fiscal
+        statusCard:
+            percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
+            pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
+    negativeBases:
+        country: País
+        clientId: Id cliente
+        base: Base
+        ticketId: Ticket
+        active: Activo
+        hasToInvoice: Facturar
+        verifiedData: Datos comprobados
+        comercial: Comercial
+        errors:
+            downloadCsvFailed: Error al descargar CSV 
 invoiceOutModule:
    customer: Cliente
    amount: Importe
@ -16,27 +71,3 @@ invoiceOutList:
        ticket: Ticket
        taxArea: Area
        customsAgent: Agente de aduanas
-DownloadPdf: Descargar PDF
-InvoiceOutSummary: Resumen
-negativeBases:
-    country: País
-    clientId: ID del cliente
-    client: Cliente
-    base: Base
-    ticketId: Ticket
-    active: Activo
-    hasToInvoice: Debe facturar
-    verifiedData: Datos verificados
-    commercial: Comercial
-invoiceout:
-    params:
-        company: Empresa
-        country: País
-        clientId: ID del cliente
-        clientSocialName: Cliente
-        taxableBase: Base
-        ticketFk: Ticket
-        isActive: Activo
-        hasToInvoice: Debe facturar
-        hasVerifiedData: Datos verificados
-        workerName: Comercial
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@ -136,7 +136,7 @@ const columns = computed(() => [
        name: 'tableActions',
        actions: [
            {
-                title: t('InvoiceOutSummary'),
+                title: t('globals.pageTitles.summary'),
                icon: 'preview',
                action: (row) => viewSummary(row.id, OrderSummary),
                isPrimary: true,
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@ -1,19 +1,12 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
-import ParkingFilter from 'pages/Parking/ParkingFilter.vue';
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
        data-key="Parking"
        base-url="Parkings"
        :descriptor="ParkingDescriptor"
-        :filter-panel="ParkingFilter"
-        search-data-key="ParkingList"
-        :searchbar-props="{
-            url: 'Parkings',
-            label: 'parking.searchBar.label',
-            info: 'parking.searchBar.info',
-        }"
    />
 </template>
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@ -5,17 +5,17 @@ import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import CardList from 'components/ui/CardList.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import ParkingFilter from './ParkingFilter.vue';
 import ParkingSummary from './Card/ParkingSummary.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSection from 'src/components/common/VnSection.vue';

 const stateStore = useStateStore();
 const { push } = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const dataKey = 'ParkingList';

 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
@ -37,38 +37,38 @@ function exprBuilder(param, value) {
 </script>

 <template>
-    <template>
-        <VnSearchbar
-            data-key="ParkingList"
-            :label="t('Search parking')"
-            :info="t('You can search by parking code')"
-        />
-    </template>
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        prefix="parking"
+        :array-data-props="{
+            url: 'Parkings',
+            order: ['code'],
+            userFilter: filter,
+            exprBuilder,
+        }"
+    >
+        <template #advanced-menu>
            <ParkingFilter data-key="ParkingList" />
        </template>
-    </RightMenu>
+        <template #body>
            <QPage class="column items-center q-pa-md">
                <div class="vn-card-list">
-            <VnPaginate
-                data-key="ParkingList"
-                url="Parkings"
-                :user-filter="filter"
-                :expr-builder="exprBuilder"
-                :limit="20"
-                order="code"
-            >
+                    <VnPaginate :data-key="dataKey">
                        <template #body="{ rows }">
                            <CardList
                                v-for="row of rows"
                                :key="row.id"
                                :id="row.id"
                                :title="row.code"
-                        @click="push({ path: `/parking/${row.id}` })"
+                                @click="
+                                    push({ path: `/shelving/parking/${row.id}/summary` })
+                                "
                            >
                                <template #list-items>
-                            <VnLv label="Sector" :value="row.sector?.description" />
+                                    <VnLv
+                                        label="Sector"
+                                        :value="row.sector?.description"
+                                    />
                                    <VnLv
                                        :label="t('parking.pickingOrder')"
                                        :value="row.pickingOrder"
@ -86,9 +86,6 @@ function exprBuilder(param, value) {
                    </VnPaginate>
                </div>
            </QPage>
+        </template>
+    </VnSection>
 </template>
-<i18n>
-es:
-    Search parking: Buscar parking
-    You can search by parking code: Puede buscar por el código del parking
-</i18n>
--- a/src/pages/Parking/locale/en.yml
+++ b/src/pages/Parking/locale/en.yml
@ -0,0 +1,7 @@
+parking:
+    pickingOrder: Picking order
+    sector: Sector
+    row: Row
+    column: Column
+    search: Search parking
+    searchInfo: You can search by parking code
--- a/src/pages/Parking/locale/es.yml
+++ b/src/pages/Parking/locale/es.yml
@ -0,0 +1,7 @@
+parking:
+    pickingOrder: Orden de recogida
+    row: Fila
+    sector: Sector
+    column: Columna
+    search: Buscar parking
+    searchInfo: Puedes buscar por código de parking
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@ -1,19 +1,12 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
-import ShelvingFilter from './ShelvingFilter.vue';
-import ShelvingSearchbar from './ShelvingSearchbar.vue';
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
        data-key="Shelving"
        base-url="Shelvings"
        :descriptor="ShelvingDescriptor"
-        :filter-panel="ShelvingFilter"
-        search-data-key="ShelvingList"
-    >
-        <template #searchbar>
-            <ShelvingSearchbar />
-        </template>
-    </VnCard>
+    />
 </template>
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@ -6,13 +6,14 @@ import VnLv from 'components/ui/VnLv.vue';
 import { useRouter } from 'vue-router';
 import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
 import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
-import ShelvingSearchbar from 'pages/Shelving/Card/ShelvingSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSection from 'src/components/common/VnSection.vue';

 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const dataKey = 'ShelvingList';
+
 const filter = {
    include: [{ relation: 'parking' }],
 };
@ -34,21 +35,23 @@ function exprBuilder(param, value) {
 </script>

 <template>
-    <ShelvingSearchbar />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        prefix="shelving"
+        :array-data-props="{
+            url: 'Shelvings',
+            order: ['code'],
+            userFilter: filter,
+            exprBuilder,
+        }"
+    >
+        <template #advanced-menu>
            <ShelvingFilter data-key="ShelvingList" />
        </template>
-    </RightMenu>
+        <template #body>
            <QPage class="column items-center q-pa-md">
                <div class="vn-card-list">
-            <VnPaginate
-                data-key="ShelvingList"
-                url="Shelvings"
-                :filter="filter"
-                :expr-builder="exprBuilder"
-                :limit="20"
-            >
+                    <VnPaginate :data-key="dataKey">
                        <template #body="{ rows }">
                            <CardList
                                v-for="row of rows"
@ -88,4 +91,6 @@ function exprBuilder(param, value) {
                    </RouterLink>
                </QPageSticky>
            </QPage>
+        </template>
+    </VnSection>
 </template>
--- a/src/pages/Shelving/locale/en.yml
+++ b/src/pages/Shelving/locale/en.yml
@ -0,0 +1,9 @@
+shelving:
+    list:
+        parking: Parking
+        priority: Priority
+        newShelving: New Shelving
+    summary:
+        recyclable: Recyclable
+    search: Search shelving
+    searchInfo: You can search by shelving reference
--- a/src/pages/Shelving/locale/es.yml
+++ b/src/pages/Shelving/locale/es.yml
@ -0,0 +1,9 @@
+shelving:
+    list:
+        parking: Parking
+        priority: Prioridad
+        newShelving: Nuevo Carro
+    summary:
+        recyclable: Reciclable
+    search: Buscar carro
+    searchInfo: Puedes buscar por referencia del carro
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@ -1,9 +1,8 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
 import TravelDescriptor from './TravelDescriptor.vue';
-import TravelFilter from '../TravelFilter.vue';
+import VnCardBeta from 'src/components/common/VnCardBeta.vue';

-const filter = {
+const userFilter = {
    fields: [
        'id',
        'ref',
@ -35,17 +34,10 @@ const filter = {
 };
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
        data-key="Travel"
        base-url="Travels"
-        search-data-key="TravelList"
-        :filter="filter"
        :descriptor="TravelDescriptor"
-        :filter-panel="TravelFilter"
-        :searchbar-props="{
-            url: 'Travels/filter',
-            searchUrl: 'table',
-            label: 'Search travel',
-        }"
+        :user-filter="userFilter"
    />
 </template>
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@ -5,18 +5,18 @@ import { useRouter, useRoute } from 'vue-router';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TravelSummary from './Card/TravelSummary.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import TravelFilter from './TravelFilter.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnSection from 'src/components/common/VnSection.vue';

 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
 const route = useRoute();
 const tableRef = ref();
+const dataKey = 'TravelList';
 const $props = defineProps({
    id: {
        type: Number,
@ -196,21 +196,23 @@ const columns = computed(() => [
 </script>

 <template>
-    <VnSearchbar
-        :info="t('You can search by travel id or name')"
-        :label="t('Search travel')"
-        data-key="TravelList"
-    />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="travel"
+        :array-data-props="{
+            url: 'Travels/filter',
+            order: ['landed DESC'],
+            userParams: { daysOnward: 7 },
+        }"
+    >
+        <template #advanced-menu>
            <TravelFilter data-key="TravelList" />
        </template>
-    </RightMenu>
+        <template #body>
            <VnTable
                ref="tableRef"
-        data-key="TravelList"
-        url="Travels/filter"
-        redirect="travel"
+                :data-key="dataKey"
                :create="{
                    urlCreate: 'Travels',
                    title: t('Create Travels'),
@ -220,8 +222,7 @@ const columns = computed(() => [
                    },
                }"
                :right-search="false"
-        :user-params="{ daysOnward: 7 }"
-        order="landed DESC"
+                redirect="travel"
                :columns="columns"
                :is-editable="false"
            >
@ -280,6 +281,8 @@ const columns = computed(() => [
                    />
                </template>
            </VnTable>
+        </template>
+    </VnSection>
 </template>
 <i18n>
 en:
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@ -13,7 +13,6 @@ import Travel from './travel';
 import Order from './order';
 import Entry from './entry';
 import roadmap from './roadmap';
-import Parking from './parking';
 import Agency from './agency';
 import Zone from './zone';
 import Account from './account';
@ -35,7 +34,6 @@ export default [
    invoiceIn,
    Entry,
    roadmap,
-    Parking,
    Agency,
    Zone,
    Account,
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@ -1,34 +1,60 @@
 import { RouterView } from 'vue-router';

+const invoiceOutCard = {
+    name: 'InvoiceOutCard',
+    path: ':id',
+    component: () => import('src/pages/InvoiceOut/Card/InvoiceOutCard.vue'),
+    redirect: { name: 'InvoiceOutSummary' },
+    meta: {
+        menu: [],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'InvoiceOutSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/InvoiceOut/Card/InvoiceOutSummary.vue'),
+        }
+    ],
+};
+
 export default {
-    path: '/invoice-out',
    name: 'InvoiceOut',
+    path: '/invoice-out',
    meta: {
        title: 'invoiceOuts',
        icon: 'vn:invoice-out',
        moduleName: 'InvoiceOut',
+        menu: ['InvoiceOutList', 'InvoiceOutGlobal', 'InvoiceOutNegativeBases'],
    },
    component: RouterView,
    redirect: { name: 'InvoiceOutMain' },
-    menus: {
-        main: ['InvoiceOutList', 'InvoiceOutGlobal', 'InvoiceOutNegativeBases'],
-        card: [],
-    },
+    children: [
+        {
+            name: 'InvoiceOutMain',
+            path: '',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'InvoiceOutIndexMain' },
            children: [
                {
                    path: '',
-            name: 'InvoiceOutMain',
-            component: () => import('src/components/common/VnModule.vue'),
+                    name: 'InvoiceOutIndexMain',
                    redirect: { name: 'InvoiceOutList' },
+                    component: () => import('src/pages/InvoiceOut/InvoiceOutList.vue'),
                    children: [
                        {
-                    path: 'list',
                            name: 'InvoiceOutList',
+                            path: 'list',
                            meta: {
                                title: 'list',
                                icon: 'view_list',
                            },
-                    component: () => import('src/pages/InvoiceOut/InvoiceOutList.vue'),
+                        },
+                        invoiceOutCard,
+                    ],
                },
                {
                    path: 'global-invoicing',
@ -51,22 +77,5 @@ export default {
                },
            ],
        },
-        {
-            name: 'InvoiceOutCard',
-            path: ':id',
-            component: () => import('src/pages/InvoiceOut/Card/InvoiceOutCard.vue'),
-            redirect: { name: 'InvoiceOutSummary' },
-            children: [
-                {
-                    name: 'InvoiceOutSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                    },
-                    component: () =>
-                        import('src/pages/InvoiceOut/Card/InvoiceOutSummary.vue'),
-                },
-            ],
-        },
    ],
 };
--- a/src/router/modules/parking.js
+++ b/src/router/modules/parking.js
@ -1,54 +0,0 @@
-import { RouterView } from 'vue-router';
-
-export default {
-    path: '/parking',
-    name: 'Parking',
-    meta: {
-        title: 'parking',
-        icon: 'garage_home',
-        moduleName: 'Parking',
-    },
-    component: RouterView,
-    redirect: { name: 'ParkingCard' },
-    menus: {
-        main: [],
-        card: ['ParkingBasicData', 'ParkingLog'],
-    },
-    children: [
-        {
-            path: '/parking/:id',
-            name: 'ParkingCard',
-            component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
-            redirect: { name: 'ParkingSummary' },
-            children: [
-                {
-                    name: 'ParkingSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
-                },
-                {
-                    name: 'ParkingBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('pages/Parking/Card/ParkingBasicData.vue'),
-                },
-                {
-                    name: 'ParkingLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
-                },
-            ],
-        },
-    ],
-};
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@ -1,62 +1,45 @@
 import { RouterView } from 'vue-router';

-export default {
-    path: '/shelving',
-    name: 'Shelving',
+const parkingCard = {
+    name: 'ParkingCard',
+    path: ':id',
+    component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
+    redirect: { name: 'ParkingSummary' },
    meta: {
-        title: 'shelving',
-        icon: 'vn:inventory',
-        moduleName: 'Shelving',
-    },
-    component: RouterView,
-    redirect: { name: 'ShelvingMain' },
-    menus: {
-        main: ['ShelvingList', 'ParkingList'],
-        card: ['ShelvingBasicData', 'ShelvingLog'],
+        menu: ['ParkingBasicData', 'ParkingLog'],
    },
    children: [
        {
-            path: '',
-            name: 'ShelvingMain',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ShelvingList' },
-            children: [
-                {
-                    path: 'list',
-                    name: 'ShelvingList',
+            path: 'summary',
+            name: 'ParkingSummary',
            meta: {
-                        title: 'list',
-                        icon: 'view_list',
+                title: 'summary',
+                icon: 'launch',
            },
-                    component: () => import('src/pages/Shelving/ShelvingList.vue'),
+            component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
        },
        {
-                    path: 'create',
-                    name: 'ShelvingCreate',
+            path: 'basic-data',
+            name: 'ParkingBasicData',
            meta: {
-                        title: 'shelvingCreate',
-                        icon: 'add',
+                title: 'basicData',
+                icon: 'vn:settings',
            },
-                    component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
+            component: () => import('src/pages/Parking/Card/ParkingBasicData.vue'),
        },
        {
-                    path: '/parking',
-                    redirect: { name: 'ParkingList' },
-                    children: [
-                        {
-                            path: 'list',
-                            name: 'ParkingList',
+            path: 'log',
+            name: 'ParkingLog',
            meta: {
-                                title: 'parkingList',
-                                icon: 'view_list',
+                title: 'log',
+                icon: 'history',
            },
-                            component: () => import('src/pages/Parking/ParkingList.vue'),
+            component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
        },
    ],
-                },
-            ],
-        },
-        {
+};
+
+const shelvingCard = {
    name: 'ShelvingLayout',
    path: ':id',
    component: () => import('pages/Shelving/Card/ShelvingCard.vue'),
@ -89,6 +72,73 @@ export default {
            component: () => import('src/pages/Shelving/Card/ShelvingLog.vue'),
        },
    ],
+};
+
+export default {
+    path: '/shelving',
+    name: 'Shelving',
+    meta: {
+        title: 'shelving',
+        icon: 'vn:inventory',
+        moduleName: 'Shelving',
+    },
+    component: RouterView,
+    redirect: { name: 'ShelvingMain' },
+    menus: {
+        main: ['ShelvingList', 'ParkingMain'],
+        card: ['ShelvingBasicData', 'ShelvingLog'],
+    },
+    children: [
+        {
+            path: '',
+            name: 'ShelvingMain',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'ShelvingSection' },
+            children: [
+                {
+                    path: '',
+                    name: 'ShelvingSection',
+                    redirect: { name: 'ShelvingList' },
+                    component: () => import('src/pages/Shelving/ShelvingList.vue'),
+                    children: [
+                        {
+                            path: 'list',
+                            name: 'ShelvingList',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        shelvingCard,
+                    ],
+                },
+                {
+                    path: 'create',
+                    name: 'ShelvingCreate',
+                    meta: {
+                        title: 'shelvingCreate',
+                        icon: 'add',
+                    },
+                    component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
+                },
+                {
+                    path: 'parking',
+                    name: 'ParkingMain',
+                    redirect: { name: 'ParkingList' },
+                    meta: {
+                        title: 'parkingList',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Parking/ParkingList.vue'),
+                    children: [
+                        {
+                            path: 'list',
+                            name: 'ParkingList',
+                        },
+                        parkingCard,
+                    ],
+                },
+            ],
        },
    ],
 };
--- a/src/router/modules/travel.js
+++ b/src/router/modules/travel.js
@ -1,60 +1,13 @@
 import { RouterView } from 'vue-router';

-export default {
-    path: '/travel',
-    name: 'Travel',
-    meta: {
-        title: 'travel',
-        icon: 'local_airport',
-        moduleName: 'Travel',
-    },
-    component: RouterView,
-    redirect: { name: 'TravelMain' },
-    menus: {
-        main: ['TravelList', 'ExtraCommunity'],
-        card: ['TravelBasicData', 'TravelHistory', 'TravelThermographs'],
-    },
-    children: [
-        {
-            path: '',
-            name: 'TravelMain',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'TravelList' },
-            children: [
-                {
-                    path: 'list',
-                    name: 'TravelList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Travel/TravelList.vue'),
-                },
-                {
-                    path: 'extra-community',
-                    name: 'ExtraCommunity',
-                    meta: {
-                        title: 'extraCommunity',
-                        icon: 'vn:shipment',
-                    },
-                    component: () => import('src/pages/Travel/ExtraCommunity.vue'),
-                },
-                {
-                    path: 'create',
-                    name: 'TravelCreate',
-                    meta: {
-                        title: 'travelCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Travel/TravelCreate.vue'),
-                },
-            ],
-        },
-        {
+const travelCard = {
    name: 'TravelCard',
    path: ':id',
    component: () => import('src/pages/Travel/Card/TravelCard.vue'),
    redirect: { name: 'TravelSummary' },
+    meta: {
+        menu: ['TravelBasicData', 'TravelHistory', 'TravelThermographs'],
+    },
    children: [
        {
            name: 'TravelSummary',
@ -119,6 +72,62 @@ export default {
                },
            ],
        },
+    ]
+};
+
+export default {
+    path: '/travel',
+    name: 'Travel',
+    meta: {
+        title: 'travel',
+        icon: 'local_airport',
+        moduleName: 'Travel',
+        menu: ['TravelList', 'ExtraCommunity'],
+    },
+    component: RouterView,
+    redirect: { name: 'TravelMain' },
+    children: [
+        {
+            path: '',
+            name: 'TravelMain',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'TravelIndexMain' },
+            children: [
+                {
+                    path: '',
+                    name: 'TravelIndexMain',
+                    redirect: { name: 'TravelList' },
+                    component: () => import('src/pages/Travel/TravelList.vue'),
+                    children: [
+                        {
+                            name: 'TravelList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        travelCard,
+                    ],
+                },
+                {
+                    path: 'extra-community',
+                    name: 'ExtraCommunity',
+                    meta: {
+                        title: 'extraCommunity',
+                        icon: 'vn:shipment',
+                    },
+                    component: () => import('src/pages/Travel/ExtraCommunity.vue'),
+                },
+                {
+                    path: 'create',
+                    name: 'TravelCreate',
+                    meta: {
+                        title: 'travelCreate',
+                        icon: 'add',
+                    },
+                    component: () => import('src/pages/Travel/TravelCreate.vue'),
+                },
            ],
        },
    ],
--- a/src/router/routes.js
+++ b/src/router/routes.js
@ -13,7 +13,6 @@ import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
 import roadmap from 'src/router/modules/roadmap';
-import parking from 'src/router/modules/parking';
 import agency from 'src/router/modules/agency';
 import zone from 'src/router/modules/zone';
 import account from './modules/account';
@ -85,7 +84,6 @@ const routes = [
            travel,
            roadmap,
            entry,
-            parking,
            agency,
            zone,
            account,
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@ -15,7 +15,7 @@ describe('Client list', () => {
        });
    });

-    it.skip('Client list create new client', () => {
+    it('Client list create new client', () => {
        cy.addBtnClick();
        const randomInt = Math.floor(Math.random() * 90) + 10;

--- a/test/cypress/integration/client/others/clientUnpaid.spec.js
+++ b/test/cypress/integration/client/others/clientUnpaid.spec.js
@ -1,5 +1,6 @@
 /// <reference types="cypress" />
 describe('Client unpaid', () => {
+    const UnpaidCheckBox = '[data-cy="UnpaidCheckBox"]';
    beforeEach(() => {
        cy.viewport(1280, 720);
        cy.login('developer');
@ -7,7 +8,7 @@ describe('Client unpaid', () => {
    it('Should add unpaid', () => {
        cy.visit('#/customer/1102/others/unpaid');
        cy.get('.q-card').should('be.visible');
-        cy.get('.q-checkbox__inner').click();
+        cy.get(UnpaidCheckBox).click();
        cy.dataCy('customerUnpaidAmount').find('input').type('100');
        cy.dataCy('customerUnpaidDate').find('input').type('01/01/2001');
        cy.get('.q-btn-group > .q-btn--standard').click();