diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue index c84772d9b..841a55bba 100644 --- a/src/components/FilterTravelForm.vue +++ b/src/components/FilterTravelForm.vue @@ -70,7 +70,7 @@ const tableColumns = computed(() => [ warehousesOptions.value.find((warehouse) => warehouse.id === val).name, }, { - label: t('entry.basicData.shipped'), + label: t('globals.shipped'), name: 'shipped', field: 'shipped', align: 'left', @@ -170,7 +170,7 @@ const selectTravel = ({ id }) => { v-model="travelFilterParams.warehouseInFk" /> - @@ -357,7 +354,6 @@ entry: ordered: Ordered tableVisibleColumns: id: Id - reference: Reference created: Creation supplierFk: Supplier isBooked: Booked @@ -372,7 +368,6 @@ entry: commission: Commission currency: Currency company: Company - reference: Reference invoiceNumber: Invoice number ordered: Ordered confirmed: Confirmed @@ -388,10 +383,8 @@ entry: travelWarehouseIn: Warehouse In travelReceived: Received buys: Buys - quantity: Quantity stickers: Stickers package: Package - weight: Weight packing: Packing grouping: Grouping buyingValue: Buying value @@ -401,7 +394,6 @@ entry: basicData: supplier: Supplier travel: Travel - reference: Reference invoiceNumber: Invoice number company: Company currency: Currency @@ -415,13 +407,11 @@ entry: agency: Agency warehouseOut: Warehouse Out warehouseIn: Warehouse In - shipped: Shipped landed: Landed id: ID buys: groupingPrice: Grouping price packingPrice: Packing price - reference: Reference observations: Observations item: Item size: Size @@ -429,7 +419,6 @@ entry: grouping: Grouping buyingValue: Buying value packagingFk: Box - file: File name: Name producer: Producer type: Type @@ -448,7 +437,6 @@ entry: itemFk: Item ID packing: Packing grouping: Grouping - quantity: Quantity size: Size tags: Tags type: Type @@ -461,14 +449,12 @@ entry: buyingValue: Buying value freightValue: Freight value comissionValue: Commission value - description: Description packageValue: Package value isIgnored: Is ignored price2: Grouping price3: Packing minPrice: Min ektFk: Ekt - weight: Weight packagingFk: Package packingOut: Package out landing: Landing @@ -476,17 +462,10 @@ entry: isRaid: Raid ticket: pageTitles: - tickets: Tickets list: List - ticketCreate: New ticket summary: Summary - basicData: Basic Data - boxing: Boxing - sms: Sms - notes: Notes sale: Sale dms: File management - volume: Volume observation: Notes ticketAdvance: Advance tickets futureTickets: Future tickets @@ -495,17 +474,13 @@ ticket: list: nickname: Nickname state: State - shipped: Shipped landed: Landed - salesPerson: Sales person total: Total card: ticketId: Ticket ID state: State customerId: Customer ID - salesPerson: Sales person agency: Agency - shipped: Shipped warehouse: Warehouse customerCard: Customer card alias: Alias @@ -521,7 +496,6 @@ ticket: notFound: No videos available summary: state: State - salesPerson: Sales person agency: Agency zone: Zone warehouse: Warehouse @@ -543,7 +517,6 @@ ticket: item: Item visible: Visible available: Available - quantity: Quantity price: Price discount: Discount packing: Packing @@ -559,12 +532,10 @@ ticket: requester: Requester atender: Atender request: Request - weight: Weight goTo: Go to summaryAmount: Summary purchaseRequest: Purchase request service: Service - description: Description attender: Attender ok: Ok create: @@ -584,7 +555,6 @@ invoiceOut: company: Company dued: Due date shortDued: Due date - amount: Amount card: issued: Issued client: Client @@ -604,7 +574,6 @@ invoiceOut: tickets: Tickets ticketId: Ticket id nickname: Alias - shipped: Shipped totalWithVat: Amount globalInvoices: errors: @@ -625,13 +594,10 @@ invoiceOut: percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}' pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs' negativeBases: - from: From - to: To company: Company country: Country clientId: Client Id client: Client - amount: Amount base: Base ticketId: Ticket Id active: Active @@ -646,13 +612,11 @@ shelving: priority: Priority newShelving: New Shelving summary: - code: Code parking: Parking priority: Priority worker: Worker recyclable: Recyclable basicData: - code: Code parking: Parking priority: Priority recyclable: Recyclable @@ -694,7 +658,6 @@ order: phone: Phone createdFrom: Created From address: Address - notes: Notes subtotal: Subtotal total: Total vat: VAT @@ -702,18 +665,14 @@ order: alias: Alias items: Items orderTicketList: Order Ticket List - details: Details item: Item - quantity: Quantity price: Price amount: Amount department: pageTitles: - basicData: Basic data department: Department summary: Summary name: Name - code: Code chat: Chat bossDepartment: Boss Department email: Email @@ -728,20 +687,16 @@ worker: pageTitles: workers: Workers list: List - basicData: Basic data summary: Summary - notifications: Notifications workerCreate: New worker department: Department pda: PDA - notes: Notas dms: My documentation pbx: Private Branch Exchange log: Log calendar: Calendar timeControl: Time control locker: Locker - balance: Balance medical: Medical list: name: Name @@ -754,7 +709,6 @@ worker: newWorker: New worker card: workerId: Worker ID - user: User name: Name email: Email phone: Phone @@ -762,9 +716,7 @@ worker: active: Active warehouse: Warehouse agency: Agency - salesPerson: Sales person summary: - basicData: Basic data boss: Boss phoneExtension: Phone extension entPhone: Enterprise phone @@ -820,16 +772,13 @@ worker: endDate: End date center: Training center invoice: Invoice - amount: Amount remark: Remark hasDiploma: Has diploma medical: tableVisibleColumns: - date: Date time: Hour center: Formation Center invoice: Invoice - amount: Amount isFit: Fit remark: Observations imageNotFound: Image not found @@ -865,7 +814,6 @@ wagon: removeItem: Wagon removed successfully create: plate: Plate - volume: Volume type: Type label: Label warnings: @@ -898,7 +846,6 @@ supplier: country: Country summary: responsible: Responsible - notes: Notes verified: Verified isActive: Is active billingData: Billing data @@ -978,15 +925,12 @@ supplier: addRow: Add row consumption: entry: Entry - date: Date - reference: Reference travel: travelList: tableVisibleColumns: id: Id ref: Reference agency: Agency - shipped: Shipped landed: Landed shipHour: Shipment Hour landHour: Landing Hour @@ -1017,29 +961,23 @@ travel: landedFrom: Landed from landedTo: Landed to continent: Continent out - totalEntries: Total entries basicData: - reference: Reference agency: Agency - shipped: Shipped landed: Landed warehouseOut: Warehouse Out warehouseIn: Warehouse In delivered: Delivered received: Received thermographs: - code: Code temperature: Temperature state: State destination: Destination created: Created thermograph: Thermograph - reference: Reference type: Type company: Company warehouse: Warehouse travelFileDescription: 'Travel id { travelId }' - file: File item: descriptor: item: Item @@ -1056,7 +994,6 @@ item: id: Identifier grouping: Grouping packing: Packing - description: Description stems: Stems category: Category typeName: Type @@ -1087,7 +1024,6 @@ item: origin: Origin buyRequest: ticketId: 'Ticket ID' - shipped: 'Shipped' requester: 'Requester' requested: 'Requested' price: 'Price' @@ -1097,9 +1033,7 @@ item: concept: 'Concept' state: 'State' summary: - basicData: 'Basic data' otherData: 'Other data' - description: 'Description' tax: 'Tax' tags: 'Tags' botanical: 'Botanical' @@ -1143,7 +1077,6 @@ components: salesPersonFk: Buyer supplierFk: Supplier from: From - to: To active: Is active visible: Is visible floramondo: Is floramondo @@ -1151,7 +1084,6 @@ components: userPanel: copyToken: Token copied to clipboard settings: Settings - logOut: Log Out localWarehouse: Local warehouse localBank: Local bank localCompany: Local company @@ -1159,7 +1091,6 @@ components: userCompany: User company smartCard: downloadFile: Download file - clone: Clone openCard: View openSummary: Summary cardDescriptor: diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 2552c9549..a8d582c30 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -304,8 +304,6 @@ globals: salesPersonFk: Comercial warehouseFk: Almacén provinceFk: Provincia - from: Desde - To: Hasta stateFk: Estado departmentFk: Departamento email: Correo @@ -333,7 +331,6 @@ login: fieldRequired: Este campo es obligatorio twoFactorRequired: Verificación de doble factor requerida twoFactor: - code: Código validate: Validar insert: Introduce el código de verificación explanation: Por favor introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos @@ -359,7 +356,6 @@ entry: ordered: Pedida tableVisibleColumns: id: Id - reference: Referencia created: Creación supplierFk: Proveedor isBooked: Asentado @@ -374,7 +370,6 @@ entry: commission: Comisión currency: Moneda company: Empresa - reference: Referencia invoiceNumber: Núm. factura ordered: Pedida confirmed: Confirmada @@ -390,10 +385,8 @@ entry: travelWarehouseIn: Alm. entrada travelReceived: Recibida buys: Compras - quantity: Cantidad stickers: Etiquetas package: Embalaje - weight: Peso packing: Packing grouping: Grouping buyingValue: Coste @@ -403,7 +396,6 @@ entry: basicData: supplier: Proveedor travel: Envío - reference: Referencia invoiceNumber: Núm. factura company: Empresa currency: Moneda @@ -417,13 +409,11 @@ entry: agency: Agencia warehouseOut: Alm. salida warehouseIn: Alm. entrada - shipped: F. envío landed: F. entrega id: ID buys: groupingPrice: Precio grouping packingPrice: Precio packing - reference: Referencia observations: Observaciónes item: Artículo size: Medida @@ -431,7 +421,6 @@ entry: grouping: Grouping buyingValue: Coste packagingFk: Embalaje - file: Fichero name: Nombre producer: Productor type: Tipo @@ -450,7 +439,6 @@ entry: itemFk: Id Artículo packing: packing grouping: Grouping - quantity: Cantidad size: Medida tags: Etiquetas type: Tipo @@ -463,14 +451,12 @@ entry: buyingValue: Coste freightValue: Porte comissionValue: Comisión - description: Descripción packageValue: Embalaje isIgnored: Ignorado price2: Grouping price3: Packing minPrice: Min ektFk: Ekt - weight: Peso packagingFk: Embalaje packingOut: Embalaje envíos landing: Llegada @@ -478,17 +464,9 @@ entry: isRaid: Redada ticket: pageTitles: - tickets: Tickets list: Listado - ticketCreate: Nuevo ticket summary: Resumen - basicData: Datos básicos - boxing: Encajado - sms: Sms - notes: Notas - sale: Lineas del pedido dms: Gestión documental - volume: Volumen observation: Notas ticketAdvance: Adelantar tickets futureTickets: Tickets a futuro @@ -500,21 +478,16 @@ ticket: tracking: Estados components: Componentes pictures: Fotos - packages: Embalajes list: nickname: Alias state: Estado - shipped: Enviado landed: Entregado - salesPerson: Comercial total: Total card: ticketId: ID ticket state: Estado customerId: ID cliente - salesPerson: Comercial agency: Agencia - shipped: Enviado warehouse: Almacén customerCard: Ficha del cliente alias: Alias @@ -530,7 +503,6 @@ ticket: notFound: No hay vídeos disponibles summary: state: Estado - salesPerson: Comercial agency: Agencia zone: Zona warehouse: Almacén @@ -552,7 +524,6 @@ ticket: item: Artículo visible: Visible available: Disponible - quantity: Cantidad price: Precio discount: Descuento packing: Encajado @@ -568,12 +539,10 @@ ticket: requester: Solicitante atender: Comprador request: Petición de compra - weight: Peso goTo: Ir a summaryAmount: Resumen purchaseRequest: Petición de compra service: Servicio - description: Descripción attender: Consignatario create: client: Cliente @@ -592,7 +561,6 @@ invoiceOut: company: Empresa dued: Fecha vencimineto shortDued: F. vencimiento - amount: Importe card: issued: Fecha emisión client: Cliente @@ -613,7 +581,6 @@ invoiceOut: tickets: Tickets ticketId: Id ticket nickname: Alias - shipped: F. envío totalWithVat: Importe globalInvoices: errors: @@ -638,7 +605,6 @@ invoiceOut: country: País clientId: Id cliente client: Cliente - amount: Importe base: Base ticketId: Id ticket active: Activo @@ -675,7 +641,6 @@ order: phone: Teléfono createdFrom: Creado desde address: Dirección - notes: Notas subtotal: Subtotal total: Total vat: IVA @@ -683,9 +648,7 @@ order: alias: Alias items: Items orderTicketList: Tickets del pedido - details: Detalles item: Item - quantity: Cantidad price: Precio amount: Monto shelving: @@ -694,13 +657,11 @@ shelving: priority: Prioridad newShelving: Nuevo Carro summary: - code: Código parking: Parking priority: Prioridad worker: Trabajador recyclable: Reciclable basicData: - code: Código parking: Parking priority: Prioridad recyclable: Reciclable @@ -715,11 +676,9 @@ parking: label: Buscar parking... department: pageTitles: - basicData: Basic data department: Departamentos summary: Resumen name: Nombre - code: Código chat: Chat bossDepartment: Jefe de departamento email: Email @@ -734,20 +693,16 @@ worker: pageTitles: workers: Trabajadores list: Listado - basicData: Datos básicos summary: Resumen - notifications: Notificaciones workerCreate: Nuevo trabajador department: Departamentos pda: PDA - notes: Notas dms: Mi documentación pbx: Centralita log: Historial calendar: Calendario timeControl: Control de horario locker: Taquilla - balance: Balance formation: Formación medical: Mutua list: @@ -761,7 +716,6 @@ worker: newWorker: Nuevo trabajador card: workerId: ID Trabajador - user: Usuario name: Nombre email: Correo personal phone: Teléfono @@ -769,9 +723,7 @@ worker: active: Activo warehouse: Almacén agency: Empresa - salesPerson: Comercial summary: - basicData: Datos básicos boss: Jefe phoneExtension: Extensión de teléfono entPhone: Teléfono de empresa @@ -818,16 +770,13 @@ worker: endDate: Fecha Fin center: Centro Formación invoice: Factura - amount: Importe remark: Bonficado hasDiploma: Diploma medical: tableVisibleColumns: - date: Fecha time: Hora center: Centro de Formación invoice: Factura - amount: Importe isFit: Apto remark: Observaciones imageNotFound: No se ha encontrado la imagen @@ -863,7 +812,6 @@ wagon: removeItem: Vagón borrado correctamente create: plate: Matrícula - volume: Volumen type: Tipo label: Etiqueta warnings: @@ -895,7 +843,6 @@ supplier: country: País summary: responsible: Responsable - notes: Notas verified: Verificado isActive: Está activo billingData: Forma de pago @@ -975,15 +922,12 @@ supplier: addRow: Añadir fila consumption: entry: Entrada - date: Fecha - reference: Referencia travel: travelList: tableVisibleColumns: id: Id ref: Referencia agency: Agencia - shipped: F.envío shipHour: Hora de envío landHour: Hora de llegada landed: F.entrega @@ -1014,29 +958,23 @@ travel: landedFrom: Llegada desde landedTo: Llegada hasta continent: Cont. Salida - totalEntries: Ent. totales basicData: - reference: Referencia agency: Agencia - shipped: F. Envío landed: F. entrega warehouseOut: Alm. salida warehouseIn: Alm. entrada delivered: Enviada received: Recibida thermographs: - code: Código temperature: Temperatura state: Estado destination: Destino created: Fecha creación thermograph: Termógrafo - reference: Referencia type: Tipo company: Empresa warehouse: Almacén travelFileDescription: 'Id envío { travelId }' - file: Fichero item: descriptor: item: Artículo @@ -1053,7 +991,6 @@ item: id: Identificador grouping: Grouping packing: Packing - description: Descripción stems: Tallos category: Reino typeName: Tipo @@ -1083,9 +1020,7 @@ item: intrastat: Intrastat origin: Origen summary: - basicData: 'Datos básicos' otherData: 'Otros datos' - description: 'Descripción' tax: 'IVA' tags: 'Etiquetas' botanical: 'Botánico' @@ -1114,7 +1049,6 @@ item: specie: 'Specie' buyRequest: ticketId: 'ID Ticket' - shipped: 'F. envío' requester: 'Solicitante' requested: 'Solicitado' price: 'Precio' @@ -1146,7 +1080,6 @@ components: userPanel: copyToken: Token copiado al portapapeles settings: Configuración - logOut: Cerrar sesión localWarehouse: Almacén local localBank: Banco local localCompany: Empresa local @@ -1154,7 +1087,6 @@ components: userCompany: Empresa del usuario smartCard: downloadFile: Descargar archivo - clone: Clonar openCard: Ficha openSummary: Detalles viewSummary: Vista previa diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue index 141bb4159..384881792 100644 --- a/src/pages/Department/Card/DepartmentBasicData.vue +++ b/src/pages/Department/Card/DepartmentBasicData.vue @@ -28,8 +28,8 @@ const { t } = useI18n(); /> diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue index ecbb39ed0..05a9e073e 100644 --- a/src/pages/Department/Card/DepartmentSummary.vue +++ b/src/pages/Department/Card/DepartmentSummary.vue @@ -50,11 +50,7 @@ onMounted(async () => { :value="department.name" dash /> - + { - + { align: 'left', }, { - label: t('entry.summary.quantity'), + label: t('globals.quantity'), field: 'quantity', name: 'quantity', align: 'left', @@ -187,7 +186,7 @@ const entriesTableColumns = computed(() => { align: 'left', }, { - label: t('entry.summary.weight'), + label: t('globals.weight'), field: 'weight', name: 'weight', align: 'left', diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue index 8431e1096..36ca3b797 100644 --- a/src/pages/Entry/Card/EntryBuysImport.vue +++ b/src/pages/Entry/Card/EntryBuysImport.vue @@ -200,7 +200,7 @@ const redirectToBuysView = () => { {
- + { return [ { - label: t('entry.summary.quantity'), + label: t('globals.quantity'), field: 'quantity', name: 'quantity', align: 'left', @@ -101,7 +101,7 @@ const entriesTableColumns = computed(() => { align: 'left', }, { - label: t('entry.summary.weight'), + label: t('globals.weight'), field: 'weight', name: 'weight', align: 'left', @@ -190,7 +190,7 @@ const fetchEntryBuys = async () => { :value="entry.currency?.name" /> - + [ }, { align: 'left', - label: t('entry.list.tableVisibleColumns.reference'), + label: t('globals.reference'), name: 'reference', isTitle: true, component: 'input', diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue index e9d5a2f1f..83b1bf8a4 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue @@ -86,7 +86,7 @@ const ticketsColumns = ref([ }, { name: 'landed', - label: t('invoiceOut.summary.shipped'), + label: t('globals.shipped'), field: (row) => row.shipped, format: (value) => toDate(value), sortable: true, diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue index 94eab2aab..cf4c27e65 100644 --- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue +++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue @@ -33,7 +33,7 @@ const props = defineProps({ @@ -42,7 +42,7 @@ const props = defineProps({ @@ -88,7 +88,7 @@ const props = defineProps({ diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue index 7b6015c30..dd2c0649b 100644 --- a/src/pages/Item/Card/ItemSummary.vue +++ b/src/pages/Item/Card/ItemSummary.vue @@ -55,7 +55,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`; @@ -126,7 +126,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;

diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue index 8a41bbe04..7dd961a35 100644 --- a/src/pages/Item/ItemRequest.vue +++ b/src/pages/Item/ItemRequest.vue @@ -47,7 +47,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('item.buyRequest.shipped'), + label: t('globals.shipped'), field: 'shipped', name: 'shipped', align: 'left', diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue index 60358f744..ceacbc75b 100644 --- a/src/pages/Order/Card/OrderSummary.vue +++ b/src/pages/Order/Card/OrderSummary.vue @@ -35,7 +35,7 @@ const detailsColumns = ref([ }, { name: 'quantity', - label: t('order.summary.quantity'), + label: t('globals.quantity'), field: (row) => row?.quantity, }, { @@ -161,13 +161,13 @@ const detailsColumns = ref([ - +