verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 68 Releases Wiki Activity

Merge pull request 'fix: fixed translations' (!1136) from hotfix_unhandledTranslations into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1136
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
PAU ROVIRA ROSALENY 2024-12-27 10:55:19 +00:00
parent 9dabe11cd0 d81daf8c66
commit d4eb61116a
28 changed files with 74 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/ui/VnFilterPanel.vue
View File

@ -202,7 +202,11 @@ const getLocale = (label) => {
style="position: fixed; z-index: 1; right: 0; bottom: 0" style="position: fixed; z-index: 1; right: 0; bottom: 0"
icon="search" icon="search"
@click="search()" @click="search()"
></QBtn> >
<QTooltip bottom anchor="bottom right">
{{ t('globals.search') }}
</QTooltip>
</QBtn>
<QForm @submit="search" id="filterPanelForm" @keyup.enter="search()"> <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
<QList dense> <QList dense>
<QItem class="q-mt-xs"> <QItem class="q-mt-xs">

3
src/i18n/locale/en.yml
View File

@ -611,7 +611,7 @@ worker:
fi: DNI/NIE/NIF fi: DNI/NIE/NIF
birth: Birth birth: Birth
isFreelance: Freelance isFreelance: Freelance
isSsDiscounted: Bonificación SS isSsDiscounted: SS Bonification
hasMachineryAuthorized: Machinery authorized hasMachineryAuthorized: Machinery authorized
isDisable: Disable isDisable: Disable
notificationsManager: notificationsManager:
@ -857,6 +857,7 @@ components:
value: Value value: Value
# ItemFixedPriceFilter # ItemFixedPriceFilter
buyerFk: Buyer buyerFk: Buyer
warehouseFk: Warehouse
started: From started: From
ended: To ended: To
mine: For me mine: For me

10
src/i18n/locale/es.yml
View File

@ -608,6 +608,15 @@ worker:
role: Rol role: Rol
sipExtension: Extensión sipExtension: Extensión
locker: Taquilla 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: notificationsManager:
activeNotifications: Notificaciones activas activeNotifications: Notificaciones activas
availableNotifications: Notificaciones disponibles availableNotifications: Notificaciones disponibles
@ -849,6 +858,7 @@ components:
value: Valor value: Valor
# ItemFixedPriceFilter # ItemFixedPriceFilter
buyerFk: Comprador buyerFk: Comprador
warehouseFk: Almacen
started: Desde started: Desde
ended: Hasta ended: Hasta
mine: Para mi mine: Para mi

2
src/pages/Account/Role/Card/RoleDescriptor.vue
View File

@ -50,7 +50,7 @@ const removeRole = async () => {
> >
<template #menu> <template #menu>
<QItem v-ripple clickable @click="removeRole()"> <QItem v-ripple clickable @click="removeRole()">
<QItemSection>{{ t('Delete') }}</QItemSection> <QItemSection>{{ t('globals.delete') }}</QItemSection>
</QItem> </QItem>
</template> </template>
<template #body="{ entity }"> <template #body="{ entity }">

4
src/pages/Customer/CustomerFilter.vue
View File

@ -170,6 +170,8 @@ en:
phone: Phone phone: Phone
email: Email email: Email
zoneFk: Zone zoneFk: Zone
socialName : Social name
name: Name
postcode: Postcode postcode: Postcode
es: es:
params: params:
@ -181,6 +183,8 @@ es:
phone: Teléfono phone: Teléfono
email: Email email: Email
zoneFk: Zona zoneFk: Zona
socialName : Razón social
name: Nombre
postcode: CP postcode: CP
FI: NIF FI: NIF
Salesperson: Comercial Salesperson: Comercial

1
src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
View File

@ -240,6 +240,7 @@ es:
defaulterSinced: Desde defaulterSinced: Desde
Client: Cliente Client: Cliente
Salesperson: Comercial Salesperson: Comercial
Departments: Departamentos
Country: País Country: País
P. Method: F. Pago P. Method: F. Pago
Balance D.: Saldo V. Balance D.: Saldo V.

4
src/pages/Entry/Card/EntryDescriptor.vue
View File

@ -74,8 +74,8 @@ const showEntryReport = () => {
</template> </template>
<template #body="{ entity }"> <template #body="{ entity }">
<VnLv :label="t('globals.agency')" :value="entity.travel?.agency?.name" /> <VnLv :label="t('globals.agency')" :value="entity.travel?.agency?.name" />
<VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" /> <VnLv :label="t('globals.shipped')" :value="toDate(entity.travel?.shipped)" />
<VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" /> <VnLv :label="t('globals.landed')" :value="toDate(entity.travel?.landed)" />
<VnLv <VnLv
:label="t('globals.warehouseOut')" :label="t('globals.warehouseOut')"
:value="entity.travel?.warehouseOut?.name" :value="entity.travel?.warehouseOut?.name"

4
src/pages/Entry/Card/EntrySummary.vue
View File

@ -212,7 +212,7 @@ const fetchEntryBuys = async () => {
:label="t('entry.summary.travelAgency')" :label="t('entry.summary.travelAgency')"
:value="entry.travel.agency?.name" :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 <VnLv
:label="t('globals.warehouseOut')" :label="t('globals.warehouseOut')"
:value="entry.travel.warehouseOut?.name" :value="entry.travel.warehouseOut?.name"
@ -222,7 +222,7 @@ const fetchEntryBuys = async () => {
v-model="entry.travel.isDelivered" v-model="entry.travel.isDelivered"
:disable="true" :disable="true"
/> />
<VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" /> <VnLv :label="t('globals.landed')" :value="toDate(entry.travel.landed)" />
<VnLv <VnLv
:label="t('globals.warehouseIn')" :label="t('globals.warehouseIn')"
:value="entry.travel.warehouseIn?.name" :value="entry.travel.warehouseIn?.name"

8
src/pages/Entry/EntryLatestBuysFilter.vue
View File

@ -58,7 +58,7 @@ const tagValues = ref([]);
<QItem class="q-my-md"> <QItem class="q-my-md">
<QItemSection> <QItemSection>
<VnSelect <VnSelect
:label="t('components.itemsFilterPanel.supplierFk')" :label="t('globals.params.supplierFk')"
v-model="params.supplierFk" v-model="params.supplierFk"
:options="suppliersOptions" :options="suppliersOptions"
option-value="id" option-value="id"
@ -85,7 +85,7 @@ const tagValues = ref([]);
<QItem class="q-my-md"> <QItem class="q-my-md">
<QItemSection> <QItemSection>
<VnInputDate <VnInputDate
:label="t('components.itemsFilterPanel.from')" :label="t('components.itemsFilterPanel.started')"
v-model="params.from" v-model="params.from"
is-outlined is-outlined
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -95,7 +95,7 @@ const tagValues = ref([]);
<QItem class="q-my-md"> <QItem class="q-my-md">
<QItemSection> <QItemSection>
<VnInputDate <VnInputDate
:label="t('components.itemsFilterPanel.to')" :label="t('components.itemsFilterPanel.ended')"
v-model="params.to" v-model="params.to"
is-outlined is-outlined
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -113,7 +113,7 @@ const tagValues = ref([]);
</QItemSection> </QItemSection>
<QItemSection> <QItemSection>
<QCheckbox <QCheckbox
:label="t('components.itemsFilterPanel.visible')" :label="t('globals.visible')"
v-model="params.visible" v-model="params.visible"
toggle-indeterminate toggle-indeterminate
@update:model-value="searchFn()" @update:model-value="searchFn()"

2
src/pages/Entry/EntryStockBoughtFilter.vue
View File

@ -65,6 +65,6 @@ onMounted(async () => {
es: es:
Date: Fecha Date: Fecha
params: params:
dated: Date dated: Fecha
workerFk: Trabajador workerFk: Trabajador
</i18n> </i18n>

2
src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
View File

@ -161,7 +161,7 @@ const columns = computed(() => [
<QList> <QList>
<QItem> <QItem>
<VnSelect <VnSelect
:label="t('code')" :label="t('Code')"
class="full-width" class="full-width"
v-model="props.row['intrastatFk']" v-model="props.row['intrastatFk']"
:options="intrastats" :options="intrastats"

2
src/pages/InvoiceOut/InvoiceOutList.vue
View File

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

2
src/pages/Item/Card/ItemTags.vue
View File

@ -128,7 +128,7 @@ const submitTags = async (data) => {
<VnSelect <VnSelect
v-if="row.tag?.isFree === false" v-if="row.tag?.isFree === false"
:key="row.tagFk" :key="row.tagFk"
:label="t('Value')" :label="t('itemTags.value')"
v-model="row.value" v-model="row.value"
:url="`Tags/${row.tagFk}/filterValue`" :url="`Tags/${row.tagFk}/filterValue`"
option-label="value" option-label="value"

2
src/pages/Item/ItemList.vue
View File

@ -368,6 +368,8 @@ const columns = computed(() => [
<i18n> <i18n>
es: es:
New item: Nuevo artículo New item: Nuevo artículo
Create Item: Crear artículo
You can search by id: Puedes buscar por id
Preview: Vista previa Preview: Vista previa
Regularize stock: Regularizar stock Regularize stock: Regularizar stock
</i18n> </i18n>

2
src/pages/Item/ItemRequestFilter.vue
View File

@ -201,6 +201,7 @@ en:
to: To to: To
mine: For me mine: For me
state: State state: State
daysOnward: Days onward
myTeam: My team myTeam: My team
dateFiltersTooltip: Cannot choose a range of dates and days onward at the same time dateFiltersTooltip: Cannot choose a range of dates and days onward at the same time
denied: Denied denied: Denied
@ -218,6 +219,7 @@ es:
to: Hasta to: Hasta
mine: Para mi mine: Para mi
state: Estado state: Estado
daysOnward: Días en adelante
myTeam: Mi equipo myTeam: Mi equipo
dateFiltersTooltip: No se puede seleccionar un rango de fechas y días en adelante a la vez dateFiltersTooltip: No se puede seleccionar un rango de fechas y días en adelante a la vez
denied: Denegada denied: Denegada

2
src/pages/Order/Card/OrderFilter.vue
View File

@ -128,6 +128,7 @@ en:
from: From from: From
to: To to: To
orderFk: Order orderFk: Order
workerFk: Worker
sourceApp: Application sourceApp: Application
myTeam: My Team myTeam: My Team
isConfirmed: Is Confirmed isConfirmed: Is Confirmed
@ -151,6 +152,7 @@ es:
from: Desde from: Desde
to: Hasta to: Hasta
orderFk: Cesta orderFk: Cesta
workerFk: Trabajador
sourceApp: Aplicación sourceApp: Aplicación
myTeam: Mi Equipo myTeam: Mi Equipo
isConfirmed: Confirmado isConfirmed: Confirmado

4
src/pages/Route/Card/RouteAutonomousFilter.vue
View File

@ -225,8 +225,8 @@ es:
params: params:
agencyModeFk: Agencia ruta agencyModeFk: Agencia ruta
m3: m³ m3: m³
from: Desde From: Desde
to: Hasta To: Hasta
date: Fecha date: Fecha
agencyFk: Agencia Acuerdo agencyFk: Agencia Acuerdo
packages: Bultos packages: Bultos

2
src/pages/Route/Card/RouteFilter.vue
View File

@ -161,6 +161,7 @@ en:
warehouseFk: Warehouse warehouseFk: Warehouse
description: Description description: Description
m3: m³ m3: m³
scopeDays: Days Onward
vehicleFk: Vehicle vehicleFk: Vehicle
agencyModeFk: Agency agencyModeFk: Agency
workerFk: Worker workerFk: Worker
@ -172,6 +173,7 @@ es:
warehouseFk: Almacén warehouseFk: Almacén
description: Descripción description: Descripción
m3: m³ m3: m³
scopeDays: Días en adelante
vehicleFk: Vehículo vehicleFk: Vehículo
agencyModeFk: Agencia agencyModeFk: Agencia
workerFk: Trabajador workerFk: Trabajador

2
src/pages/Route/RouteAutonomous.vue
View File

@ -271,6 +271,8 @@ es:
Date: Fecha Date: Fecha
Agency route: Agencia Ruta Agency route: Agencia Ruta
Agency agreement: Agencia Acuerdo Agency agreement: Agencia Acuerdo
From: Desde
To: Hasta
Packages: Bultos Packages: Bultos
Price: Precio Price: Precio
Received: Recibida Received: Recibida

2
src/pages/Supplier/Card/SupplierConsumptionFilter.vue
View File

@ -134,6 +134,7 @@ defineProps({
<i18n> <i18n>
en: en:
params: params:
supplierFk: Supplier
search: General search search: General search
itemId: Item id itemId: Item id
buyerId: Buyer buyerId: Buyer
@ -143,6 +144,7 @@ en:
to: To to: To
es: es:
params: params:
supplierFk: Proveedor
search: Búsqueda general search: Búsqueda general
itemId: Id Artículo itemId: Id Artículo
buyerId: Comprador buyerId: Comprador

2
src/pages/Supplier/Card/SupplierSummary.vue
View File

@ -149,7 +149,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
<VnLv :label="t('supplier.summary.taxNumber')" :value="supplier.nif" /> <VnLv :label="t('supplier.summary.taxNumber')" :value="supplier.nif" />
<VnLv :label="t('globals.street')" :value="supplier.street" /> <VnLv :label="t('globals.street')" :value="supplier.street" />
<VnLv :label="t('supplier.summary.city')" :value="supplier.city" /> <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 <VnLv
:label="t('supplier.summary.province')" :label="t('supplier.summary.province')"
:value="supplier.province?.name" :value="supplier.province?.name"

1
src/pages/Ticket/Card/TicketPurchaseRequest.vue
View File

@ -275,4 +275,5 @@ onMounted(() => (stateStore.rightDrawer = false));
New: Nueva New: Nueva
Denied: Denegada Denied: Denegada
Accepted: Aceptada Accepted: Aceptada
Create request: Crear petición de compra
</i18n> </i18n>

13
src/pages/Ticket/TicketFilter.vue
View File

@ -298,14 +298,19 @@ en:
to: To to: To
salesPersonFk: Salesperson salesPersonFk: Salesperson
stateFk: State stateFk: State
groupedStates: Grouped State
refFk: Invoice Ref. refFk: Invoice Ref.
scopeDays: Days onward
nickname: Nickname
myTeam: My team myTeam: My team
pending: Pending pending: Pending
hasInvoice: Invoiced hasInvoice: Invoiced
hasRoute: Routed hasRoute: Routed
problems: With problems
provinceFk: Province provinceFk: Province
agencyModeFk: Agency agencyModeFk: Agency
warehouseFk: Warehouse warehouseFk: Warehouse
collectionFk: Collection
FREE: Free FREE: Free
ON_PREPARATION: On preparation ON_PREPARATION: On preparation
PACKED: Packed PACKED: Packed
@ -320,11 +325,19 @@ es:
to: Hasta to: Hasta
salesPersonFk: Comercial salesPersonFk: Comercial
stateFk: Estado stateFk: Estado
groupedStates: Estado agrupado
refFk: Ref. Factura refFk: Ref. Factura
scopeDays: Días en adelante
nickname: Nombre mostrado
myTeam: Mi equipo myTeam: Mi equipo
pending: Pendiente pending: Pendiente
hasInvoice: Facturado hasInvoice: Facturado
hasRoute: Enrutado hasRoute: Enrutado
problems: Con problemas
provinceFk: Provincia
agencyModeFk: Agencia
warehouseFk: Almacén
collectionFk: Colección
Customer ID: ID Cliente Customer ID: ID Cliente
Order ID: ID Pedido Order ID: ID Pedido
From: Desde From: Desde

2
src/pages/Travel/ExtraCommunity.vue
View File

@ -704,6 +704,7 @@ en:
physicKg: Phy. KG physicKg: Phy. KG
shipped: W. shipped shipped: W. shipped
landed: W. landed landed: W. landed
notes: Notes
es: es:
searchExtraCommunity: Buscar por envío extra comunitario searchExtraCommunity: Buscar por envío extra comunitario
@ -711,5 +712,6 @@ es:
physicKg: KG físico physicKg: KG físico
shipped: F. envío shipped: F. envío
landed: F. llegada landed: F. llegada
notes: Notas
Open as PDF: Abrir como PDF Open as PDF: Abrir como PDF
</i18n> </i18n>

1
src/pages/Travel/TravelList.vue
View File

@ -295,6 +295,7 @@ es:
Search travel: Buscar envio Search travel: Buscar envio
Clone: Clonar Clone: Clonar
Add entry: Añadir Entrada Add entry: Añadir Entrada
Create Travels: Crear envíos
</i18n> </i18n>
<style lang="scss" scoped> <style lang="scss" scoped>

5
src/pages/Wagon/WagonList.vue
View File

@ -170,3 +170,8 @@ async function remove(row) {
</VnTable> </VnTable>
</QPage> </QPage>
</template> </template>
<i18n>
es:
Create new wagon: Crear nuevo vagón
</i18n>

1
src/pages/Zone/locale/en.yml
View File

@ -41,6 +41,7 @@ summary:
basicData: Basic data basicData: Basic data
closeHour: Close hour closeHour: Close hour
filterPanel: filterPanel:
name: Name
agencyModeFk: Agency agencyModeFk: Agency
deliveryPanel: deliveryPanel:
pickup: Pick up pickup: Pick up

1
src/pages/Zone/locale/es.yml
View File

@ -41,6 +41,7 @@ summary:
basicData: Datos básicos basicData: Datos básicos
closeHour: Hora de cierre closeHour: Hora de cierre
filterPanel: filterPanel:
name: Nombre
agencyModeFk: Agencia agencyModeFk: Agencia
deliveryPanel: deliveryPanel:
pickup: Recogida pickup: Recogida