Commit Graph

18710 Commits

Author SHA1 Message Date
Carlos Satorres 6cf2c38927 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 06:59:04 +00:00
Vicent Llopis e43e0a8f9f Merge pull request '5609-ticket.index_searchByFilter' (!1554) from 5609-ticket.index_searchByFilter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1554
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-05-24 06:39:46 +00:00
Carlos Satorres bb39724718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required 2023-05-24 08:09:44 +02:00
Carlos Satorres e46caffe96 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 06:05:44 +00:00
Alex Moreno a1bd051112 Merge branch 'dev' into salix-node20
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:52:49 +00:00
Vicent Llopis 3caef0c135 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 07:46:08 +02:00
Vicent Llopis 1ddad7a5ec Merge branch 'dev' into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:45:04 +00:00
Alex Moreno 6a6d28efa0 Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:40:11 +00:00
Vicent Llopis 68c33efd9a refs #5609 fix: front test
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 07:33:01 +02:00
Alexandre Riera b2f4c02b95 Merge pull request 'fixes #5581 ticket.sale transferir lineas' (!1549) from 5581-transferir-lineas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1549
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-24 05:17:26 +00:00
Alexandre Riera 97653d9b8f Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:07:33 +00:00
Alex Moreno c35e2e155f refs #5472 test(changePassword): back
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 15:12:28 +02:00
Vicent Llopis 3119ae4471 refs #5609 delete: console.log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 15:12:20 +02:00
Vicent Llopis 2c7473b064 refs #5252 feat: permite crear un abono con o sin almacén
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 15:06:38 +02:00
Carlos Satorres 0dda7791f6 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:51:10 +00:00
Carlos Satorres 31b22b759d refs #5639 fix e2e selectors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 14:50:16 +02:00
Alex Moreno eba945c297 Merge branch 'salix-node20' of https://gitea.verdnatura.es/verdnatura/salix into salix-node20
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 14:43:16 +02:00
Alex Moreno fe8ad91514 fix node 20 2023-05-23 14:43:15 +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 0ab411ddc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 13:45:03 +02:00
Vicent Llopis c9b4c68b0c refs #5468 refactor: actualizada vista
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:41:13 +02:00
Vicent Llopis 91207c5a3c refs #5468 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:33:27 +02:00
Carlos Satorres 2d06f42493 refs #5639 defaulterView
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:33:06 +02:00
Alex Moreno f0b3177e21 Merge branch 'dev' into salix-node20
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:32:03 +00:00
Alex Moreno 9a5511f083 REFACTOR(node_version)! update to v20
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:31:09 +02:00
Carlos Satorres 4f5bd95d21 refs #5639 order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:23:46 +02:00
Vicent Llopis 0702e4ef43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:08:19 +02:00
Vicent Llopis b7e3e9fa71 refs #5468 feat: add testBack
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:08:10 +02:00
Vicent Llopis db55c3e81b refs #5468 fix: fornt test
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:49:34 +02:00
Vicent Llopis 191fe4ebf6 refs #5468 feat: añadidas comprobaciones acls en el back en 'Alias de correo'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 12:40:49 +02:00
Carlos Satorres e2bea16e68 refs #5639 select country, paymethod
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:31:02 +02:00
Vicent Llopis 940ed29dfc refs #5468 feat: comprobacion de acl en el back en 'Reenvío de correo'
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:21:35 +02:00
Carlos Satorres db7d3b6868 refs #5639 payMethodFk
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:32:26 +02:00
Carlos Satorres 7fd2927ec9 refs #5639 smart-table country
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:26:31 +02:00
Vicent Llopis 96163cb07f refs #5468 feat: update acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 10:43:46 +02:00
Carlos Satorres 766d809523 Merge pull request 'refs #5599 remove returns' (!1511) from 5599-ticketColors into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1511
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-23 08:23:55 +00:00
Vicent Llopis cd244daf84 refs #5468 feat: checkbox 'activo' marcado por defecto
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 10:04:31 +02:00
Vicent Llopis 6135a8f576 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-05-23 10:03:40 +02:00
Vicent Llopis 4bed88faf5 refs #5468 fix: e2e test
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:44:07 +02:00
Carlos Satorres 84abba5566 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:38:01 +00:00
Alex Moreno 64fbd5d2c7 Merge pull request 'refs #5579 fix(route_index): order' (!1551) from 5579-fix-order into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1551
2023-05-23 07:28:21 +00:00
Alexandre Riera 73c2ae9fdc refs #5581 changelog
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:17:37 +02:00
Alex Moreno 9500e99b86 Merge branch 'dev' into 5579-fix-order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:17:25 +00:00
Alex Moreno 53e55de605 refs #5579 fix(route_index): order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:15:31 +02:00
Carlos Satorres d7d94796d6 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:13:47 +00:00
Vicent Llopis 9426ff204f refs #5468 fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:12:27 +02:00
Carlos Satorres 0c673e43bc refs #5639 smart-tabla defaulter
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:02:05 +02:00
Carlos Satorres ec1a203430 Merge pull request 'refs #5648 create vn-confirm' (!1508) from 5648-sureClaim into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1508
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-23 07:00:13 +00:00
Vicent Llopis aea39dd0b7 refs #5468 feat: modificalos acl de VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 08:45:03 +02:00
Alexandre Riera bf8d82f3c6 refs #5581 refresh model
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 08:43:31 +02:00