Commit Graph

1703 Commits

Author SHA1 Message Date
Jorge Penadés ee0c0996f6 feat: refs #7524 add e2e
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-22 12:16:26 +02:00
Alex Moreno 34c4715f6e build: refs #8062 dump db and import ticketCanAdvanceConfig
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 09:49:16 +02:00
Alex Moreno e870d16cb9 build: refs #8062 dump db
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-03 07:54:16 +02:00
Robert Ferrús e51dd897c3 Merge pull request 'master' (!3055) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #3055
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-10-02 09:13:09 +00:00
Robert Ferrús 6e4244866c feat: refs #8012 create column 2024-10-02 07:53:53 +02:00
Pablo Natek f858674c8a Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev"
gitea/salix/pipeline/pr-test This commit looks good Details
This reverts commit f6c5f41d44, reversing
changes made to 5ee5da24e1.
2024-09-27 12:01:54 +02:00
Alex Moreno ccb60eee87 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-19 12:42:12 +02:00
Guillermo Bonet 4dd70ccc69 build: dump 2438
gitea/salix/pipeline/head This commit looks good Details
2024-09-18 12:01:25 +02:00
Javier Segarra 96159224a4 Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 16:48:09 +02:00
Javi Gallego 06d06d7b1a Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2970
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-17 13:09:18 +00:00
Javier Segarra 7f6bd55eaa Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-17 13:07:25 +00:00
Javier Segarra 2e32dfddc4 perf(salix): refs #7677 #7677 restore files 2024-09-17 11:43:28 +02:00
Javier Segarra 3e5442c40b Merge branch 'dev' into 7677_vnLocation_perf 2024-09-17 11:42:04 +02:00
Pako Natek 019d855fbf fix: refs #7969 new plantTray restriction 2024-09-17 11:22:07 +02:00
Pablo Natek d308f185bc Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 08:11:17 +00:00
Guillermo Bonet 88f434435b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 08:42:34 +02:00
Guillermo Bonet 2980b2da51 fix: refs #7759 Added more grants for vn user
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 08:41:52 +02:00
Javi Gallego 06efa8be94 Merge branch 'dev' into 3505-closureTests 2024-09-17 07:12:01 +02:00
Javi Gallego e4a74ba0e9 feat: refs #3505 testBack closure 2024-09-16 13:24:33 +02:00
Guillermo Bonet 5c7a537275 feat: refs #7912 Added new waste types
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 12:32:52 +02:00
Pablo Natek 8f4f2d2d15 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 09:06:04 +02:00
Pablo Natek cc1cd0563f feat: refs #7404 fixtures and translates
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 09:00:46 +02:00
Ivan Mas dc5691fce7 Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 11:49:28 +00:00
Javier Segarra 0d47d58b71 Merge branch '7677_vnLocation_perf' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-13 09:45:09 +02:00
Jon Elias d36ce6bf99 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 05:43:17 +00:00
Guillermo Bonet 728c40916c refactor: refs #7895 workerDocument to workerDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 14:38:58 +02:00
Jon Elias b3aa263cea Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 07:32:11 +02:00
Jorge Penadés b277ae2d92 Merge branch 'dev' into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 12:01:18 +00:00
Guillermo Bonet a718b6e81f Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 13:52:10 +02:00
Jorge Penadés af929c1ee9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:45:35 +02:00
Jorge Penadés 2df9bb9bdb Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 08:42:53 +00:00
Jorge Penadés 0a7a9e2cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:29:44 +02:00
Ivan Mas 900e840eec Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 07:43:06 +00:00
Jorge Penadés 78a851336f chore: refs #7323 worker changes wip
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 09:11:20 +02:00
Guillermo Bonet 1b8583a19d feat: refs #7759 Revoke routine grants vn
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 08:50:50 +02:00
Guillermo Bonet 72024fb854 fix: refs #7759 Added user 'vn'@'localhost' & grants
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 06:12:48 +02:00
Jorge Penadés cff5bef54b fix: refs #7524 add fixture orm config
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 15:47:45 +02:00
Jorge Penadés 4869322476 Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-05 09:57:26 +00:00
Javi Gallego 40a1b24403 Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2904
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 09:07:24 +00:00
Jorge Penadés 03d711b694 chore: refs #7524 add select limit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 09:12:52 +02:00
Carlos Satorres b66386fdb1 Merge pull request 'refs #7407 create models' (!2603) from 7407-workerMedical into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2603
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-04 13:07:50 +00:00
Guillermo Bonet fbfbcf9bd4 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 09:02:57 +02:00
Guillermo Bonet a8cc3f496f build: refs #7897 dump 24.36
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-04 09:02:38 +02:00
Javier Segarra d54361a0bc Merge branch 'dev' into 7277-RefundInvoices
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 13:38:03 +00:00
Jon Elias 26876fd0a6 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 14:35:59 +02:00
Ivan Mas d330529bf2 feat: refs #7819 Delete obsolete objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 12:33:26 +02:00
Pablo Natek e20ef7c699 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-03 07:50:41 +02:00
Carlos Satorres 28a34fa5af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 14:07:01 +02:00
Guillermo Bonet 9d35cbfae4 Merge branch 'dev' into 7650-triggerInv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 07:31:04 +02:00
Javi Gallego 51535bfa6b feat: refs #7277 refundInvoices 2024-08-30 13:50:51 +02:00