From 470e0cc08aec53815bf72a90258a696e1c7b7a5b Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Fri, 27 Dec 2024 10:08:28 +0100
Subject: [PATCH 1/2] fix: fixed translations
---
src/components/ui/VnFilterPanel.vue | 6 +++++-
src/i18n/locale/en.yml | 3 ++-
src/i18n/locale/es.yml | 10 ++++++++++
src/pages/Customer/CustomerFilter.vue | 4 ++++
src/pages/Entry/Card/EntryDescriptor.vue | 4 ++--
src/pages/Entry/Card/EntrySummary.vue | 4 ++--
src/pages/Entry/EntryLatestBuysFilter.vue | 8 ++++----
src/pages/Entry/EntryStockBoughtFilter.vue | 2 +-
src/pages/InvoiceOut/InvoiceOutList.vue | 2 +-
src/pages/Item/Card/ItemTags.vue | 2 +-
src/pages/Item/ItemList.vue | 2 ++
src/pages/Item/ItemRequestFilter.vue | 2 ++
src/pages/Order/Card/OrderFilter.vue | 2 ++
src/pages/Route/Card/RouteAutonomousFilter.vue | 4 ++--
src/pages/Route/Card/RouteFilter.vue | 2 ++
src/pages/Route/RouteAutonomous.vue | 2 ++
.../Supplier/Card/SupplierConsumptionFilter.vue | 2 ++
src/pages/Supplier/Card/SupplierSummary.vue | 2 +-
src/pages/Ticket/TicketFilter.vue | 13 +++++++++++++
src/pages/Travel/ExtraCommunity.vue | 2 ++
src/pages/Travel/TravelList.vue | 1 +
src/pages/Wagon/WagonList.vue | 5 +++++
src/pages/Zone/locale/en.yml | 1 +
src/pages/Zone/locale/es.yml | 1 +
24 files changed, 70 insertions(+), 16 deletions(-)
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 2be508f9f65..46c43356fc2 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -202,7 +202,11 @@ const getLocale = (label) => {
style="position: fixed; z-index: 1; right: 0; bottom: 0"
icon="search"
@click="search()"
- ></QBtn>
+ >
+ <QTooltip bottom anchor="bottom right">
+ {{ t('globals.search') }}
+ </QTooltip>
+ </QBtn>
<QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
<QList dense>
<QItem class="q-mt-xs">
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 9b0d2e5a990..edcedae003b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -611,7 +611,7 @@ worker:
fi: DNI/NIE/NIF
birth: Birth
isFreelance: Freelance
- isSsDiscounted: Bonificación SS
+ isSsDiscounted: SS Bonification
hasMachineryAuthorized: Machinery authorized
isDisable: Disable
notificationsManager:
@@ -857,6 +857,7 @@ components:
value: Value
# ItemFixedPriceFilter
buyerFk: Buyer
+ warehouseFk: Warehouse
started: From
ended: To
mine: For me
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 652aed88219..20700efef8d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -608,6 +608,15 @@ worker:
role: Rol
sipExtension: Extensión
locker: Taquilla
+ fiDueDate: F. caducidad DNI
+ sex: Sexo
+ seniority: Antigüedad
+ fi: DNI/NIE/NIF
+ birth: F. nacimiento
+ isFreelance: Autónomo
+ isSsDiscounted: Bonificación SS
+ hasMachineryAuthorized: Autorizado para maquinaria
+ isDisable: Deshabilitado
notificationsManager:
activeNotifications: Notificaciones activas
availableNotifications: Notificaciones disponibles
@@ -849,6 +858,7 @@ components:
value: Valor
# ItemFixedPriceFilter
buyerFk: Comprador
+ warehouseFk: Almacen
started: Desde
ended: Hasta
mine: Para mi
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 96f67054289..71ce57a4d6c 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -170,6 +170,8 @@ en:
phone: Phone
email: Email
zoneFk: Zone
+ socialName : Social name
+ name: Name
postcode: Postcode
es:
params:
@@ -181,6 +183,8 @@ es:
phone: Teléfono
email: Email
zoneFk: Zona
+ socialName : Razón social
+ name: Nombre
postcode: CP
FI: NIF
Salesperson: Comercial
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 188e66358bf..9814615a69b 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -74,8 +74,8 @@ const showEntryReport = () => {
</template>
<template #body="{ entity }">
<VnLv :label="t('globals.agency')" :value="entity.travel?.agency?.name" />
- <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
- <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
+ <VnLv :label="t('globals.shipped')" :value="toDate(entity.travel?.shipped)" />
+ <VnLv :label="t('globals.landed')" :value="toDate(entity.travel?.landed)" />
<VnLv
:label="t('globals.warehouseOut')"
:value="entity.travel?.warehouseOut?.name"
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 4fb81d18fb2..2545aecd318 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -212,7 +212,7 @@ const fetchEntryBuys = async () => {
:label="t('entry.summary.travelAgency')"
:value="entry.travel.agency?.name"
/>
- <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
+ <VnLv :label="t('globals.shipped')" :value="toDate(entry.travel.shipped)" />
<VnLv
:label="t('globals.warehouseOut')"
:value="entry.travel.warehouseOut?.name"
@@ -222,7 +222,7 @@ const fetchEntryBuys = async () => {
v-model="entry.travel.isDelivered"
:disable="true"
/>
- <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
+ <VnLv :label="t('globals.landed')" :value="toDate(entry.travel.landed)" />
<VnLv
:label="t('globals.warehouseIn')"
:value="entry.travel.warehouseIn?.name"
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index 83124c1bf5c..dbca58131fa 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -58,7 +58,7 @@ const tagValues = ref([]);
<QItem class="q-my-md">
<QItemSection>
<VnSelect
- :label="t('components.itemsFilterPanel.supplierFk')"
+ :label="t('globals.params.supplierFk')"
v-model="params.supplierFk"
:options="suppliersOptions"
option-value="id"
@@ -85,7 +85,7 @@ const tagValues = ref([]);
<QItem class="q-my-md">
<QItemSection>
<VnInputDate
- :label="t('components.itemsFilterPanel.from')"
+ :label="t('components.itemsFilterPanel.started')"
v-model="params.from"
is-outlined
@update:model-value="searchFn()"
@@ -95,7 +95,7 @@ const tagValues = ref([]);
<QItem class="q-my-md">
<QItemSection>
<VnInputDate
- :label="t('components.itemsFilterPanel.to')"
+ :label="t('components.itemsFilterPanel.ended')"
v-model="params.to"
is-outlined
@update:model-value="searchFn()"
@@ -113,7 +113,7 @@ const tagValues = ref([]);
</QItemSection>
<QItemSection>
<QCheckbox
- :label="t('components.itemsFilterPanel.visible')"
+ :label="t('globals.visible')"
v-model="params.visible"
toggle-indeterminate
@update:model-value="searchFn()"
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
index e59332064d0..136881f179d 100644
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -65,6 +65,6 @@ onMounted(async () => {
es:
Date: Fecha
params:
- dated: Date
+ dated: Fecha
workerFk: Trabajador
</i18n>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 0aeae622d10..a1557c451c1 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -351,7 +351,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"
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index fbb0e01a79a..93d4b9a7134 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -128,7 +128,7 @@ const submitTags = async (data) => {
<VnSelect
v-if="row.tag?.isFree === false"
:key="row.tagFk"
- :label="t('Value')"
+ :label="t('itemTags.value')"
v-model="row.value"
:url="`Tags/${row.tagFk}/filterValue`"
option-label="value"
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 30454a0c3ac..e02afa3ba44 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -368,6 +368,8 @@ const columns = computed(() => [
<i18n>
es:
New item: Nuevo artículo
+ Create Item: Crear artículo
+ You can search by id: Puedes buscar por id
Preview: Vista previa
Regularize stock: Regularizar stock
</i18n>
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 4e8ae0d42bf..f23cadcad52 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -201,6 +201,7 @@ en:
to: To
mine: For me
state: State
+ daysOnward: Days onward
myTeam: My team
dateFiltersTooltip: Cannot choose a range of dates and days onward at the same time
denied: Denied
@@ -218,6 +219,7 @@ es:
to: Hasta
mine: Para mi
state: Estado
+ daysOnward: Días en adelante
myTeam: Mi equipo
dateFiltersTooltip: No se puede seleccionar un rango de fechas y días en adelante a la vez
denied: Denegada
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index dc86600ac48..fcd1ef2e4ad 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -128,6 +128,7 @@ en:
from: From
to: To
orderFk: Order
+ workerFk: Worker
sourceApp: Application
myTeam: My Team
isConfirmed: Is Confirmed
@@ -151,6 +152,7 @@ es:
from: Desde
to: Hasta
orderFk: Cesta
+ workerFk: Trabajador
sourceApp: Aplicación
myTeam: Mi Equipo
isConfirmed: Confirmado
diff --git a/src/pages/Route/Card/RouteAutonomousFilter.vue b/src/pages/Route/Card/RouteAutonomousFilter.vue
index 3d08e135545..0b807b7b36e 100644
--- a/src/pages/Route/Card/RouteAutonomousFilter.vue
+++ b/src/pages/Route/Card/RouteAutonomousFilter.vue
@@ -225,8 +225,8 @@ es:
params:
agencyModeFk: Agencia ruta
m3: m³
- from: Desde
- to: Hasta
+ From: Desde
+ To: Hasta
date: Fecha
agencyFk: Agencia Acuerdo
packages: Bultos
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 6f65313d32f..72bfed1da7e 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -161,6 +161,7 @@ en:
warehouseFk: Warehouse
description: Description
m3: m³
+ scopeDays: Days Onward
vehicleFk: Vehicle
agencyModeFk: Agency
workerFk: Worker
@@ -172,6 +173,7 @@ es:
warehouseFk: Almacén
description: Descripción
m3: m³
+ scopeDays: Días en adelante
vehicleFk: Vehículo
agencyModeFk: Agencia
workerFk: Trabajador
diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index e45af30c750..ca51b0fdb7b 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -271,6 +271,8 @@ es:
Date: Fecha
Agency route: Agencia Ruta
Agency agreement: Agencia Acuerdo
+ From: Desde
+ To: Hasta
Packages: Bultos
Price: Precio
Received: Recibida
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 401bde8fa05..390f7d9ff76 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -134,6 +134,7 @@ defineProps({
<i18n>
en:
params:
+ supplierFk: Supplier
search: General search
itemId: Item id
buyerId: Buyer
@@ -143,6 +144,7 @@ en:
to: To
es:
params:
+ supplierFk: Proveedor
search: Búsqueda general
itemId: Id Artículo
buyerId: Comprador
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index b808b3e3ed6..a08561933c6 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -149,7 +149,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
<VnLv :label="t('supplier.summary.taxNumber')" :value="supplier.nif" />
<VnLv :label="t('globals.street')" :value="supplier.street" />
<VnLv :label="t('supplier.summary.city')" :value="supplier.city" />
- <VnLv :label="t('globals.postCode')" :value="supplier.postCode" />
+ <VnLv :label="t('globals.postcode')" :value="supplier.postCode" />
<VnLv
:label="t('supplier.summary.province')"
:value="supplier.province?.name"
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index bde27f30efc..9c8b9f1a3be 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -298,14 +298,19 @@ en:
to: To
salesPersonFk: Salesperson
stateFk: State
+ groupedStates: Grouped State
refFk: Invoice Ref.
+ scopeDays: Days onward
+ nickname: Nickname
myTeam: My team
pending: Pending
hasInvoice: Invoiced
hasRoute: Routed
+ problems: With problems
provinceFk: Province
agencyModeFk: Agency
warehouseFk: Warehouse
+ collectionFk: Collection
FREE: Free
ON_PREPARATION: On preparation
PACKED: Packed
@@ -320,11 +325,19 @@ es:
to: Hasta
salesPersonFk: Comercial
stateFk: Estado
+ groupedStates: Estado agrupado
refFk: Ref. Factura
+ scopeDays: Días en adelante
+ nickname: Nombre mostrado
myTeam: Mi equipo
pending: Pendiente
hasInvoice: Facturado
hasRoute: Enrutado
+ problems: Con problemas
+ provinceFk: Provincia
+ agencyModeFk: Agencia
+ warehouseFk: Almacén
+ collectionFk: Colección
Customer ID: ID Cliente
Order ID: ID Pedido
From: Desde
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 675a44979b8..c23b6b0a194 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -704,6 +704,7 @@ en:
physicKg: Phy. KG
shipped: W. shipped
landed: W. landed
+ notes: Notes
es:
searchExtraCommunity: Buscar por envío extra comunitario
@@ -711,5 +712,6 @@ es:
physicKg: KG físico
shipped: F. envío
landed: F. llegada
+ notes: Notas
Open as PDF: Abrir como PDF
</i18n>
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 70e81aae2a1..ddd239db552 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -295,6 +295,7 @@ es:
Search travel: Buscar envio
Clone: Clonar
Add entry: Añadir Entrada
+ Create Travels: Crear envíos
</i18n>
<style lang="scss" scoped>
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 893b058eaf2..c5d7d0c8914 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -170,3 +170,8 @@ async function remove(row) {
</VnTable>
</QPage>
</template>
+
+<i18n>
+es:
+ Create new wagon: Crear nuevo vagón
+</i18n>
\ No newline at end of file
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index ba498231159..c9b1040e281 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -41,6 +41,7 @@ summary:
basicData: Basic data
closeHour: Close hour
filterPanel:
+ name: Name
agencyModeFk: Agency
deliveryPanel:
pickup: Pick up
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index d0bab83f480..4325dc92798 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -41,6 +41,7 @@ summary:
basicData: Datos básicos
closeHour: Hora de cierre
filterPanel:
+ name: Nombre
agencyModeFk: Agencia
deliveryPanel:
pickup: Recogida
From d81daf8c6636a3f59862e33eb2b5fc78066906e3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 27 Dec 2024 10:42:41 +0100
Subject: [PATCH 2/2] fix: fixed translations
---
src/pages/Account/Role/Card/RoleDescriptor.vue | 2 +-
src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue | 1 +
src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue | 2 +-
src/pages/Ticket/Card/TicketPurchaseRequest.vue | 1 +
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index b4b4fe3168d..0a555346d9f 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -50,7 +50,7 @@ const removeRole = async () => {
>
<template #menu>
<QItem v-ripple clickable @click="removeRole()">
- <QItemSection>{{ t('Delete') }}</QItemSection>
+ <QItemSection>{{ t('globals.delete') }}</QItemSection>
</QItem>
</template>
<template #body="{ entity }">
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 1d7f63f3602..ce86c6435cd 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -240,6 +240,7 @@ es:
defaulterSinced: Desde
Client: Cliente
Salesperson: Comercial
+ Departments: Departamentos
Country: País
P. Method: F. Pago
Balance D.: Saldo V.
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 1c4091169e6..e529ea6cd06 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -161,7 +161,7 @@ const columns = computed(() => [
<QList>
<QItem>
<VnSelect
- :label="t('code')"
+ :label="t('Code')"
class="full-width"
v-model="props.row['intrastatFk']"
:options="intrastats"
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 3b9d6a25b92..4e77c727725 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -275,4 +275,5 @@ onMounted(() => (stateStore.rightDrawer = false));
New: Nueva
Denied: Denegada
Accepted: Aceptada
+ Create request: Crear petición de compra
</i18n>