Commit Graph

16743 Commits

Author SHA1 Message Date
Pablo Natek 16af0c5d6c Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 16:02:30 +00:00
Pablo Natek 203e80afa8 refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 17:56:45 +02:00
Pablo Natek f0fec2cdd6 refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 17:46:21 +02:00
Pablo Natek f6cc59eafb refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 16:23:36 +02:00
Carlos Satorres beb173f6ce refs #5334 quit e2e no necesario
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 15:20:28 +02:00
Vicent Llopis d9b1f4b8a1 refs #5688 fix: test e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 15:06:27 +02:00
Carlos Satorres 137e01e60c refs #5334 fix acl, filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 15:00:59 +02:00
Pablo Natek 27946c0062 Refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 15:00:15 +02:00
Carlos Satorres cce837686d Merge pull request 'refs #5728 remove add, quit e2e' (!1598) from 5728-bugEntry/buy into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1598
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-22 12:53:06 +00:00
Vicent Llopis d272121258 refs 5688 fix: e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 14:52:42 +02:00
Carlos Satorres 757360f3d1 Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 12:46:36 +00:00
Carlos Satorres 4931745cde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-22 14:42:28 +02:00
Alex Moreno 344ba298f8 refs #5832 232801 init
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 14:27:33 +02:00
Carlos Andrés d4dceac74c Merge pull request '5772-reduceInvoicePdfSize' (!1632) from 5772-reduceInvoicePdfSize into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1632
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-06-22 11:45:50 +00:00
Vicent Llopis 389b53ceff refs #5772 fix: back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 13:37:43 +02:00
Vicent Llopis d26778e94e refs #5688 fix: e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 13:30:53 +02:00
Carlos Andrés 12aa9c6b4b Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 13:23:03 +02:00
Carlos Andrés b7cd32f4ce refs #5772 eliminar tags en report invoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 13:18:16 +02:00
Vicent Llopis 2d21da1faa Merge pull request '5528-entry.latest-buys_fixEditBuys' (!1611) from 5528-entry.latest-buys_fixEditBuys into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1611
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-06-22 10:53:57 +00:00
Vicent Llopis 591fc14ffa refs #5772 refactor: movido codigo para enviar rocket al back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 12:48:50 +02:00
Carlos Satorres 7f9d8da7a7 refs #5836 defaulter
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 11:42:21 +02:00
Vicent Llopis 9d1a181b73 refs #5772 feat: si falla al enviar el pdf, envia un rocket al comercial
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 11:10:56 +02:00
Alex Moreno 207dcacf0f Merge pull request 'refs #5339 data' (!1623) from 5339_instance_vs_data into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1623
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-22 08:06:05 +00:00
Vicent Llopis d8fe284bcd Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 07:53:11 +00:00
Vicent Llopis 5f4b62f133 refs #5688 fix: test front
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 09:48:14 +02:00
Alex Moreno 18a8106461 refs #5339 fix after save
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 08:56:27 +02:00
Carlos Andrés 807596f735 refs #5772
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 08:50:18 +02:00
Carlos Satorres a173cb47f0 Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 06:43:04 +00:00
Vicent Llopis 473b218da1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 08:04:17 +02:00
Carlos Andrés 10a25ff590 refs #5772
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 07:49:35 +02:00
Alex Moreno aea32492e3 Merge branch 'master' into 5339_instance_vs_data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 05:33:34 +00:00
Vicent Llopis ddaed3318d Merge pull request 'fix: acl renewToken' (!1631) from fix_aclRenewToken into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1631
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-21 12:39:24 +00:00
Alex Moreno 6ab431f8ef refs #5475 tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 14:17:25 +02:00
Vicent Llopis d9afdccd9c fix: acl renewToken
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 14:12:42 +02:00
Carlos Satorres 168d05a830 refs #5334 fix errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 13:07:04 +02:00
Carlos Satorres bb10b831ef Merge pull request 'refs #5537 change cl c' (!1627) from 5537-refactorFootnotes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1627
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-06-21 11:04:02 +00:00
Carlos Satorres 9ef12d129b Merge branch 'dev' into 5537-refactorFootnotes
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 10:57:03 +00:00
Juan Ferrer dfdd3a1733 Merge branch '5772-reduceInvoicePdfSize' of https://gitea.verdnatura.es/verdnatura/salix into 5772-reduceInvoicePdfSize
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 11:08:29 +02:00
Juan Ferrer 44192c0606 refs #5667 Client translations added 2023-06-21 11:08:28 +02:00
Carlos Andrés 6f9fd9bb72 refs #5772 mensajes de error
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 09:40:14 +02:00
Alex Moreno 38de19f044 Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 06:44:13 +00:00
Alex Moreno 2ddf8e5de6 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 06:24:19 +00:00
Alex Moreno d6c504d3bb 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-21 07:53:40 +02:00
Pablo Natek e741904250 refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 17:01:06 +02:00
Alex Moreno a8fafacb82 refs #5475 send email force
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 15:06:02 +02:00
Vicent Llopis 56917fbfc4 Merge pull request '5468-account_privileges' (!1552) from 5468-account_privileges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1552
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-20 12:48:34 +00:00
Vicent Llopis f37974c835 Merge branch 'dev' into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 12:39:27 +00:00
Vicent Llopis 3462e49d23 Merge pull request '5554-renovar_token' (!1566) from 5554-renovar_token into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1566
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-20 12:38:46 +00:00
Vicent Llopis 556bdb52ce Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 12:18:46 +00:00
Robert Ferrús 004bfdbe1e Merge pull request '5112-entryUpdateComission' (!1621) from 5112-entryUpdateComission into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1621
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-20 12:18:26 +00:00