5517-improveLogs+translations #1439

Merged

juan merged 18 commits from 5517-improveLogs+translations into dev 2023-04-28 09:35:39 +00:00

Conversation 0 Commits 18 Files Changed 142 +2305 -445

vicent commented 2023-04-13 09:46:08 +00:00

Contributor

Copy Link

No description provided.

vicent added the

Missing tests

label 2023-04-13 09:46:08 +00:00

vicent added 10 commits 2023-04-13 09:46:10 +00:00

5b80951e3e refs #5517 vnLog: View improved

12074bd0f4 refs #5517 vnLog: watchers fixes

7f18366ece refs #5517 Relative dates, style fixes

ae22c58ecb refs #5517 JSON value component code clean, max str len increased

3cc6191696 refs #5517 Show abr month name in relative date

f7191f0f7f refs #5517 log relativeDate function fixes

d7d4b9515e refs #5517 json value and date format fixes

2a2d03e05a refs #5517 añadidas traducciones de algunos modelos

3790e3457f refs #5517 añadidas más traducciones

2ada64e1bf refs #5517 eliminadas traducciones duplicadas

vicent requested review from juan 2023-04-13 09:46:24 +00:00

juan added 217 commits 2023-04-20 17:47:27 +00:00

ee1ce21bb9 refactor(account): account model refactor

89eb065f6d Updated models

3076123c04 Updated models relation

0208b31f44 Naming rollback

3456438485 Model fix

f0b44a2992 Updated back unit tests

70cc83b8bf Enable vanity user URLs

388af5110f Updated unit test

12cf79ab39 Updated e2e

0a0cca0585 Set client bcrypt password

9bf4cd5cff Merge branch 'dev' into 4480-vnUser

e34d64361b Account refactor

644d98ec1c syncUser() and setPassword() changes

7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

eded1ebf20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

d773837740 Removed user model

37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

f2bd0253e2 refs #5092 added unbilled tickets section

4e800a7a45 .

b828d40464 Merge branch 'dev' into 5092-listado-ticketsSinFacturar

955e55a7f4 refs #5284 new onCreateClaimAccepted y createClaim

23a15ee15c Merge branch 'dev' into 5092-listado-ticketsSinFacturar

8499ae5243 Merge branch 'dev' into 5284-fueraPlazo

b1d5a2ba1a Merge branch 'dev' into 5092-listado-ticketsSinFacturar

c4d6a19666 refs #5092 download as csv button

efcf224962 Merge branch 'dev' into 5092-listado-ticketsSinFacturar

8a4d9bd2bf refs #5211

eee4c815e7 Merge branch 'dev' into 5092-listado-ticketsSinFacturar

38bf49c0b6 refs #5410 fix: se mantenien los checkbox marcados al paginar

4209efd7e1 Merge branch 'dev' into 5284-fueraPlazo

0b4a6874d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar

c46e15c8e4 refs #5092 changed section name

3f356335db refs #5092 added popovers

bc47fc35d6 refs #5410 feat: añadido filtro a las columnas created y defaulterSinced

5794ae5130 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked

98916bf5e1 refs #5410 add changelog

a94e47e622 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar

61a0d8bcb2 refs #5092 showing clients with multiple negative bases

306573b1bf refs #5439 campos fecha y salesperson

1bc3103d9f refs #5439 filtro comercial

41c79263c4 refs #5410 feat: envia email cuando se añade una nota

700151b500 refs #5092 amount <> 0

bf38098e5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked

1b1bca28bd refs #5410 add frontTest

fde854f5c2 refs #5250 campo de notes

3fd1e7a086 refs #5439 se elimina el filtro de fecha añadido

79c42384ee refs #5439 role actualizado

a17016a1d8 refs #5439 arreglo getUserConfig

36af9d45e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-newFilterEnPeticionesDeCompra

fa78649607 refs #5439 url filter

6c75853ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked

f689d35100 refs #5410 fix test

c68c78cc5b refs #5250 solucion error WorkerObserv

b199ca4a6e Merge branch 'dev' into 5250-observacionesWorker

0c8fe855ac refs #5418 lateral search panel added, missing e2e

188e592d28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price

1603cddb96 refs #5418 e2e implemented and fixed

87d0dc3cec refs #5092 changed name to negative bases

05caf0c6d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar

06ac8f9910 refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas

564165dc0f refs #5250 Self.validatesPresenceOf

809c24f6cf Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker

fb1b39da17 refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto

b4e04fcdad refs #5275 feat: colorear fechas

c53c54b6cd refs #5275 feat: modificar masivamente

3b615d9879 refs #5275 fix: actualiza correctamete los elementos del checkedDummy

d066c4ea0b refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'

5a67f47305 refs #4856 fix: actualizar estado a 'SENDED' movido al back

4edb2463b8 refs #5250 eliminacion isEnabled

60383eda0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker

e1bfdc3f3c eliminada variable que no se usa

67689695e4 refs #5275 filtra por defecto por el this.vnConfig.warehouseFk

8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

9944e9a645 Merge branch 'dev' into 5250-observacionesWorker

02a1bcbfd3 fix(setPassword): proper access type ...

Refs #5471

f4ff869c4d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

862101c4b0 refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador

d1100384bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2

24f576a4b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar

32df51ecca refs #5092 moved sql

98f61ecfdb refs #5092 changelog

25df36eec9 Merge pull request 'fixes #5092 Listado tickets sin facturar' (!1368) from 5092-listado-ticketsSinFacturar into dev ...

Reviewed-on: #1368
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

21b7050cfd refs #4856 otros usuarios pueden actualizar el estado

0db3bc5e26 refs #4856 fix test

1a14c793cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price

ecbfdad102 refs #5418 changelog

0bfa4c54aa fix: inserta en workerTimeControlMail

9380b88460 refs #5437 back and test deprecated

c89f95a33e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked

e8f0a49f0c fix(resetPassword): increased token TTL for password recovery ...

Refs #5474

b49307463e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

b6cfab26d4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

c126c6044a Updated format

3630c7d398 refs #5410 creada ruta de back para enviar emails

7a274e2721 Merge branch 'dev' into 5410-client.defaulter_getChecked

35d19e586a add translatiojn

14f966ab9a Merge branch 'master' into hotfix_sendMail_insertsIntoWorkerTimeControlMail

eed1ecc208 refs #4954 trigger modified

81cf35f2d3 refs #5259 drop procedure invoiceOut_afterInsert

0372d44415 fixes #5529 Fixes: missing awaits, buffer-to-file

d464818ddb Merge pull request 'hotfix_sendMail_insertsIntoWorkerTimeControlMail' (!1419) from hotfix_sendMail_insertsIntoWorkerTimeControlMail into master ...

Reviewed-on: #1419
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

e342852ed8 Merge branch 'master' into 5529-invoicingFixes

d0c94b985d Merge pull request 'fixes #5529 Fixes: missing awaits, buffer-to-file' (!1422) from 5529-invoicingFixes into master ...

Reviewed-on: #1422
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

589e996b69 refs #5259 minor fix

8f4de7e7e9 refs #5259 undo delete, update trigger

28a12d0706 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor

e97b5a9f80 refs #5275 fix backTest

77b91b77b2 refs #5439 requesterFk solve

ca30aaa18a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix

fb5969a120 refs #5275 add test

7d3c6a98f3 refs #5439 search panel solve

8741a9f913 Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra

3450e7ffdf refs #5275 fix test e2e

7e42bd1116 refs #5379 referencia a vn2008 quitada

44d4df9c21 Merge branch 'dev' into 5211-cleanItemShelvings

de31d98e2e refs #5275 fix test e2e

6a0bca1a94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2

a44a640d15 refs #4856 manejo errores

c823a0d6f1 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk

1e01f26d76 refs #5211 empty commit

6fc2867551 permite decimales

936d66f8b8 Merge pull request 'hotfix_kmPrice_addDecimals' (!1427) from hotfix_kmPrice_addDecimals into master ...

Reviewed-on: #1427
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

041590e541 refs #4856 maneja errores y notifica a los jefes

033927d5b4 Merge pull request '5410-client.defaulter_getChecked' (!1403) from 5410-client.defaulter_getChecked into dev ...

Reviewed-on: #1403
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

a8af280de5 Merge pull request '5439-newFilterEnPeticionesDeCompra' (!1406) from 5439-newFilterEnPeticionesDeCompra into dev ...

Reviewed-on: #1406
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

b71ad207ff Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev ...

Reviewed-on: #1420
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

5cbc826281 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk

213766afdf Merge pull request 'fixes #5259 Envío de factura electrónica en clientes sin el check "Factura electrónica"' (!1423) from 5259-invoice-electronic-without-check into dev ...

Reviewed-on: #1423
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

68a24b7335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker

f307f79dc2 refs #5250 cambio a ult version de changes

30761781fa Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker

05912610f8 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk

8a297469d6 refs #4856 añadido myOptions

d9ae24c927 Merge branch 'dev' into 4856-worker.time-control_2

49300b6f19 Merge pull request 'fixes #4954 cliente datos comprobados' (!1421) from 4954-client-isTaxDataChecked-businessTypeFk into dev ...

Reviewed-on: #1421
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

b3f946e15f Merge branch 'dev' into 5250-observacionesWorker

ba31613ac9 Merge branch 'dev' into 5275-item.fixed-price_refactor

5e6cccbf57 Merge pull request '5275-item.fixed-price_refactor' (!1426) from 5275-item.fixed-price_refactor into dev ...

Reviewed-on: #1426
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

fe0d861dc0 Merge pull request '4856-worker.time-control_2' (!1418) from 4856-worker.time-control_2 into dev ...

Reviewed-on: #1418
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

5732f9a33b Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev ...

Reviewed-on: #1407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert

53bd6cd729 Merge branch 'dev' into 5522-loggable-deadlock

161fc25c5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price

ec03c6edfa fix intermittent backTest

5ab2913c39 Merge pull request 'fix intermittent backTest' (!1431) from fix_backTest into dev ...

Reviewed-on: #1431
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

abaeeddc21 refs #5418 fix e2e

d5d18d5376 hotfix apply SQL delivery.sql

0d4c2db0ac Merge pull request 'hotfix apply SQL delivery.sql' (!1433) from hotfix-moveSQL-minorVersion-delivery into master ...

Reviewed-on: #1433
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

c6db5f1a4b hotfix apply changes procedure

3ee08e0300 changed folder

a4126eca56 Merge pull request 'hotfix-apply-changes-procedure' (!1434) from hotfix-apply-changes-procedure into master ...

Reviewed-on: #1434
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

ccf26c5413 Merge branch 'dev' into 5211-cleanItemShelvings

736d0375f6 Merge pull request 'refs #5211' (!1385) from 5211-cleanItemShelvings into dev ...

Reviewed-on: #1385
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

245b0e70f4 hotfix rollback delivery.sql

32c5ced55b Merge pull request 'hotfix rollback delivery.sql' (!1435) from hotfix-rollback-delivery into master ...

Reviewed-on: #1435

0666163ca0 refs #5546 deleted log property, fixed back tests

ef6e85532e refs #5213 cambios e2e, descriptor

eed57c9b4e refs #5546 removed log tests

7e1d6f4339 Merge branch 'dev' into 5522-loggable-deadlock

520d5ab55c Merge branch 'dev' into 5379-quitar-referencia-vn2008

847d0f6c43 Merge pull request 'fixes #5522 Loggable - Deadlock en inserción múltiple' (!1430) from 5522-loggable-deadlock into dev ...

Reviewed-on: #1430
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

534a58409f Merge branch 'dev' into 5379-quitar-referencia-vn2008

eb1798100f Added version 23.16

40333a2ff4 Merge branch 'dev' into 5379-quitar-referencia-vn2008

44eab101cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo

71e202d586 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro

15d7139bc5 Merge branch '5284-fueraPlazo' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo

f4491cb263 Merge pull request 'fixes #5379 Dejar de hacer referencia a vn2008 en salix' (!1425) from 5379-quitar-referencia-vn2008 into dev ...

Reviewed-on: #1425
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

86a67eb0c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price

41f9ec63ff refs #5418 changelog

05ceba65d6 refs #5418 changelog

90268a79b0 refs #5284 test createClaim

ac4772e44e refs #5418 mistake doing git pull origin dev

6d5167ab7f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

7a02a3213a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

025c158b27 refs #5418 minor fixes

a2ddbd8a66 refs #5284 test update

8ade602563 hotfix one sign for every ticket

b4ef49cf24 Merge branch 'dev' into 5546-codigo-registro

ecac5fffd4 Merge pull request 'fixes #5546 Actualizar código de registro de histórico de los modelos' (!1436) from 5546-codigo-registro into dev ...

Reviewed-on: #1436
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

b9b52c6b1d Merge branch 'dev' into 5418-buscador-lateral-fixed-price

35f94c58b7 reafactor(image): upload image using gm library

6e7b452792 Max quality

ad3836552e refs #5518 sections added

add3a8b1fa merge with dev

2af48b3049 refs #4480 Fix: VnUser before save hook removed -> setting password attribute

ca3a1be20f refs #4480 md5 removed from VnUser

f4e696675d Merge pull request 'reafactor(image): upload image using gm library' (!1445) from 5558-image_refactor into master ...

Reviewed-on: #1445
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

c5dcfd3cab refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing

9e4c261a87 Merge pull request 'hotfix saveSign one sign for every ticket' (!1440) from hotfix-saveSign-oneSignForEveryTicket into test ...

Reviewed-on: #1440
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

51e42e485b Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev ...

Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

02c573bd23 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

f53ebb7641 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

610f51aaf8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

f97d169cbf observationEmail

2675c02d13 refs #5518 moved models to account

7d8a0597c1 Merge branch 'dev' into 5518-log-user-role

6144c24a44 fix(ticket_edit): fix e2e

b5434c5e4e tab

6a0a08be95 typo

06a845e7f0 Cambios SQL

2a8383f9cc Merge pull request 'fix e2e' (!1450) from fix_e2e into dev

6d593a0937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2

d6fb05cc93 Merge pull request 'refs #5213 cambios e2e, descriptor' (!1437) from 5213-minorBugs2 into dev ...

Reviewed-on: #1437
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

6fd5c8ae2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

fded7d062b section fix

28a7722bb6 Merge branch 'dev' into 5518-log-user-role

e8e373d924 Merge pull request 'fixes #5518 Crear secciones de histórico para usuarios y roles' (!1446) from 5518-log-user-role into dev ...

Reviewed-on: #1446
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

2df362327f Merge branch 'dev' into 5418-buscador-lateral-fixed-price

11b905138f Merge pull request 'fixes #5418 Buscador lateral en item/fixed-price' (!1412) from 5418-buscador-lateral-fixed-price into dev ...

Reviewed-on: #1412
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

a0d8ed1433 E2e fixes

32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

e0a8daf2f8 Merge pull request '4480-vnUser - Replaced model Account in favor of VnUser' (!1267) from 4480-vnUser into dev ...

Reviewed-on: #1267

6f2aa0f618 Worker note ACL

6f1744baff Merge branch 'dev' into 5517-improveLogs+translations

9694a35343 refs #5517 Added: Tests, filter panel, model and props titles

juan removed the

Missing tests

label 2023-04-20 17:50:10 +00:00

juan added 2 commits 2023-04-24 11:00:07 +00:00

081b4af6d6 Merge branch 'dev' into 5517-improveLogs+translations

a053764122 refs #5517 E2E fixes

juan added 1 commit 2023-04-24 17:10:15 +00:00

49368a837b refs #5517 Filter improved

juan added 2 commits 2023-04-27 16:13:40 +00:00

6e3e2cf798 refs #5517 Filter RC

2cfd2d9dda Merge branch 'dev' into 5517-improveLogs+translations

juan added 1 commit 2023-04-28 09:27:13 +00:00

4982fb254c refs #5517 Final style fixes, production ready

juan approved these changes 2023-04-28 09:35:18 +00:00

juan merged commit 14170286d7 into dev 2023-04-28 09:35:39 +00:00

juan referenced this issue from a commit 2023-04-28 09:35:39 +00:00

Merge pull request '5517-improveLogs+translations' (!1439) from 5517-improveLogs+translations into dev

Sign in to join this conversation.

Reviewers

No reviewers

juan

Labels

Clear labels   

CR / Tests passed

Unit tests and e2e passed

  

e2e

Implement e2e

  

Missing tests

Missing tests

  

Needs refactor

  

Simple

Simple check / No CR needed

No Label

CR / Tests passed

e2e

Missing tests

Needs refactor

Simple

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1439

No description provided.