Commit Graph

17729 Commits

Author SHA1 Message Date
Vicent Llopis 011db142d3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 12:49:55 +02:00
Vicent Llopis 1093d29fb6 Merge pull request 'test_hotfix_renewToken' (!1645) from test_hotfix_renewToken into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1645
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-29 10:47:46 +00:00
Vicent Llopis 79823605f6 refs #5554 fix: no te tira al hacer F5
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 12:15:32 +02:00
Vicent Llopis 3bd890c343 refs #5554 fix: solo llama al back cuando se tiene q renovar
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 12:11:16 +02:00
Pablo Natek be1c145d9a refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 10:41:41 +02:00
Carlos Satorres dc73dc2cb4 Merge branch 'dev' into 5640-mayusFiscalDate
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 08:39:34 +00:00
Carlos Andrés 1d993c74e5 refs #5590 fix total invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 10:39:07 +02:00
Carlos Satorres bb4951bbc8 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 07:47:41 +00:00
Carlos Satorres 9dc52b6011 refs #5334 fix labels trad
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 09:44:21 +02:00
Carlos Satorres 454cf30de7 refs #4764 boton save
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 08:27:20 +02:00
Pablo Natek 89b63f47fc Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 08:14:10 +02:00
Pablo Natek c9c20711b9 refs #5347 2023-06-29 08:13:44 +02:00
Pablo Natek bbc5ed2683 Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 05:22:06 +00:00
Alex Moreno 840a88bdc1 refs #5833 remove console.logs
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 07:14:45 +02:00
Carlos Satorres 319c6af354 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-29 06:37:23 +02:00
Juan Ferrer d200a1a695 refs #5900 CSS fixes
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 16:08:12 +02:00
Juan Ferrer 12481b5f3d refs #5900 CSS fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 16:07:24 +02:00
Vicent Llopis 33e1d9e3f2 Merge pull request '5774-ticket.lines_evitarCantidadNegativa' (!1597) from 5774-ticket.lines_evitarCantidadNegativa into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1597
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-28 12:51:44 +00:00
Vicent Llopis c5660a21a1 Merge branch 'dev' into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 12:41:26 +00:00
Vicent Llopis a6fba97b7d Merge pull request '5808-client.credit-management' (!1640) from 5808-client.credit-management into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1640
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-28 12:35:08 +00:00
Vicent Llopis e3e0c7e97a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:31:54 +02:00
Alex Moreno befa385830 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 14:30:20 +02:00
Alex Moreno 8723cf2958 refs #5753 fix legacy bugs
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:10:21 +02:00
Pablo Natek 54e75dc850 Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 14:07:38 +02:00
Pablo Natek 6e52b3b968 refs #5347 2023-06-28 14:07:37 +02:00
Vicent Llopis 3128601027 Merge branch 'dev' into 5808-client.credit-management
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 11:47:39 +00:00
Vicent Llopis 65e5c95c07 Merge pull request '5688-worker.calendar_workCenter' (!1580) from 5688-worker.calendar_workCenter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1580
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-28 11:38:49 +00:00
Vicent Llopis 6894da7e22 refs #5688 fix: front test
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 13:27:18 +02:00
Alex Moreno da50ea1dd0 Merge branch 'dev' into 5688-worker.calendar_workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 11:10:51 +00:00
Vicent Llopis 783d4c60c4 refs #4734 delete module handlebars from package.json
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 13:02:47 +02:00
Carlos Satorres b19c15bd68 refs #5660 rol fix and inherits rol
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 12:28:25 +02:00
Carlos Satorres f02019d64d refs #5334 fix words
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 11:52:53 +02:00
Carlos Satorres 3bea23c52a refs #5660 delivery acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 11:30:45 +02:00
Carlos Satorres 39f8212529 refs #5660 fixtures acls 2023-06-28 11:30:22 +02:00
Alex Moreno 89c25c07b6 refs #5475 fix e2e and back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 09:59:55 +02:00
Juan Ferrer c5d2e87cb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 09:09:38 +02:00
Juan Ferrer a67cd5ba64 refs #5900 User avatar with sticky position 2023-06-28 09:09:36 +02:00
Carlos Satorres d32563eec7 refs #5660 delivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 08:37:30 +02:00
Carlos Satorres 68b65105fd refs #5660 role mod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 08:02:31 +02:00
Alex Moreno 9b0cf7f378 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-28 07:20:12 +02:00
Alex Moreno 31d637c8a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 07:19:04 +02:00
Alex Moreno 162faf0d01 Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-28 07:18:10 +02:00
Carlos Satorres 06437c9e80 refs #5334 remove other
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 07:02:59 +02:00
Alex Moreno 4b8b7a9d82 refs #5475 fix accessScope
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 15:30:54 +02:00
Alex Moreno f8a972c2f2 refs #5094 fix translation
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 14:48:22 +02:00
Alex Moreno 0a0d16bfea Merge branch 'dev' into 5640-mayusFiscalDate
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 11:51:11 +00:00
Alex Moreno fe53abb24f Merge pull request 'fix warn' (!1641) from warnFix_travel_summary_entry into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1641
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-27 11:49:29 +00:00
Carlos Satorres 07712f58e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-27 13:36:51 +02:00
Carlos Satorres eaf3f5e3ea refs #5660 change sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 13:17:00 +02:00
Carlos Satorres a930963ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-06-27 12:34:37 +02:00