Commit Graph

301 Commits

Author SHA1 Message Date
Carlos Satorres f9360e2453 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4774-translationsVn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-22 10:39:47 +02:00
Carlos Satorres 417305bf82 fix: refs #4774 translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-22 10:38:18 +02:00
Javi Gallego da772cf504 Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3114
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-21 06:29:17 +00:00
Ivan Mas 7dc35458e8 refactor: refs #7865 delete client.gestdocFk from TPV
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-17 17:05:08 +02:00
Javi Gallego 4a88ba5078 feat: refs #7744 closeAll Test 2024-10-15 15:43:12 +02:00
Jorge Penadés 295c31a5f0 feat: refs #7874 add finance obs type
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-10 11:01:25 +02:00
Jorge Penadés 70a2189e30 Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-04 07:46:18 +00:00
Jorge Penadés 23d2d2b1ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 15:39:37 +02:00
Pablo Natek 46e2ffd6c2 fix: refs #7404 add fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 14:39:58 +02:00
Robert Ferrús 47ed9a8f4e Merge pull request 'test' (!3056) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3056
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-10-02 09:22:26 +00: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
Javi Gallego 4c9a199418 Merge branch 'dev' into 9722-travelThermographTrigger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 12:29:55 +02:00
Alex Moreno f54a9a1348 fix(fixtures): revert bad merge master to test
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 12:27:16 +02:00
Alex Moreno 61f806b0c9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-30 14:40:35 +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
Javi Gallego c825191823 feat: refs #9722 fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-26 15:22:40 +02:00
Javi Gallego 6ce4ff1311 Merge branch 'dev' into 6722-thermograph
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-25 13:31:12 +02:00
Javi Gallego 9ef44d8d8d feat: refs #6722 refactor createThermograph 2024-09-25 13:23:31 +02:00
Jorge Penadés 0f8db9ee7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-24 14:38:58 +02:00
Jorge Penadés c6a3004d12 feat: refs #7207 allocate new queue on dept change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-24 10:15:01 +02:00
Jorge Penadés 6ff76fd74b feat: refs #7207 show queue in worker summary
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 14:40:38 +02:00
Pablo Natek ab89c8f3ba Merge branch 'dev' into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 08:16:16 +00:00
Pablo Natek fb1e77f9c4 fix: refs #7404 fix back data source 2024-09-20 11:06:38 +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
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 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
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
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
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 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
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