diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index e1ec621755e..56a2e13a5d4 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1,9 +1,9 @@
globals:
lang:
es: Spanish
- en: English
- quantity: Quantity
+ en: English
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
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4b4f6f552d6..f98d53204c0 100644
--- a/src/i18n/locale/es.yml
+++ b/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
@@ -521,48 +522,30 @@ 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
- 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:
- clientId: Id cliente
- base: Base
- active: Activo
- hasToInvoice: Facturar
- verifiedData: Datos comprobados
- comercial: Comercial
- errors:
- downloadCsvFailed: Error al descargar CSV
+ basket: Cesta
+ notConfirmed: No confirmada
+ created: Creado
+ createdFrom: Creado desde
+ address: Dirección
+ total: Total
+ vat: IVA
+ state: Estado
+ alias: Alias
+ items: Artículos
+ orderTicketList: Tickets del pedido
+ amount: Monto
+ confirm: Confirmar
+ confirmLines: Confirmar lineas
shelving:
list:
parking: Parking
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index a7d8bb5e16e..3a02f521f27 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -202,8 +202,8 @@ watchEffect(selectedRows);
@click="downloadPdf()"
:disable="!hasSelectedCards"
data-cy="InvoiceOutDownloadPdfBtn"
- >
- <QTooltip>{{ t('downloadPdf') }}</QTooltip>
+ >
+ <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
</QBtn>
</template>
</VnSubToolbar>
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 527da51d178..135eb9aca46 100644
--- 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',
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 8c8c01e9cd0..6ceec61e4b0 100644
--- 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>
diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml
index c6fb6651a88..4b47381074d 100644
--- a/src/pages/InvoiceOut/locale/en.yml
+++ b/src/pages/InvoiceOut/locale/en.yml
@@ -1,6 +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
@@ -16,27 +70,4 @@ invoiceOutList:
invoiceOutSerial: Serial
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
\ No newline at end of file
+ customsAgent: Custom Agent
\ No newline at end of file
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index 35ec4b19b97..9bdeaa29435 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -1,6 +1,60 @@
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,28 +70,4 @@ invoiceOutList:
invoiceOutSerial: Serial
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
\ No newline at end of file
+ customsAgent: Agente de aduanas
\ No newline at end of file
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index ae1fe68bd47..c2d1c9cb971 100644
--- 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,