Commit Graph

20450 Commits

Author SHA1 Message Date
Guillermo Bonet 158ed9b55c refs #6232 Regularized config tables
gitea/salix/pipeline/pr-dev Build queued... Details
2024-03-15 11:49:33 +01:00
Guillermo Bonet 336d5f0fba Merge branch 'dev' into 6232-refactorConfigTables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-15 10:48:42 +00:00
Jorge Penadés c1018d465a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 11:01:59 +01:00
Guillermo Bonet ea054eafd5 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-15 10:56:11 +01:00
Guillermo Bonet aa27eb1922 refs #6948 Fix error
gitea/salix/pipeline/head This commit looks good Details
2024-03-15 10:55:39 +01:00
Jon Elias 67c572f187 fixed dropped test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 10:48:24 +01:00
Jorge Penadés 5341818473 Merge pull request '#6744 fix worker setPassword' (!2027) from 6744-fixWorkerSetPassword into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2027
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-03-15 09:48:13 +00:00
Jorge Penadés a38f93b0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-15 10:44:37 +01:00
Jorge Penadés 6281ba352b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 10:38:08 +01:00
Jorge Penadés 690d935429 refactor: refs #6951 cloneAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 10:00:24 +01:00
Carlos Satorres 779c075102 Merge pull request 'refs #6842 sql mod sage' (!2050) from 6842-sageMod into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2050
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-15 08:45:05 +00:00
Carlos Satorres 1c523d8d22 Merge branch 'dev' into 6842-sageMod
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 08:43:41 +00:00
Javier Segarra 275e53f79c Merge pull request '#6930 - Use ScopedToken when share Multimedia files' (!2094) from 6930_scopedToken_Multimedia into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2094
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-03-15 08:28:05 +00:00
Javier Segarra 6989299593 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 08:26:45 +00:00
Carlos Andrés 160d72e755 hotfix upload invoiceIn_add.sql error
gitea/salix/pipeline/head This commit looks good Details
2024-03-14 17:02:07 +01:00
Jon Elias c6f7a8bdb0 refactor: #6556 drop useless test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 15:49:36 +01:00
Jon Elias 82001d8352 Merge branch 'dev' into 6556-ChangeImages
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 14:11:06 +00:00
Jon Elias d8a5bf8c84 style: #6556 set default user image, set users image
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 15:04:35 +01:00
Javier Segarra a7faf4e325 refs #6930 perf: logout update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 13:05:39 +00:00
Alex Moreno 9c76a5d196 Merge pull request '6960-restricciones-AWB' (!2167) from 6960-restricciones-AWB into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2167
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-14 10:55:06 +00:00
Carlos Andrés 3999533707 Merge branch 'test' into 6960-restricciones-AWB
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-14 11:33:14 +01:00
Carlos Andrés 1e29b6c1ed merge test
gitea/salix/pipeline/pr-master There was a failure building this commit Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-03-14 11:30:07 +01:00
Guillermo Bonet 184a3a3c7a refs #6395 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 10:05:25 +01:00
Guillermo Bonet 166b74c70d Merge branch 'dev' into 6395-buyBuyerFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 08:59:22 +00:00
Carlos Satorres 7e37a2b376 Merge pull request '6755-restoreRefactor' (!2158) from 6755-restoreRefactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2158
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-14 08:56:09 +00:00
Carlos Satorres 1457884252 Merge branch 'dev' into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 08:54:06 +00:00
Carlos Satorres dd7c700130 refs #6755 fix test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:53:50 +01:00
Guillermo Bonet fbeb9b058d hotfix: itemProposal added optimizer_search_depth
gitea/salix/pipeline/head This commit looks good Details
2024-03-14 09:34:37 +01:00
Guillermo Bonet ad7b7be661 refs #6875 Fix version
gitea/salix/pipeline/head This commit looks good Details
2024-03-14 09:15:19 +01:00
Alex Moreno 4ad562a4da fix: refs #6925 transalation
gitea/salix/pipeline/head Build queued... Details
2024-03-14 09:12:19 +01:00
Alex Moreno fbfc3eaa75 Merge pull request 'fix: refs #6925 refund invoice transaltions' (!2155) from 6925-fix_translations into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2155
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-14 08:10:29 +00:00
Guillermo Bonet 08359cdfe0 Merge pull request 'refactor: refs #6875 Add restriction on vn.buy.packing field not null and > 0' (!2047) from 6875-packingNotNull into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2047
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-14 08:05:11 +00:00
Alex Moreno 974c95b961 Merge branch 'dev' into 6925-fix_translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 08:00:29 +00:00
Alex Moreno a13299d66a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-14 08:40:26 +01:00
Alex Moreno a00e363fd5 refs #7033 deploy: init version 2414 2024-03-14 08:40:25 +01:00
Alex Moreno cb299617cf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-14 08:38:52 +01:00
Alex Moreno 0b459f4726 Merge pull request 'refs #7033 deploy(2412): dev to test' (!2166) from 7033-devToTest_2412 into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2166
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-03-14 07:37:54 +00:00
Alex Moreno 0ad052c34a refs #7033 deploy(2412): dev to test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-14 08:36:19 +01:00
Carlos Satorres e7d5d59fa6 Merge pull request 'refs #6913 routeKm' (!2156) from 6913-routeKm into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2156
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-14 07:33:57 +00:00
Carlos Satorres 24c1ab541d Merge branch 'dev' into 6913-routeKm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 07:31:31 +00:00
Carlos Satorres 7895f12e3d Merge branch 'dev' into 6842-sageMod
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 07:28:12 +00:00
Alex Moreno 977181f156 Merge branch 'dev' into 6925-fix_translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 07:27:16 +00:00
Carlos Satorres 2d8f5f5f50 Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 08:26:52 +01:00
Carlos Satorres e24eed16c1 refs #6842 fix companyCode 2024-03-14 08:26:50 +01:00
Alex Moreno 346557ed69 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-03-14 08:20:15 +01:00
Guillermo Bonet b4b6b47a9c hotfix: itemProposal added transaction
gitea/salix/pipeline/head This commit looks good Details
2024-03-14 07:53:24 +01:00
Guillermo Bonet 4b83d416b2 Merge pull request 'refactor: refs #7018 Mirated procs to vn' (!2157) from 7018-procMigration into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2157
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-14 06:03:32 +00:00
Sergio De la torre 1a2bda7e18 Merge pull request '6078_workerActivty' (!2130) from 6078_workerActivty into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2130
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-14 05:58:13 +00:00
Carlos Satorres 33bd21d40b refs #6755 fix model
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 16:29:05 +01:00
Javier Segarra f18e90d6f3 Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 14:45:12 +00:00