Commit Graph

26950 Commits

Author SHA1 Message Date
Javi Gallego 6f5a966c55 refactor: refs #7764 add role assignment for supplier during user creation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-21 10:32:14 +01:00
Javier Segarra e3000e7988 Merge branch 'dev' into 8612-shelvinge2e
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 20:41:58 +00:00
Ivan Mas 348cda6054 Merge branch 'dev' into 8613-addFkClaimDestinationFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 18:18:00 +00:00
Ivan Mas 723eaed19b refactor: refs #8613 add fk to claimEnd.claimDestinationFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 18:33:14 +01:00
Juan Ferrer c74714a825 ci(db): refs #6695 Allow 0.0.0.0
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 17:20:04 +00:00
Javi Gallego 5eb981165e refactor: refs #7937 improve transaction handling in report_print procedure and enhance claimEnd filter
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 15:02:19 +01:00
PAU ROVIRA ROSALENY 69e63fd6d0 Merge branch 'dev' into 8612-shelvinge2e
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 12:00:51 +00:00
PAU ROVIRA ROSALENY 9f391bba27 fix: refs #8612 changed translations
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 13:00:00 +01:00
Javi Gallego 25ad28d019 Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 11:21:43 +01:00
Javi Gallego e18e51aa92 refactor: refs #7937 improve error handling and transaction management in report_print procedure 2025-02-20 11:20:47 +01:00
Guillermo Bonet 009eae44ef refactor: refs #7759 Update SQL permissions for 'vn' user to include DROP and clarify comments
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 08:57:00 +01:00
Guillermo Bonet 59f243136d refactor: refs #7759 deprecate unused columns and tables in user and vn schemas
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 08:48:49 +01:00
Guillermo Bonet bf83c9b460 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 07:49:51 +01:00
Guillermo Bonet c254f31da2 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 07:49:39 +01:00
Guillermo Bonet f414ababb2 fix: refs #8227 Added localPalletM3
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 07:29:38 +01:00
Carlos Satorres 1bf8acafa0 Merge pull request 'fix: fix operator' (!3460) from fix-workerSection2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3460
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-19 15:27:28 +00:00
Carlos Satorres 4c0169aba3 Merge branch 'dev' into fix-workerSection2
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-19 15:19:56 +00:00
PAU ROVIRA ROSALENY 60a70ab770 Merge branch 'dev' into 8612-shelvinge2e
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-19 11:54:21 +00:00
PAU ROVIRA ROSALENY ff3268b6e9 fix: refs #8612 handled duplicate code error in shelving & parking 2025-02-19 12:53:29 +01:00
Javi Gallego 9e64e4224a Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-19 12:52:27 +01:00
Javi Gallego ed61d6488d feat: refs #7937 add shelvingFk to claimEnd table and update related models and queries 2025-02-19 12:52:06 +01:00
Ivan Mas b42f5885bf Merge pull request 'feat: refs #8558 modify claim_beforeInsert' (!3463) from 8558-futureTicketsClaims into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3463
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-02-19 11:31:53 +00:00
Ivan Mas c61ea07b6a Merge branch 'dev' into 8558-futureTicketsClaims
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-19 11:30:08 +00:00
Carlos Andrés b8a216444c Actualizar db/routines/cache/procedures/available_refresh.sql
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:11:27 +00:00
Alex Moreno 728e6e921a build: init version
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:38:46 +01:00
Alex Moreno f316349ac2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:38:21 +01:00
Alex Moreno 7ec29d1972 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:38:10 +01:00
Alex Moreno 40492d6489 Merge pull request '8627-devToTest' (!3474) from 8627-devToTest into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3474
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-02-18 12:33:29 +00:00
Javi Gallego 26af667727 Merge branch 'dev' into 7937-claimAgile 2025-02-18 12:53:53 +01:00
Javi Gallego fd53142bff fix: refs #7937 update claimDestination and regularizeClaim methods for address handling 2025-02-18 12:53:43 +01:00
Jon Elias 0f0504e590 Merge pull request '#8555: Added new filter field' (!3434) from 8555-AddNewField into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3434
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-18 11:46:12 +00:00
Jon Elias 6118154ef9 Merge branch 'dev' into 8555-AddNewField
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 11:44:01 +00:00
Jon Elias 5a1c826f15 Merge pull request '#8606: Show correct text of duplicate entry error' (!3461) from 8606-FixZoneModule into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3461
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-18 11:29:46 +00:00
Jon Elias 16bb716abd Merge branch 'dev' into 8606-FixZoneModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 10:36:49 +00:00
Alex Moreno dc989cb075 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8627-devToTest
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-18 10:35:00 +01:00
Jorge Penadés e29e5e28ed Merge pull request 'fix: refs #8388 update booking status in toUnbook method' (!3462) from 8388-fixUnbook into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3462
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-18 09:31:22 +00:00
Alex Moreno 2386874a96 fix: refs #8627 add claim in getSales
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-18 10:28:00 +01:00
Javi Gallego d974942ca3 Merge branch 'dev' into 7937-claimAgile 2025-02-18 10:17:32 +01:00
Alex Moreno 06c123d7f2 fix: refs #8627 ticket isTaxDataChecked 2025-02-18 10:15:28 +01:00
Alex Moreno a8c03548d9 fix: refs #8627 update stateFk assignment to use code instead of id
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-18 09:51:08 +01:00
Carlos Andrés 5488a229c1 Merge pull request 'fix: priceOptimum error' (!3471) from PriceOptimum-error into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3471
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-18 08:50:27 +00:00
Alex Moreno 664ba03425 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 09:26:30 +01:00
Alex Moreno dd8ca1eed2 Merge pull request 'build: refs #8622 dump db' (!3473) from 8622-dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3473
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-02-18 08:26:18 +00:00
Javi Gallego 0b7bcd9e33 Merge branch 'dev' into 7937-claimAgile 2025-02-18 09:19:02 +01:00
Alex Moreno 08b4d0a4fa build: refs #8622 dump db
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-18 09:16:31 +01:00
Alex Moreno f83055057e fix: expeditionTruck use editorFk
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 09:14:08 +01:00
Alex Moreno ca8bc43262 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 08:53:24 +01:00
Alex Moreno 61df9a0f79 Merge pull request '8622-testToMaster' (!3470) from 8622-testToMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3470
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-02-18 07:52:22 +00:00
Alex Moreno 669b7cd67f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 08:45:19 +01:00
Alex Moreno 6e4667a563 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-18 08:45:11 +01:00