src/components/common/VnLog.vue

@@ -799,7 +799,7 @@ watch(
             <QItem class="q-mt-sm">
                 <QInput
                     class="full-width"
-                    :label="t('to')"
+                    :label="t('globals.to')"
                     @click="dateToDialog = true"
                     @focus="(evt) => evt.target.blur()"
                     @clear="selectFilter('date', 'from')"
@@ -1053,9 +1053,9 @@ en:
         Deletes: Deletes
         Accesses: Accesses
     Users:
-        User: Usuario
+        User: User
-        All: Todo
+        All: All
-        System: Sistema
+        System: System
     properties:
         id: ID
         claimFk: Claim ID

src/i18n/locale/en.yml

@@ -2,8 +2,8 @@ globals:
     lang:
         es: Spanish
         en: English        
-    quantity: Quantity
     language: Language
+    quantity: Quantity
     entity: Entity
     user: User
     details: Details
@@ -35,7 +35,6 @@ globals:
     confirm: Confirm
     assign: Assign
     back: Back
-    downloadPdf: Download PDF
     yes: 'Yes'
     no: 'No'
     noChanges: No changes to save
@@ -59,6 +58,7 @@ globals:
     downloadCSVSuccess: CSV downloaded successfully
     reference: Reference
     agency: Agency
+    entry: Entry
     warehouseOut: Warehouse Out
     warehouseIn: Warehouse In
     landed: Landed
@@ -67,11 +67,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
@@ -81,6 +81,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
@@ -130,6 +133,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
@@ -151,13 +174,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
@@ -193,27 +217,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
@@ -226,10 +251,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
@@ -238,21 +263,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
@@ -260,14 +280,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
@@ -283,13 +302,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
@@ -300,27 +326,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
@@ -338,19 +349,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

src/i18n/locale/es.yml

@@ -53,11 +53,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
@@ -132,6 +133,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
@@ -154,17 +175,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
@@ -230,10 +251,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
@@ -242,8 +263,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
@@ -308,23 +329,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
@@ -347,12 +354,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

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -268,7 +268,7 @@ function deleteFile(dmsFk) {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('invoicein.summary.sage')"
+                    :label="t('invoiceIn.summary.sage')"
                     v-model="data.withholdingSageFk"
                     :options="sageWithholdings"
                     option-value="id"

src/pages/InvoiceIn/Card/InvoiceInCard.vue

@@ -1,10 +1,6 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
-import InvoiceInFilter from '../InvoiceInFilter.vue';
-import InvoiceInSearchbar from '../InvoiceInSearchbar.vue';
-import { onBeforeRouteUpdate } from 'vue-router';
-import { setRectificative } from '../composables/setRectificative';
 
 const filter = {
     include: [
@@ -39,20 +35,13 @@ const filter = {
         },
     ],
 };
-
-onBeforeRouteUpdate(async (to) => await setRectificative(to));
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="InvoiceIn"
         base-url="InvoiceIns"
-        :filter="filter"
         :descriptor="InvoiceInDescriptor"
-        :filter-panel="InvoiceInFilter"
+        :user-filter="filter"
-        search-data-key="InvoiceInList"
+    />
-    >
-        <template #searchbar>
-            <InvoiceInSearchbar />
-        </template>
-    </VnCard>
 </template>

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -166,10 +166,10 @@ const createInvoiceInCorrection = async () => {
             <InvoiceInDescriptorMenu :invoice="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('invoicein.list.issued')" :value="toDate(entity.issued)" />
+            <VnLv :label="t('invoiceIn.list.issued')" :value="toDate(entity.issued)" />
-            <VnLv :label="t('invoicein.summary.bookedDate')" :value="toDate(entity.booked)" />
+            <VnLv :label="t('invoiceIn.summary.bookedDate')" :value="toDate(entity.booked)" />
-            <VnLv :label="t('invoicein.list.amount')" :value="toCurrency(totalAmount)" />
+            <VnLv :label="t('invoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
-            <VnLv :label="t('invoicein.list.supplier')">
+            <VnLv :label="t('invoiceIn.list.supplier')">
                 <template #value>
                     <span class="link">
                         {{ entity?.supplier?.nickname }}
@@ -186,7 +186,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getSupplier(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('invoicein.list.supplier') }}</QTooltip>
+                    <QTooltip>{{ t('globals.supplier') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -194,7 +194,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getEntry(entity.entryFk)"
                 >
-                    <QTooltip>{{ t('Entry') }}</QTooltip>
+                    <QTooltip>{{ t('globals.entry') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -202,7 +202,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getTickets(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('InvoiceOut.card.ticketList') }}</QTooltip>
+                    <QTooltip>{{ t('globals.ticketList') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="

src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue

@@ -33,15 +33,15 @@ const entityId = computed(() => $props.invoice.id || +currentRoute.value.params.
 const invoiceIn = computed(() => arrayData.store.data);
 const actions = {
     unbook: {
-        title: t('assertAction', { action: t('invoicein.descriptorMenu.unbook') }),
+        title: t('assertAction', { action: t('invoiceIn.descriptorMenu.unbook') }),
         action: toUnbook,
     },
     delete: {
-        title: t('assertAction', { action: t('invoicein.descriptorMenu.delete') }),
+        title: t('assertAction', { action: t('invoiceIn.descriptorMenu.delete') }),
         action: deleteInvoice,
     },
     clone: {
-        title: t('assertAction', { action: t('invoicein.descriptorMenu.clone') }),
+        title: t('assertAction', { action: t('invoiceIn.descriptorMenu.clone') }),
         action: cloneInvoice,
     },
     showPdf: { cb: showPdfInvoice },
@@ -84,7 +84,7 @@ async function deleteInvoice() {
     await axios.delete(`InvoiceIns/${entityId.value}`);
     quasar.notify({
         type: 'positive',
-        message: t('invoicein.descriptorMenu.invoiceDeleted'),
+        message: t('invoiceIn.descriptorMenu.invoiceDeleted'),
     });
     push({ path: '/invoice-in' });
 }
@@ -93,7 +93,7 @@ async function cloneInvoice() {
     const { data } = await axios.post(`InvoiceIns/${entityId.value}/clone`);
     quasar.notify({
         type: 'positive',
-        message: t('invoicein.descriptorMenu.invoiceCloned'),
+        message: t('invoiceIn.descriptorMenu.invoiceCloned'),
     });
     push({ path: `/invoice-in/${data.id}/summary` });
 }
@@ -144,7 +144,7 @@ function sendPdfInvoice({ address }) {
                 clickable
                 @click="book(entityId)"
             >
-                <QItemSection>{{ t('invoicein.descriptorMenu.toBook') }}</QItemSection>
+                <QItemSection>{{ t('invoiceIn.descriptorMenu.toBook') }}</QItemSection>
             </QItem>
         </template>
     </InvoiceInToBook>
@@ -155,28 +155,28 @@ function sendPdfInvoice({ address }) {
         @click="triggerMenu('unbook')"
     >
         <QItemSection>
-            {{ t('invoicein.descriptorMenu.toUnbook') }}
+            {{ t('invoiceIn.descriptorMenu.toUnbook') }}
         </QItemSection>
     </QItem>
     <QItem
         v-if="canEditProp('deleteById')"
         v-ripple
         clickable
-        @click="triggerMenu('invoicein.descriptorMenu.delete')"
+        @click="triggerMenu('invoiceIn.descriptorMenu.delete')"
     >
-        <QItemSection>{{ t('invoicein.descriptorMenu.deleteInvoice') }}</QItemSection>
+        <QItemSection>{{ t('invoiceIn.descriptorMenu.deleteInvoice') }}</QItemSection>
     </QItem>
     <QItem v-if="canEditProp('clone')" v-ripple clickable @click="triggerMenu('clone')">
-        <QItemSection>{{ t('invoicein.descriptorMenu.cloneInvoice') }}</QItemSection>
+        <QItemSection>{{ t('invoiceIn.descriptorMenu.cloneInvoice') }}</QItemSection>
     </QItem>
     <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('showPdf')">
         <QItemSection>{{
-            t('invoicein.descriptorMenu.showAgriculturalPdf')
+            t('invoiceIn.descriptorMenu.showAgriculturalPdf')
         }}</QItemSection>
     </QItem>
     <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('sendPdf')">
         <QItemSection
-            >{{ t('invoicein.descriptorMenu.sendAgriculturalPdf') }}...</QItemSection
+            >{{ t('invoiceIn.descriptorMenu.sendAgriculturalPdf') }}...</QItemSection
         >
     </QItem>
     <QItem
@@ -186,7 +186,7 @@ function sendPdfInvoice({ address }) {
         @click="triggerMenu('correct')"
     >
         <QItemSection
-            >{{ t('invoicein.descriptorMenu.createCorrective') }}...</QItemSection
+            >{{ t('invoiceIn.descriptorMenu.createCorrective') }}...</QItemSection
         >
     </QItem>
     <QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -27,14 +27,14 @@ const intrastatTotals = ref({ amount: 0, net: 0, stems: 0 });
 const vatColumns = ref([
     {
         name: 'expense',
-        label: 'invoicein.summary.expense',
+        label: 'invoiceIn.summary.expense',
         field: (row) => row.expenseFk,
         sortable: true,
         align: 'left',
     },
     {
         name: 'landed',
-        label: 'invoicein.summary.taxableBase',
+        label: 'invoiceIn.summary.taxableBase',
         field: (row) => row.taxableBase,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -42,7 +42,7 @@ const vatColumns = ref([
     },
     {
         name: 'vat',
-        label: 'invoicein.summary.sageVat',
+        label: 'invoiceIn.summary.sageVat',
         field: (row) => {
             if (row.taxTypeSage) return `#${row.taxTypeSage.id} : ${row.taxTypeSage.vat}`;
         },
@@ -52,7 +52,7 @@ const vatColumns = ref([
     },
     {
         name: 'transaction',
-        label: 'invoicein.summary.sageTransaction',
+        label: 'invoiceIn.summary.sageTransaction',
         field: (row) => {
             if (row.transactionTypeSage)
                 return `#${row.transactionTypeSage.id} : ${row.transactionTypeSage?.transaction}`;
@@ -63,7 +63,7 @@ const vatColumns = ref([
     },
     {
         name: 'rate',
-        label: 'invoicein.summary.rate',
+        label: 'invoiceIn.summary.rate',
         field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
         format: (value) => toCurrency(value),
         sortable: true,
@@ -71,7 +71,7 @@ const vatColumns = ref([
     },
     {
         name: 'currency',
-        label: 'invoicein.summary.currency',
+        label: 'invoiceIn.summary.currency',
         field: (row) => row.foreignValue,
         format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
@@ -82,21 +82,21 @@ const vatColumns = ref([
 const dueDayColumns = ref([
     {
         name: 'date',
-        label: 'invoicein.summary.dueDay',
+        label: 'invoiceIn.summary.dueDay',
         field: (row) => toDate(row.dueDated),
         sortable: true,
         align: 'left',
     },
     {
         name: 'bank',
-        label: 'invoicein.summary.bank',
+        label: 'invoiceIn.summary.bank',
         field: (row) => row.bank.bank,
         sortable: true,
         align: 'left',
     },
     {
         name: 'amount',
-        label: 'invoicein.list.amount',
+        label: 'invoiceIn.list.amount',
         field: (row) => row.amount,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -104,7 +104,7 @@ const dueDayColumns = ref([
     },
     {
         name: 'landed',
-        label: 'invoicein.summary.foreignValue',
+        label: 'invoiceIn.summary.foreignValue',
         field: (row) => row.foreignValue,
         format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
@@ -115,7 +115,7 @@ const dueDayColumns = ref([
 const intrastatColumns = ref([
     {
         name: 'code',
-        label: 'invoicein.summary.code',
+        label: 'invoiceIn.summary.code',
         field: (row) => {
             return `${row.intrastat.id}: ${row.intrastat?.description}`;
         },
@@ -124,21 +124,21 @@ const intrastatColumns = ref([
     },
     {
         name: 'amount',
-        label: 'invoicein.list.amount',
+        label: 'invoiceIn.list.amount',
         field: (row) => toCurrency(row.amount),
         sortable: true,
         align: 'left',
     },
     {
         name: 'net',
-        label: 'invoicein.summary.net',
+        label: 'invoiceIn.summary.net',
         field: (row) => row.net,
         sortable: true,
         align: 'left',
     },
     {
         name: 'stems',
-        label: 'invoicein.summary.stems',
+        label: 'invoiceIn.summary.stems',
         field: (row) => row.stems,
         format: (value) => value,
         sortable: true,
@@ -146,7 +146,7 @@ const intrastatColumns = ref([
     },
     {
         name: 'landed',
-        label: 'invoicein.summary.country',
+        label: 'invoiceIn.summary.country',
         field: (row) => row.country?.code,
         format: (value) => value,
         sortable: true,
@@ -214,7 +214,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('invoicein.list.supplier')"
+                    :label="t('invoiceIn.list.supplier')"
                     :value="entity.supplier?.name"
                 >
                     <template #value>
@@ -225,14 +225,14 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('invoicein.list.supplierRef')"
+                    :label="t('invoiceIn.list.supplierRef')"
                     :value="entity.supplierRef"
                 />
                 <VnLv
-                    :label="t('invoicein.summary.currency')"
+                    :label="t('invoiceIn.summary.currency')"
                     :value="entity.currency?.code"
                 />
-                <VnLv :label="t('invoicein.serial')" :value="`${entity.serial}`" />
+                <VnLv :label="t('invoiceIn.serial')" :value="`${entity.serial}`" />
                 <VnLv
                     :label="t('globals.country')"
                     :value="entity.supplier?.country?.code"
@@ -247,19 +247,19 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </QCardSection>
                 <VnLv
                     :ellipsis-value="false"
-                    :label="t('invoicein.summary.issued')"
+                    :label="t('invoiceIn.summary.issued')"
                     :value="toDate(entity.issued)"
                 />
                 <VnLv
-                    :label="t('invoicein.summary.operated')"
+                    :label="t('invoiceIn.summary.operated')"
                     :value="toDate(entity.operated)"
                 />
                 <VnLv
-                    :label="t('invoicein.summary.bookEntried')"
+                    :label="t('invoiceIn.summary.bookEntried')"
                     :value="toDate(entity.bookEntried)"
                 />
                 <VnLv
-                    :label="t('invoicein.summary.bookedDate')"
+                    :label="t('invoiceIn.summary.bookedDate')"
                     :value="toDate(entity.booked)"
                 />
                 <VnLv :label="t('globals.isVies')" :value="entity.supplier?.isVies" />
@@ -272,18 +272,18 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('invoicein.summary.sage')"
+                    :label="t('invoiceIn.summary.sage')"
                     :value="entity.sageWithholding?.withholding"
                 />
                 <VnLv
-                    :label="t('invoicein.summary.vat')"
+                    :label="t('invoiceIn.summary.vat')"
                     :value="entity.expenseDeductible?.name"
                 />
                 <VnLv
-                    :label="t('invoicein.card.company')"
+                    :label="t('invoiceIn.card.company')"
                     :value="entity.company?.code"
                 />
-                <VnLv :label="t('invoicein.isBooked')" :value="invoiceIn?.isBooked" />
+                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -294,11 +294,11 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </QCardSection>
                 <QCardSection class="q-pa-none">
                     <VnLv
-                        :label="t('invoicein.summary.taxableBase')"
+                        :label="t('invoiceIn.summary.taxableBase')"
                         :value="toCurrency(entity.totals.totalTaxableBase)"
                     />
                     <VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
-                    <VnLv :label="t('invoicein.summary.dueTotal')">
+                    <VnLv :label="t('invoiceIn.summary.dueTotal')">
                         <template #value>
                             <QChip
                                 dense
@@ -306,8 +306,8 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                 :color="amountsNotMatch ? 'negative' : 'transparent'"
                                 :title="
                                     amountsNotMatch
-                                        ? t('invoicein.summary.noMatch')
+                                        ? t('invoiceIn.summary.noMatch')
-                                        : t('invoicein.summary.dueTotal')
+                                        : t('invoiceIn.summary.dueTotal')
                                 "
                             >
                                 {{ toCurrency(entity.totals.totalDueDay) }}
@@ -318,7 +318,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <!--Vat-->
             <QCard v-if="entity.invoiceInTax.length" class="vat">
-                <VnTitle :url="getLink('vat')" :text="t('invoicein.card.vat')" />
+                <VnTitle :url="getLink('vat')" :text="t('invoiceIn.card.vat')" />
                 <QTable
                     :columns="vatColumns"
                     :rows="entity.invoiceInTax"
@@ -366,7 +366,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <!--Due Day-->
             <QCard v-if="entity.invoiceInDueDay.length" class="due-day">
-                <VnTitle :url="getLink('due-day')" :text="t('invoicein.card.dueDay')" />
+                <VnTitle :url="getLink('due-day')" :text="t('invoiceIn.card.dueDay')" />
                 <QTable :columns="dueDayColumns" :rows="entity.invoiceInDueDay" flat>
                     <template #header="dueDayProps">
                         <QTr :props="dueDayProps" class="bg">
@@ -404,7 +404,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             <QCard v-if="entity.invoiceInIntrastat.length">
                 <VnTitle
                     :url="getLink('intrastat')"
-                    :text="t('invoicein.card.intrastat')"
+                    :text="t('invoiceIn.card.intrastat')"
                 />
                 <QTable
                     :columns="intrastatColumns"

src/pages/InvoiceIn/InvoiceInCreate.vue

@@ -83,7 +83,7 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         </template>
                     </VnSelect>
                     <VnInput
-                        :label="t('invoicein.list.supplierRef')"
+                        :label="t('invoiceIn.list.supplierRef')"
                         v-model="data.supplierRef"
                     />
                 </VnRow>
@@ -97,10 +97,10 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         map-options
                         hide-selected
                         :required="true"
-                        :rules="validate('invoicein.companyFk')"
+                        :rules="validate('invoiceIn.companyFk')"
                     />
                     <VnInputDate
-                        :label="t('invoicein.summary.issued')"
+                        :label="t('invoiceIn.summary.issued')"
                         v-model="data.issued"
                     />
                 </VnRow>

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -164,7 +164,7 @@ function handleDaysAgo(params, daysAgo) {
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="$t('invoicein.isBooked')"
+                        :label="$t('invoiceIn.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate

src/pages/InvoiceIn/InvoiceInList.vue

@@ -8,17 +8,17 @@ import InvoiceInFilter from './InvoiceInFilter.vue';
 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';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'src/components/FetchData.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const user = useState().getUser();
 const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
+const dataKey = 'InvoiceInList';
 
 const tableRef = ref();
 const companies = ref([]);
@@ -26,7 +26,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'isBooked',
-        label: t('invoicein.isBooked'),
+        label: t('invoiceIn.isBooked'),
         columnFilter: false,
     },
     {
@@ -41,7 +41,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'supplierFk',
-        label: t('invoicein.list.supplier'),
+        label: t('invoiceIn.list.supplier'),
         columnFilter: {
             component: 'select',
             attrs: {
@@ -55,16 +55,16 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'supplierRef',
-        label: t('invoicein.list.supplierRef'),
+        label: t('invoiceIn.list.supplierRef'),
     },
     {
         align: 'left',
         name: 'serial',
-        label: t('invoicein.serial'),
+        label: t('invoiceIn.serial'),
     },
     {
         align: 'left',
-        label: t('invoicein.list.issued'),
+        label: t('invoiceIn.list.issued'),
         name: 'issued',
         component: null,
         columnFilter: {
@@ -74,7 +74,7 @@ const cols = computed(() => [
     },
     {
         align: 'left',
-        label: t('invoicein.list.dueDated'),
+        label: t('invoiceIn.list.dueDated'),
         name: 'dueDated',
         component: null,
         columnFilter: {
@@ -86,12 +86,12 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'awbCode',
-        label: t('invoicein.list.awb'),
+        label: t('invoiceIn.list.awb'),
     },
     {
         align: 'left',
         name: 'amount',
-        label: t('invoicein.list.amount'),
+        label: t('invoiceIn.list.amount'),
         format: ({ amount }) => toCurrency(amount),
         cardVisible: true,
     },
@@ -130,71 +130,81 @@ const cols = computed(() => [
     },
 ]);
 </script>
+
 <template>
     <FetchData url="Companies" @on-fetch="(data) => (companies = data)" auto-load />
-    <InvoiceInSearchbar />
+    <VnSection
-    <RightMenu>
+        :data-key="dataKey"
-        <template #right-panel>
+        :columns="cols"
+        prefix="invoiceIn"
+        :array-data-props="{
+            url: 'InvoiceIns/filter',
+            order: ['issued DESC', 'id DESC'],
+        }"
+    >
+        <template #rightMenu>
             <InvoiceInFilter data-key="InvoiceInList" />
         </template>
-    </RightMenu>
+        <template #body>
-    <VnTable
+            <VnTable
-        ref="tableRef"
+                ref="tableRef"
-        data-key="InvoiceInList"
+                :data-key="dataKey"
-        url="InvoiceIns/filter"
+                :create="{
-        :order="['issued DESC', 'id DESC']"
+                    urlCreate: 'InvoiceIns',
-        :create="{
+                    title: t('globals.createInvoiceIn'),
-            urlCreate: 'InvoiceIns',
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
-            title: t('globals.createInvoiceIn'),
+                    formInitialData: { companyFk: user.companyFk, issued: Date.vnNew() },
-            onDataSaved: ({ id }) => tableRef.redirect(id),
+                }"
-            formInitialData: { companyFk: user.companyFk, issued: Date.vnNew() },
+                redirect="invoice-in"
-        }"
+                :columns="cols"
-        redirect="invoice-in"
+                :right-search="false"
-        :columns="cols"
+                :disable-option="{ card: true }"
-        :right-search="false"
+                :auto-load="!!$route.query.table"
-        :disable-option="{ card: true }"
-        :auto-load="!!$route.query.table"
-    >
-        <template #column-supplierFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.supplierName }}
-                <SupplierDescriptorProxy :id="row.supplierFk" />
-            </span>
-        </template>
-        <template #more-create-dialog="{ data }">
-            <VnSelect
-                v-model="data.supplierFk"
-                url="Suppliers"
-                :fields="['id', 'nickname', 'name']"
-                :label="t('globals.supplier')"
-                option-value="id"
-                option-label="nickname"
-                :filter-options="['id', 'name', 'nickname']"
-                :required="true"
             >
-                <template #option="scope">
+                <template #column-supplierFk="{ row }">
-                    <QItem v-bind="scope.itemProps">
+                    <span class="link" @click.stop>
-                        <QItemSection>
+                        {{ row.supplierName }}
-                            <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
+                        <SupplierDescriptorProxy :id="row.supplierFk" />
-                            <QItemLabel caption> #{{ scope.opt?.id }}, {{  scope.opt?.name }} </QItemLabel>
+                    </span>
-                        </QItemSection>
-                    </QItem>
                 </template>
-            </VnSelect>
+                <template #more-create-dialog="{ data }">
-            <VnInput
+                    <VnSelect
-                :label="t('invoicein.list.supplierRef')"
+                        v-model="data.supplierFk"
-                v-model="data.supplierRef"
+                        url="Suppliers"
-            />
+                        :fields="['id', 'name', 'nickname']"
-            <VnSelect
+                        :label="t('globals.supplier')"
-                url="Companies"
+                        option-value="id"
-                :label="t('globals.company')"
+                        option-label="nickname"
-                :fields="['id', 'code']"
+                        :filter-options="['id', 'name', 'nickname']"
-                v-model="data.companyFk"
+                        :required="true"
-                option-value="id"
+                    >
-                option-label="code"
+                        <template #option="scope">
-                :required="true"
+                            <QItem v-bind="scope.itemProps">
-            />
+                                <QItemSection>
-            <VnInputDate :label="t('invoicein.summary.issued')" v-model="data.issued" />
+                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}, {{ scope.opt?.name }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnInput
+                        :label="t('invoiceIn.list.supplierRef')"
+                        v-model="data.supplierRef"
+                    />
+                    <VnSelect
+                        url="Companies"
+                        :label="t('globals.company')"
+                        :fields="['id', 'code']"
+                        v-model="data.companyFk"
+                        option-value="id"
+                        option-label="code"
+                        :required="true"
+                    />
+                    <VnInputDate :label="t('invoiceIn.summary.issued')" v-model="data.issued" />
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>

src/pages/InvoiceIn/InvoiceInSearchbar.vue

@@ -1,18 +0,0 @@
-<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/en.yml

@@ -1,4 +1,6 @@
-invoicein:
+invoiceIn:
+    search: Search invoice
+    searchInfo: Search incoming invoices by ID or supplier fiscal name
     serial: Serial
     isBooked: Is booked
     list:

src/pages/InvoiceIn/locale/es.yml

@@ -1,4 +1,6 @@
-invoicein:
+invoiceIn:
+    search: Buscar factura recibida
+    searchInfo: Buscar facturas recibidas por ID o nombre fiscal del proveedor
     serial: Serie
     isBooked: Contabilizada
     list:
@@ -63,6 +65,7 @@ invoicein:
     params:
         search: Id o nombre proveedor
         correctedFk: Rectificada
+        isBooked: Contabilizada
         account: Cuenta contable
         correctingFk: Rectificativa
 

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -355,7 +355,7 @@ watchEffect(selectedRows);
                         <VnSelect
                             url="InvoiceOutSerials"
                             v-model="data.serial"
-                            :label="t('invoicein.serial')"
+                            :label="t('invoiceIn.serial')"
                             :options="invoiceOutSerialsOptions"
                             option-label="description"
                             option-value="code"

src/router/modules/invoiceIn.js

@@ -1,18 +1,12 @@
 import { RouterView } from 'vue-router';
-import { setRectificative } from 'src/pages/InvoiceIn/composables/setRectificative';
+
-export default {
+const invoiceInCard = {
-    path: '/invoice-in',
+    name: 'InvoiceInCard',
-    name: 'InvoiceIn',
+    path: ':id',
+    component: () => import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
+    redirect: { name: 'InvoiceInSummary' },
     meta: {
-        title: 'invoiceIns',
+        menu: [
-        icon: 'vn:invoice-in',
-        moduleName: 'InvoiceIn',
-    },
-    component: RouterView,
-    redirect: { name: 'InvoiceInMain' },
-    menus: {
-        main: ['InvoiceInList', 'InvoiceInSerial'],
-        card: [
             'InvoiceInBasicData',
             'InvoiceInVat',
             'InvoiceInDueDay',
@@ -23,29 +17,109 @@ export default {
     },
     children: [
         {
-            path: '',
+            path: 'summary',
+            name: 'InvoiceInSummary',
+            meta: {
+                title: 'summary',
+                icon: 'view_list',
+            },
+            component: () => import('src/pages/InvoiceIn/Card/InvoiceInSummary.vue'),
+        },
+        {
+            name: 'InvoiceInBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () =>
+                import('src/pages/InvoiceIn/Card/InvoiceInBasicData.vue'),
+        },
+        {
+            name: 'InvoiceInVat',
+            path: 'vat',
+            meta: {
+                title: 'vat',
+                icon: 'vn:tax',
+            },
+            component: () => import('src/pages/InvoiceIn/Card/InvoiceInVat.vue'),
+        },
+        {
+            name: 'InvoiceInDueDay',
+            path: 'due-day',
+            meta: {
+                title: 'dueDay',
+                icon: 'vn:calendar',
+            },
+            component: () =>
+                import('src/pages/InvoiceIn/Card/InvoiceInDueDay.vue'),
+        },
+        {
+            name: 'InvoiceInIntrastat',
+            path: 'intrastat',
+            meta: {
+                title: 'intrastat',
+                icon: 'vn:lines',
+            },
+            component: () =>
+                import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
+        },
+        {
+            name: 'InvoiceInCorrective',
+            path: 'corrective',
+            meta: {
+                title: 'corrective',
+                icon: 'attachment',
+            },
+            component: () =>
+                import('src/pages/InvoiceIn/Card/InvoiceInCorrective.vue'),
+        },
+        {
+            name: 'InvoiceInLog',
+            path: 'log',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
+        },
+    ],
+};
+
+export default {    
+    name: 'InvoiceIn',
+    path: '/invoice-in',
+    meta: {
+        title: 'invoiceIns',
+        icon: 'vn:invoice-in',
+        moduleName: 'InvoiceIn',
+        menu: ['InvoiceInList', 'InvoiceInSerial'],
+    },
+    component: RouterView,
+    redirect: { name: 'InvoiceInMain' },
+    children: [
+        {            
             name: 'InvoiceInMain',
+            path: '',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'InvoiceInList' },
+            redirect: { name: 'InvoiceInIndexMain' },
             children: [
                 {
-                    path: 'list',
+                    path: '',
-                    name: 'InvoiceInList',
+                    name: 'InvoiceInIndexMain',
-                    meta: {
+                    redirect: { name: 'InvoiceInList' },
-                        title: 'list',
-                        icon: 'view_list',
-                    },
                     component: () => import('src/pages/InvoiceIn/InvoiceInList.vue'),
-                },
+                    children: [
-                {
+                        {
-                    path: 'serial',
+                            name: 'InvoiceInList',                    
-                    name: 'InvoiceInSerial',
+                            path: 'list',
-                    meta: {
+                            meta: {
-                        title: 'serial',
+                                title: 'list',
-                        icon: 'view_list',
+                                icon: 'view_list',
-                    },
+                            },
-                    component: () =>
+                        },
-                        import('src/pages/InvoiceIn/Serial/InvoiceInSerial.vue'),
+                        invoiceInCard,
+                    ],
                 },
                 {
                     path: 'create',
@@ -56,85 +130,14 @@ export default {
                     },
                     component: () => import('src/pages/InvoiceIn/InvoiceInCreate.vue'),
                 },
-            ],
-        },
-        {
-            name: 'InvoiceInCard',
-            path: ':id',
-            component: () => import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
-            redirect: { name: 'InvoiceInSummary' },
-            beforeEnter: async (to, from, next) => {
-                await setRectificative(to);
-                next();
-            },
-            children: [
                 {
-                    name: 'InvoiceInSummary',
+                    path: 'serial',
-                    path: 'summary',
+                    name: 'InvoiceInSerial',
                     meta: {
-                        title: 'summary',
+                        title: 'serial',
                         icon: 'view_list',
                     },
-                    component: () =>
+                    component: () => import('src/pages/InvoiceIn/Serial/InvoiceInSerial.vue'),
-                        import('src/pages/InvoiceIn/Card/InvoiceInSummary.vue'),
-                },
-                {
-                    name: 'InvoiceInBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/InvoiceIn/Card/InvoiceInBasicData.vue'),
-                },
-                {
-                    name: 'InvoiceInVat',
-                    path: 'vat',
-                    meta: {
-                        title: 'vat',
-                        icon: 'vn:tax',
-                    },
-                    component: () => import('src/pages/InvoiceIn/Card/InvoiceInVat.vue'),
-                },
-                {
-                    name: 'InvoiceInDueDay',
-                    path: 'due-day',
-                    meta: {
-                        title: 'dueDay',
-                        icon: 'vn:calendar',
-                    },
-                    component: () =>
-                        import('src/pages/InvoiceIn/Card/InvoiceInDueDay.vue'),
-                },
-                {
-                    name: 'InvoiceInIntrastat',
-                    path: 'intrastat',
-                    meta: {
-                        title: 'intrastat',
-                        icon: 'vn:lines',
-                    },
-                    component: () =>
-                        import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
-                },
-                {
-                    name: 'InvoiceInLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
-                },
-                {
-                    name: 'InvoiceInCorrective',
-                    path: 'corrective',
-                    meta: {
-                        title: 'corrective',
-                        icon: 'attachment',
-                    },
-                    component: () =>
-                        import('src/pages/InvoiceIn/Card/InvoiceInCorrective.vue'),
                 },
             ],
         },