 Carlos Satorres
|
6294fc0435
|
refs #5297 back&e2e fix changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 10:02:02 +02:00 |
|
Carlos Satorres
|
af1f92613f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 13:57:11 +02:00 |
 Vicent Llopis
|
3b7b31deb1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 08:31:52 +02:00 |
 Alex Moreno
|
6f503e2a81
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-05-23 08:23:16 +02:00 |
 Juan Ferrer
|
26c2ab867d
|
Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1546
|
2023-05-22 17:04:32 +00:00 |
 Alexandre Riera
|
e8376c00a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 14:43:20 +02:00 |
|
Alex Moreno
|
6ddbd8b8ea
|
Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 11:43:25 +00:00 |
|
Juan Ferrer
|
f55e5f9f74
|
refs #5667 Business translations
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 11:52:13 +02:00 |
|
Juan Ferrer
|
fa40bd9811
|
refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 10:18:41 +02:00 |
|
Juan Ferrer
|
d8eeacb371
|
refs #5667 Translation improved
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-16 20:24:04 +02:00 |
|
Juan Ferrer
|
30d6f56c39
|
refs #5667 Style fixes, model translations
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-16 20:06:14 +02:00 |
|
Alex Moreno
|
08fcbebbaf
|
refs #5488 polish specifics acls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-15 14:14:08 +02:00 |
|
Carlos Satorres
|
598067f757
|
refs #5334 routes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-15 13:15:33 +02:00 |
|
Alex Moreno
|
0aa12a5efb
|
hotFix(worker_new): use postcode not postalCode
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-15 09:54:40 +02:00 |
 Pablo Natek
|
8419c76b12
|
refs #5153 worker sin tr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-12 12:51:07 +02:00 |
|
Pablo Natek
|
65082be077
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-12 08:28:19 +02:00 |
|
Alexandre Riera
|
ded8e0e141
|
refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-10 13:22:53 +02:00 |
|
Vicent Llopis
|
62dd64eb89
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 11:56:50 +02:00 |
|
Carlos Satorres
|
2c6f71b4c4
|
Merge branch 'dev'
|
2023-05-08 10:16:57 +02:00 |
|
Alex Moreno
|
456e1d5912
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-05-05 14:11:47 +02:00 |
|
Carlos Satorres
|
06c01f3e94
|
Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-28 13:02:10 +00:00 |
|
Alex Moreno
|
ac55dc4cc7
|
refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-28 14:17:19 +02:00 |
|
Alex Moreno
|
e00edf0266
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required
|
2023-04-28 12:06:45 +02:00 |
|
Alex Moreno
|
42e3c8f29d
|
refs #5488 fix(): use hasWriteRole
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-28 09:35:15 +02:00 |
|
Alex Moreno
|
c62f8e1c14
|
refs #5297 feat(worker): iban and bankEntity not required
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 12:13:14 +02:00 |
|
Vicent Llopis
|
d6ff61b768
|
refs #5468 corregidas condiciones de autorización
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 09:48:02 +02:00 |
|
Alex Moreno
|
af0523a155
|
refs #5468 descriptor account solo lo puede ejecutar sysadmin y mail-forwarding solo el mismo o un superior
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 15:17:45 +02:00 |
|
Pablo Natek
|
e8ce8e42fd
|
refs #5153
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 14:25:22 +02:00 |
|
Alex Moreno
|
28ead70615
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 14:17:46 +02:00 |
|
Alex Moreno
|
0c668c6ade
|
refs #5488 feat(): replace all hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 14:17:36 +02:00 |
|
Juan Ferrer
|
49368a837b
|
refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 19:10:04 +02:00 |
|
Juan Ferrer
|
081b4af6d6
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-24 10:44:42 +02:00 |
|
Carlos Satorres
|
67db2f0476
|
Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 06:51:41 +00:00 |
|
Carlos Satorres
|
cd4f66e292
|
refs #5540 arreglar e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 08:48:35 +02:00 |
|
Juan Ferrer
|
6f1744baff
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-20 16:30:24 +02:00 |
|
Alex Moreno
|
c1d4281b1b
|
refs #5488 replace hasWriteRole, hasReadRole
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-19 13:59:26 +02:00 |
|
Vicent Llopis
|
be8a11cafc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 09:52:28 +02:00 |
|
Juan Ferrer
|
add3a8b1fa
|
merge with dev
|
2023-04-15 01:49:23 +02:00 |
|
Vicent Llopis
|
3790e3457f
|
refs #5517 añadidas más traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 08:43:42 +02:00 |
|
Vicent Llopis
|
2a2d03e05a
|
refs #5517 añadidas traducciones de algunos modelos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-12 15:02:21 +02:00 |
|
Alexandre Riera
|
0666163ca0
|
refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-12 12:33:14 +02:00 |
|
Vicent Llopis
|
58750aa065
|
refs #5318 eliminido triggers y añadido loggable en salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-12 10:02:06 +02:00 |
 Joan Sanchez
|
5732f9a33b
|
Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-11 07:07:55 +00:00 |
|
Vicent Llopis
|
8a297469d6
|
refs #4856 añadido myOptions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-06 10:06:29 +02:00 |
|
Vicent Llopis
|
041590e541
|
refs #4856 maneja errores y notifica a los jefes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-06 08:54:12 +02:00 |
|
Vicent Llopis
|
a44a640d15
|
refs #4856 manejo errores
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-05 15:14:42 +02:00 |
|
Vicent Llopis
|
0db3bc5e26
|
refs #4856 fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-04 09:29:51 +02:00 |
|
Vicent Llopis
|
21b7050cfd
|
refs #4856 otros usuarios pueden actualizar el estado
|
2023-04-04 09:29:40 +02:00 |
|
Vicent Llopis
|
862101c4b0
|
refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-03 21:29:02 +02:00 |
|
Joan Sanchez
|
8b4c70e8ba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-30 14:57:00 +02:00 |
|
Vicent Llopis
|
e1bfdc3f3c
|
eliminada variable que no se usa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-30 11:13:40 +02:00 |
|
Carlos Satorres
|
4edb2463b8
|
refs #5250 eliminacion isEnabled
|
2023-03-30 08:23:53 +02:00 |
|
Vicent Llopis
|
5a67f47305
|
refs #4856 fix: actualizar estado a 'SENDED' movido al back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-30 08:14:17 +02:00 |
|
Vicent Llopis
|
d066c4ea0b
|
refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-29 11:27:48 +02:00 |
|
Carlos Satorres
|
564165dc0f
|
refs #5250 Self.validatesPresenceOf
|
2023-03-28 10:07:14 +02:00 |
|
Carlos Satorres
|
c68c78cc5b
|
refs #5250 solucion error WorkerObserv
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-24 12:11:42 +01:00 |
 Robert Ferrús
|
1d697e1ac5
|
refs #4357 add operator model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-17 08:46:01 +01:00 |
|
Vicent Llopis
|
165dc73b33
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-08 12:22:29 +01:00 |
|
Vicent Llopis
|
79023fbfaf
|
feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-08 12:16:53 +01:00 |
|
Vicent Llopis
|
0396d3707c
|
refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-08 11:47:10 +01:00 |
|
Joan Sanchez
|
9050c06994
|
Updated unit test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-08 07:44:56 +01:00 |
|
Joan Sanchez
|
3ad96b6ad7
|
Endpoint fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-07 11:55:13 +01:00 |
|
Joan Sanchez
|
37043beb68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-03 07:44:31 +01:00 |
|
Vicent Llopis
|
3051768781
|
WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 14:50:23 +01:00 |
|
Vicent Llopis
|
bc542d8a40
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 14:11:12 +01:00 |
|
Alexandre Riera
|
96e103d76e
|
refs #5287 sections sorted
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 08:37:17 +01:00 |
|
Alexandre Riera
|
94901d5b1f
|
refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-28 07:49:34 +01:00 |
|
Alexandre Riera
|
5d9220c5c0
|
refs #5287 locker added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-27 08:39:46 +01:00 |
|
Vicent Llopis
|
475bc2c255
|
feat: solo puede dar conforme/no confome el propio usuario
|
2023-02-23 14:33:16 +01:00 |
|
Vicent Llopis
|
05d91ed50e
|
feat: actualizada interfaz
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-22 15:12:25 +01:00 |
|
Joan Sanchez
|
e34d64361b
|
Account refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-31 14:57:24 +01:00 |
|
Alex Moreno
|
a74fb31b5b
|
fix: vn.time
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 15:15:27 +01:00 |
|
Alex Moreno
|
0a096bc96f
|
fix: updateWorkCenter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-25 15:29:01 +01:00 |
|
Joan Sanchez
|
f0b44a2992
|
Updated back unit tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-24 10:35:21 +01:00 |
|
Joan Sanchez
|
3076123c04
|
Updated models relation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-24 09:05:50 +01:00 |
|
Joan Sanchez
|
ee1ce21bb9
|
refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-23 15:24:00 +01:00 |
|
Alex Moreno
|
fe656aa125
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-01-23 14:10:20 +01:00 |
|
Alex Moreno
|
8a844917ce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-01-23 08:07:14 +01:00 |
|
Alex Moreno
|
a674169ddb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-20 08:30:30 +01:00 |
|
Vicent Llopis
|
921b5cf3fb
|
add excluded test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-19 08:54:36 +01:00 |
|
Vicent Llopis
|
92a9004d98
|
fix: borrada propiedad transaction cuando se hace commit
|
2023-01-19 08:54:26 +01:00 |
|
Vicent Llopis
|
38e4349e17
|
borrado comentario
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-18 14:25:24 +01:00 |
|
Vicent Llopis
|
2c995208d1
|
fix: transaccionado por trabajador y día
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-18 14:23:05 +01:00 |
|
Vicent Llopis
|
7368b572a0
|
fix: añadidos await y actualizado condicional permissionRate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-18 13:05:02 +01:00 |
|
Alex Moreno
|
e27a559416
|
refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-16 15:18:24 +01:00 |
|
Alex Moreno
|
ecfad94057
|
refactor(worker_new): remove roleFk and profileType
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-16 12:19:03 +01:00 |
|
Vicent Llopis
|
4b60aacbbe
|
refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-12 08:50:03 +01:00 |
|
Alex Moreno
|
9c044dc95b
|
fix: phone
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-04 09:38:43 +01:00 |
|
Alex Moreno
|
29483bcc1b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2023-01-03 12:28:55 +01:00 |
|
Alexandre Riera
|
9887f87dd3
|
refs #5051 pending added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-03 08:34:46 +01:00 |
|
Alex Moreno
|
aa5cfde1ae
|
test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-02 14:52:03 +01:00 |
|
Alexandre Riera
|
96f2e4b542
|
refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-02 13:35:33 +01:00 |
|
Alex Moreno
|
2c5e42d408
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-28 11:49:16 +01:00 |
|
Alex Moreno
|
156f2b9129
|
feat: handle errors and autogenerate user and code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 15:03:55 +01:00 |
|
Alex Moreno
|
bb944f9fee
|
feat(newWorker): use worker-welcome
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 15:05:49 +01:00 |
|
Alex Moreno
|
09edb99a1b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-12-12 13:48:06 +01:00 |
|
Alex Moreno
|
4cb8d8c763
|
test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 13:11:45 +01:00 |
|
Joan Sanchez
|
990dd88e2c
|
Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1186
|
2022-11-29 13:08:38 +00:00 |
|
Joan Sanchez
|
5f3e7c3384
|
Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 11:49:06 +00:00 |
|
Vicent Llopis
|
e3e337c02e
|
fix: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-28 14:28:47 +01:00 |