diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue index 349956be9..a1f07ff17 100644 --- 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 () => { diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index e7118fa37..4146e8d31 100644 --- 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,29 +328,14 @@ globals: serial: Serial medical: Mutual pit: IRPF - RouteExtendedList: Router wasteRecalc: Waste recaclulate operator: Operator parking: Parking vehicleList: Vehicles vehicle: Vehicle - 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: description: Description clientFk: Client id @@ -343,7 +354,7 @@ globals: supplierFk: Supplier supplierRef: Supplier ref serial: Serial - amount: Importe + amount: Amount awbCode: AWB correctedFk: Rectified correctingFk: Rectificative @@ -351,12 +362,6 @@ globals: countryFk: Country countryCodeFk: Country companyFk: Company - changePass: Change password - setPass: Set password - deleteConfirmTitle: Delete selected elements - changeState: Change state - raid: 'Raid {daysInForward} days' - isVies: Vies model: Model fuel: Fuel active: Active @@ -501,21 +506,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 @@ -707,6 +697,9 @@ supplier: consumption: entry: Entry travel: + search: Search travel + searchInfo: You can search by travel id or name + id: Id travelList: tableVisibleColumns: ref: Reference diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index bdcb9ac30..c417011aa 100644 --- 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 @@ -312,23 +333,9 @@ globals: parking: Parking vehicleList: Vehículos vehicle: Vehículo - 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: description: Descripción clientFk: Id cliente @@ -353,17 +360,6 @@ globals: countryFk: País countryCodeFk: 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 - model: Modelo - fuel: Combustible - active: Activo - inactive: Inactivo - deliveryPoint: Punto de entrega errors: statusUnauthorized: Acceso denegado statusInternalServerError: Ha ocurrido un error interno del servidor @@ -458,11 +454,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 @@ -473,47 +473,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 @@ -703,6 +662,9 @@ supplier: consumption: entry: Entrada travel: + search: Buscar envío + searchInfo: Buscar envío por id o nombre + id: Id travelList: tableVisibleColumns: ref: Referencia diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue index 18b12c60c..f76e35821 100644 --- a/src/pages/Customer/Card/CustomerUnpaid.vue +++ b/src/pages/Customer/Card/CustomerUnpaid.vue @@ -50,7 +50,8 @@ const filterClientFindOne = { >