verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Juan Ferrer 2023-05-17 10:18:41 +02:00
parent dd9699e120
commit fa40bd9811
60 changed files with 91 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
db/dump/fixtures.sql
View File

@ -2770,10 +2770,21 @@ UPDATE `account`.`user`
INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`) INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
VALUES VALUES
(7, 18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL), (7, 18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL),
(7, 18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL), (7, 18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL),
(7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL), (7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL),
(7, 18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'"); (7, 18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'");
INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, description, changedModel, oldInstance, newInstance, changedModelId, changedModelValue)
VALUES
(7, 18, 'insert', '2001-01-01 10:00:03.0', NULL,'Sale','{"quantity":10}','{"quantity":15}',568,'Batman'),
(7, NULL, 'delete', '2000-12-31 15:00:03.0', NULL,'Ticket','{"quantity":99,"concept":"Chest ammo"}','{"quantity":10,"concept":"Chest ammo box"}',45,'Spider Man'),
(7, 18, 'insert', '2000-12-28 08:40:33.0', NULL,'Sale',NULL,'{"id":4252921,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":null,"addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}',65893,'Super Man'),
(7, 18, 'select', '2000-12-27 03:40:45.0', 'Cambio cantidad Melee weapon heavy shield 1x0.5m de ''5'' a ''10''',NULL,NULL,NULL,NULL,NULL),
(7, 18, 'insert', '2000-04-10 09:40:15.0', NULL,'Sale','{"quantity":1}','{"quantity":10}',568,'Robin'),
(7, NULL, 'delete', '1999-05-09 10:00:03.0', NULL,'Ticket','{"quantity":1,"concept":"Chest box"}','{"quantity":10,"concept":"Chest ammo box"}',45,'Octopus'),
(7, 18, 'update', '2001-05-09 10:00:03.0', NULL,'Sale','{"id":4252921,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":null,"addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}','{"id":4252921,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"18 Agrupació comerciants Girona Centre","addressFk":48637,"isSigned":false,"isLabeled":false,"isPrinted":false,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":true,"hasPriority":true,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":false,"isDeleted":false,"zoneFk":713,"zonePrice":12,"zoneBonus":0}',65893,'Green Man'),
(7, 18, 'select', '2001-06-09 10:00:03.0', NULL,NULL,NULL,NULL,NULL,NULL);
INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`) INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
VALUES VALUES

7
front/salix/components/log/style.scss
View File

@ -95,12 +95,13 @@ vn-log {
overflow: hidden; overflow: hidden;
background-color: rgba(255, 255, 255, .05); background-color: rgba(255, 255, 255, .05);
color: $color-font-secondary; color: $color-font-secondary;
transition: max-height 150ms ease-in-out; transition: max-height 1000ms ease-in-out;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
max-height: 34px; min-height: 34px;
box-sizing: border-box;
& > .icon { & > .icon {
float: right; float: right;
@ -120,8 +121,6 @@ vn-log {
&.expanded { &.expanded {
text-overflow: initial; text-overflow: initial;
white-space: initial; white-space: initial;
overflow: auto;
max-height: 600px;
& > .icon { & > .icon {
& > .expand-button { & > .expand-button {

2
modules/claim/back/locale/claim-beginning/en.yml
View File

@ -1,4 +1,4 @@
name: claim beginning name: beginning
columns: columns:
id: id id: id
quantity: quantity quantity: quantity

2
modules/claim/back/locale/claim-beginning/es.yml
View File

@ -1,4 +1,4 @@
name: comienzo reclamación name: comienzo
columns: columns:
id: id id: id
quantity: cantidad quantity: cantidad

2
modules/claim/back/locale/claim-development/en.yml
View File

@ -1,4 +1,4 @@
name: claim development name: development
columns: columns:
id: id id: id
claimFk: claim claimFk: claim

2
modules/claim/back/locale/claim-development/es.yml
View File

@ -1,4 +1,4 @@
name: desarrollo reclamación name: desarrollo
columns: columns:
id: id id: id
claimFk: reclamación claimFk: reclamación

2
modules/claim/back/locale/claim-dms/en.yml
View File

@ -1,4 +1,4 @@
name: claim dms name: document
columns: columns:
dmsFk: dms dmsFk: dms
claimFk: claim claimFk: claim

2
modules/claim/back/locale/claim-dms/es.yml
View File

@ -1,4 +1,4 @@
name: documento reclamación name: documento
columns: columns:
dmsFk: dms dmsFk: dms
claimFk: reclamación claimFk: reclamación

2
modules/claim/back/locale/claim-end/en.yml
View File

@ -1,4 +1,4 @@
name: claim end name: end
columns: columns:
id: id id: id
claimFk: claim claimFk: claim

2
modules/claim/back/locale/claim-end/es.yml
View File

@ -1,4 +1,4 @@
name: final reclamación name: finalización
columns: columns:
id: id id: id
claimFk: reclamación claimFk: reclamación

2
modules/claim/back/locale/claim-observation/en.yml
View File

@ -1,4 +1,4 @@
name: claim observation name: observation
columns: columns:
id: id id: id
claimFk: claim claimFk: claim

2
modules/claim/back/locale/claim-observation/es.yml
View File

@ -1,4 +1,4 @@
name: observación reclamación name: observación
columns: columns:
id: id id: id
claimFk: reclamación claimFk: reclamación

2
modules/client/back/locale/client-contact/en.yml
View File

@ -1,4 +1,4 @@
name: client contact name: contact
columns: columns:
id: id id: id
name: name name: name

2
modules/client/back/locale/client-contact/es.yml
View File

@ -1,4 +1,4 @@
name: contacto cliente name: contacto
columns: columns:
id: id id: id
name: nombre name: nombre

2
modules/client/back/locale/client-dms/en.yml
View File

@ -1,4 +1,4 @@
name: client dms name: document
columns: columns:
dmsFk: dms dmsFk: dms
clientFk: client clientFk: client

2
modules/client/back/locale/client-dms/es.yml
View File

@ -1,4 +1,4 @@
name: documento cliente name: documento
columns: columns:
dmsFk: dms dmsFk: dms
clientFk: client clientFk: client

2
modules/client/back/locale/client-observation/en.yml
View File

@ -1,4 +1,4 @@
name: client observation name: observation
columns: columns:
id: id id: id
clientFk: client clientFk: client

2
modules/client/back/locale/client-observation/es.yml
View File

@ -1,4 +1,4 @@
name: observación cliente name: observación
columns: columns:
id: id id: id
clientFk: cliente clientFk: cliente

2
modules/client/back/locale/client-sample/en.yml
View File

@ -1,4 +1,4 @@
name: client sample name: sample
columns: columns:
id: id id: id
created: created created: created

2
modules/client/back/locale/client-sample/es.yml
View File

@ -1,4 +1,4 @@
name: muestra cliente name: muestra
columns: columns:
id: id id: id
created: creado created: creado

7
modules/client/back/locale/client/en.yml
View File

@ -22,14 +22,14 @@ columns:
hasToInvoice: has to invoice hasToInvoice: has to invoice
isToBeMailed: mailed isToBeMailed: mailed
hasSepaVnl: sepa VNL hasSepaVnl: sepa VNL
hasLcr: lcr hasLcr: LCR
hasCoreVnl: core VNL hasCoreVnl: core VNL
hasCoreVnh: core VNH hasCoreVnh: core VNH
hasIncoterms: incoterms hasIncoterms: incoterms
isTaxDataChecked: tax data checked isTaxDataChecked: tax data checked
eypbc: eypbc eypbc: EYPBC
quality: quality quality: quality
isVies: vies isVies: VIES
isRelevant: relevant isRelevant: relevant
accountingAccount: accounting account accountingAccount: accounting account
created: created created: created
@ -51,4 +51,5 @@ columns:
isCreatedAsServed: created as served isCreatedAsServed: created as served
hasInvoiceSimplified: simplified invoice hasInvoiceSimplified: simplified invoice
typeFk: type typeFk: type
lastSalesPersonFk: last salesperson

7
modules/client/back/locale/client/es.yml
View File

@ -22,14 +22,14 @@ columns:
hasToInvoice: tiene que facturar hasToInvoice: tiene que facturar
isToBeMailed: envío por email isToBeMailed: envío por email
hasSepaVnl: sepa VNL hasSepaVnl: sepa VNL
hasLcr: lcr hasLcr: LCR
hasCoreVnl: centro VNL hasCoreVnl: centro VNL
hasCoreVnh: centro VNH hasCoreVnh: centro VNH
hasIncoterms: incoterms hasIncoterms: incoterms
isTaxDataChecked: datos fiscales comprobados isTaxDataChecked: datos fiscales comprobados
eypbc: eypbc eypbc: EYPBC
quality: calidad quality: calidad
isVies: vies isVies: VIES
isRelevant: importante isRelevant: importante
accountingAccount: cuenta contable accountingAccount: cuenta contable
created: creado created: creado
@ -51,4 +51,5 @@ columns:
isCreatedAsServed: creado como servido isCreatedAsServed: creado como servido
hasInvoiceSimplified: factura simple hasInvoiceSimplified: factura simple
typeFk: tipo typeFk: tipo
lastSalesPersonFk: último comercial

2
modules/client/back/locale/tpv-transaction/en.yml
View File

@ -1,4 +1,4 @@
name: tpv transaction name: TPV transaction
columns: columns:
id: id id: id
merchantFk: merchant merchantFk: merchant

2
modules/client/back/locale/tpv-transaction/es.yml
View File

@ -1,4 +1,4 @@
name: transacción tpv name: transacción TPV
columns: columns:
id: id id: id
merchantFk: comerciante merchantFk: comerciante

2
modules/entry/back/locale/entry-observation/en.yml
View File

@ -1,4 +1,4 @@
name: entry observation name: observation
columns: columns:
id: id id: id
description: description description: description

2
modules/entry/back/locale/entry-observation/es.yml
View File

@ -1,4 +1,4 @@
name: observación entrada name: observación
columns: columns:
id: id id: id
description: descripción description: descripción

2
modules/item/back/locale/item-barcode/en.yml
View File

@ -1,4 +1,4 @@
name: item barcode name: barcode
columns: columns:
id: id id: id
code: code code: code

2
modules/item/back/locale/item-barcode/es.yml
View File

@ -1,4 +1,4 @@
name: código barras artículo name: código barras
columns: columns:
id: id id: id
code: código code: código

2
modules/item/back/locale/item-botanical/en.yml
View File

@ -1,4 +1,4 @@
name: item botanical name: botanical
columns: columns:
itemFk: item itemFk: item
genusFk: genus genusFk: genus

2
modules/item/back/locale/item-botanical/es.yml
View File

@ -1,4 +1,4 @@
name: artículo botánico name: botánico
columns: columns:
itemFk: artículo itemFk: artículo
genusFk: género genusFk: género

2
modules/item/back/locale/item-tag/en.yml
View File

@ -1,4 +1,4 @@
name: item tag name: tag
columns: columns:
id: id id: id
value: value value: value

2
modules/item/back/locale/item-tag/es.yml
View File

@ -1,4 +1,4 @@
name: etiqueta artículo name: etiqueta
columns: columns:
id: id id: id
value: valor value: valor

2
modules/item/back/locale/item-tax-country/en.yml
View File

@ -1,4 +1,4 @@
name: item tax country name: country tax
columns: columns:
id: id id: id
effectived: effectived effectived: effectived

4
modules/item/back/locale/item-tax-country/es.yml
View File

@ -1,7 +1,7 @@
name: impuesto país del artículo name: impuesto país
columns: columns:
id: id id: id
effectived: efectivo effectived: efectivo
itemFk: artículo itemFk: artículo
countryFk: país countryFk: país
taxClassFk: clase impuestos taxClassFk: clase impuesto

4
modules/item/back/locale/item/es.yml
View File

@ -27,8 +27,8 @@ columns:
value9: valor9 value9: valor9
tag10: etiqueta10 tag10: etiqueta10
value10: valor10 value10: valor10
itemPackingTypeFk: embalaje del artículo itemPackingTypeFk: tipo embalaje
hasKgPrice: tiene precio kg hasKgPrice: precio kg
family: familia family: familia
expenseFk: gasto expenseFk: gasto
minPrice: precio mínimo minPrice: precio mínimo

8
modules/route/back/locale/route/es.yml
View File

@ -1,14 +1,14 @@
name: ruta name: ruta
columns: columns:
id: id id: id
created: creado created: creada
time: tiempo time: tiempo
kmStart: km inicio kmStart: km inicio
kmEnd: km fin kmEnd: km fin
started: comenzado started: empezada
finished: terminado finished: terminada
gestdoc: gestdoc gestdoc: gestdoc
cost: costo cost: coste
m3: m3 m3: m3
description: descripción description: descripción
isOk: ok isOk: ok

4
modules/supplier/back/locale/supplier-account/en.yml
View File

@ -1,7 +1,7 @@
name: supplier account name: account
columns: columns:
id: id id: id
iban: iban iban: IBAN
beneficiary: beneficiary beneficiary: beneficiary
supplierFk: supplier supplierFk: supplier
bankEntityFk: bank entity bankEntityFk: bank entity

4
modules/supplier/back/locale/supplier-account/es.yml
View File

@ -1,7 +1,7 @@
name: cuenta proveedor name: cuenta
columns: columns:
id: id id: id
iban: iban iban: IBAN
beneficiary: beneficiario beneficiary: beneficiario
supplierFk: proveedor supplierFk: proveedor
bankEntityFk: entidad bancaria bankEntityFk: entidad bancaria

2
modules/supplier/back/locale/supplier-contact/en.yml
View File

@ -1,4 +1,4 @@
name: supplier contact name: contact
columns: columns:
id: id id: id
supplierFk: supplier supplierFk: supplier

2
modules/supplier/back/locale/supplier-contact/es.yml
View File

@ -1,4 +1,4 @@
name: contacto proveedor name: contacto
columns: columns:
id: id id: id
supplierFk: proveedor supplierFk: proveedor

2
modules/supplier/back/locale/supplier/en.yml
View File

@ -4,7 +4,7 @@ columns:
name: name name: name
account: account account: account
countryFk: country countryFk: country
nif: nif nif: NIF
phone: phone phone: phone
retAccount: ret account retAccount: ret account
commission: commission commission: commission

2
modules/supplier/back/locale/supplier/es.yml
View File

@ -4,7 +4,7 @@ columns:
name: nombre name: nombre
account: cuenta account: cuenta
countryFk: país countryFk: país
nif: nif nif: NIF
phone: teléfono phone: teléfono
retAccount: cuenta ret retAccount: cuenta ret
commission: comisión commission: comisión

2
modules/ticket/back/locale/ticket-dms/en.yml
View File

@ -1,4 +1,4 @@
name: ticket dms name: document
columns: columns:
dmsFk: dms dmsFk: dms
ticketFk: ticket ticketFk: ticket

2
modules/ticket/back/locale/ticket-dms/es.yml
View File

@ -1,4 +1,4 @@
name: documento ticket name: documento
columns: columns:
dmsFk: dms dmsFk: dms
ticketFk: ticket ticketFk: ticket

2
modules/ticket/back/locale/ticket-observation/en.yml
View File

@ -1,4 +1,4 @@
name: ticket observation name: observation
columns: columns:
id: id id: id
description: description description: description

2
modules/ticket/back/locale/ticket-observation/es.yml
View File

@ -1,4 +1,4 @@
name: observación ticket name: observación
columns: columns:
id: id id: id
description: descripción description: descripción

2
modules/ticket/back/locale/ticket-packaging/en.yml
View File

@ -1,4 +1,4 @@
name: ticket packaging name: packaging
columns: columns:
id: id id: id
quantity: quantity quantity: quantity

2
modules/ticket/back/locale/ticket-packaging/es.yml
View File

@ -1,4 +1,4 @@
name: embalaje ticket name: embalaje
columns: columns:
id: id id: id
quantity: cantidad quantity: cantidad

2
modules/ticket/back/locale/ticket-refund/en.yml
View File

@ -1,4 +1,4 @@
name: ticket refund name: refund
columns: columns:
id: id id: id
refundTicketFk: refund ticket refundTicketFk: refund ticket

2
modules/ticket/back/locale/ticket-refund/es.yml
View File

@ -1,4 +1,4 @@
name: ticket abono name: abono
columns: columns:
id: id id: id
refundTicketFk: ticket abono refundTicketFk: ticket abono

2
modules/ticket/back/locale/ticket-request/en.yml
View File

@ -1,4 +1,4 @@
name: ticket request name: request
columns: columns:
id: id id: id
description: description description: description

2
modules/ticket/back/locale/ticket-request/es.yml
View File

@ -1,4 +1,4 @@
name: peticiones ticket name: peticion
columns: columns:
id: id id: id
description: descripción description: descripción

2
modules/ticket/back/locale/ticket-service/en.yml
View File

@ -1,4 +1,4 @@
name: ticket service name: service
columns: columns:
id: id id: id
ticketFk: ticket ticketFk: ticket

2
modules/ticket/back/locale/ticket-service/es.yml
View File

@ -1,4 +1,4 @@
name: servicios ticket name: servicio
columns: columns:
id: id id: id
ticketFk: ticket ticketFk: ticket

2
modules/ticket/back/locale/ticket-tracking/en.yml
View File

@ -1,4 +1,4 @@
name: ticket tracking name: tracking
columns: columns:
id: id id: id
created: created created: created

2
modules/ticket/back/locale/ticket-tracking/es.yml
View File

@ -1,4 +1,4 @@
name: seguimiento ticket name: seguimiento
columns: columns:
id: id id: id
created: creado created: creado

4
modules/travel/back/locale/travel-thermograph/en.yml
View File

@ -1,4 +1,4 @@
name: travel thermograph name: thermograph
columns: columns:
id: id id: id
created: created created: created
@ -6,5 +6,5 @@ columns:
result: result result: result
warehouseFk: warehouse warehouseFk: warehouse
travelFk: travel travelFk: travel
dmsFk: dms dmsFk: document
thermographFk: thermograph thermographFk: thermograph

4
modules/travel/back/locale/travel-thermograph/es.yml
View File

@ -1,4 +1,4 @@
name: travel thermograph name: termógrafo
columns: columns:
id: id id: id
created: creado created: creado
@ -6,5 +6,5 @@ columns:
result: resultado result: resultado
warehouseFk: almacén warehouseFk: almacén
travelFk: envío travelFk: envío
dmsFk: dms dmsFk: documento
thermographFk: termógrafo thermographFk: termógrafo

2
modules/worker/back/locale/worker-dms/en.yml
View File

@ -1,4 +1,4 @@
name: worker dms name: document
columns: columns:
id: id id: id
dmsFk: dms dmsFk: dms

2
modules/worker/back/locale/worker-dms/es.yml
View File

@ -1,4 +1,4 @@
name: documento trabajador name: documento
columns: columns:
id: id id: id
dmsFk: dms dmsFk: dms