Commit Graph

25353 Commits

Author SHA1 Message Date
Guillermo Bonet 1cbba0b52f Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-17 08:42:02 +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
Jon Elias 1d47690bb4 feat: refs #7884 added new filter field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 08:31:58 +02:00
Pablo Natek 9896ac2361 fix: refs #7760 remove throw on ticket split
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-17 08:21:29 +02:00
Javi Gallego e5e14878b8 feat: refs #3505 remove return
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 07:57:00 +02:00
Alex Moreno fa0c8689d4 Merge pull request '7983-testToMaster_2438' (!2977) from 7983-testToMaster_2438 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2977
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-17 05:36:45 +00:00
Javi Gallego 361d60a8a8 Merge pull request 'feat: refs #7956 itemGetSimilar' (!2945) from 7956-itemGetSimilar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2945
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-17 05:28:48 +00:00
Javi Gallego 06efa8be94 Merge branch 'dev' into 3505-closureTests 2024-09-17 07:12:01 +02:00
Jorge Penadés 4d0bb81632 fix: refs #7323 worker/filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 16:33:22 +02:00
Alex Moreno 3011421526 fix: refs #7983 correct version
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 15:19:46 +02:00
Alex Moreno d46be39786 chore: refs #7983 changelog 2024-09-16 15:19:21 +02:00
Carlos Andrés faf963ba52 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 15:11:51 +02:00
Carlos Andrés 1d42f58c39 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-16 15:09:34 +02:00
Carlos Andrés 2e03fe8193 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:41:29 +02:00
Alex Moreno cabc9660d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:27:08 +02:00
Alex Moreno 8803ae0534 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:25:27 +02:00
Sergio De la torre 0e81114696 Merge pull request 'fix: refs #6861 itemShelvingSale debug' (!2969) from 6861-itemShelvingSaleReserve into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2969
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-16 12:21:22 +00:00
Sergio De la torre 9d50b228f6 Merge pull request '7760-tmp.ticketIPT' (!2973) from 7760-tmp.ticketIPT into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2973
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-09-16 12:21:08 +00:00
Carlos Andrés 33540063f4 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-16 14:17:51 +02:00
Carlos Andrés e7343b7e25 fix: refs #7760 tmp.ticketIPT 2024-09-16 14:16:48 +02:00
Robert Ferrús 10fcbffd37 feat: refs #7964 entry_beforeUpdate not
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 13:37:35 +02:00
Guillermo Bonet 51da7ae063 feat: refs #7893 Created waste_addSalesLauncher
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 13:33:53 +02:00
Jorge Penadés 8fedfbd090 fix: refs #7524 getAmountPaid wip
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 13:32:14 +02:00
Javi Gallego f43fa32d36 feat: refs #3505 fdescribe
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 13:26:53 +02:00
Javi Gallego e4a74ba0e9 feat: refs #3505 testBack closure 2024-09-16 13:24:33 +02:00
Jon Elias 3aebe88593 Merge branch 'dev' into 6346-WagonToCard
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 11:04:27 +00:00
Robert Ferrús e361b789f4 Merge branch 'dev' into 7964-entry_getCommission
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 11:03:08 +00:00
Sergio De la torre c33740e36e fix: refs #6861 itemShelvingSale debug
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 13:00:20 +02:00
Guillermo Bonet a84817f5e3 Merge pull request 'feat: refs #7912 Added new waste types' (!2967) from 7912-wasteChanges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2967
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-16 11:00:15 +00:00
Jon Elias 9aff118b6e feat: refs #6346 added script for wagons
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 13:00:11 +02:00
Guillermo Bonet 0d7953a869 Merge branch 'dev' into 7912-wasteChanges
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:33:23 +00: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
Robert Ferrús bdef639f78 Merge branch 'dev' into 7964-entry_getCommission
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:29:26 +00:00
Jorge Penadés f1a8e206b5 Merge pull request '#7828 makeCorrectCalls' (!2955) from 7828-makeCorrectCalls into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2955
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-16 10:26:49 +00:00
Robert Ferrús 7540526b9b feat: refs #7964 entry_beforeUpdate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 12:26:29 +02:00
Jorge Penadés 0a0701f7c2 Merge branch 'dev' into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:24:36 +00:00
Pablo Natek e62e7fd798 Merge branch '7404-stockBuyed' of https://gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 12:17:52 +02:00
Pablo Natek 1f1da689d4 fix: refs #7404 remove console log 2024-09-16 12:17:51 +02:00
Pablo Natek 88962b051f Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:13:13 +00:00
Pablo Natek 138640f991 fix: refs #7404 update test to match new fixtures for travel by continent
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 12:05:36 +02:00
Guillermo Bonet 51cabd06a4 refactor: refs #7562 Deleted deprecated objects
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 10:44:04 +02:00
Guillermo Bonet 738a390ef7 refactor: refs #7886 Deleted proc buy_getVolumeByAgency
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:08:23 +02:00
Carlos Satorres 392012ef60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 09:28:45 +02:00
Guillermo Bonet d7e7647b52 Merge branch 'dev' into 7817-isChecked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 09:17:20 +02:00
Javi Gallego be95162d1a Merge pull request 'feat: refs #7977 muestra las facturas sin vencimientos tambien' (!2964) from 7977-supplierStatement into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2964
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-16 07:10:46 +00: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
Javi Gallego d7679fcb50 feat: refs #7977 muestra las facturas sin vencimientos tambien
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 09:01:47 +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
Pako Natek eb098b41ba Merge pull request 'fix: refs #7969 no agency restriction removed' (!2963) from 7969-hotFixplantTray3 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2963
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-09-16 06:41:37 +00:00
Pako Natek f3988fd3a9 Merge branch 'master' into 7969-hotFixplantTray3
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 06:40:03 +00:00