Commit Graph

24936 Commits

Author SHA1 Message Date
Jon Elias a73bdfe18f Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule 2024-09-12 07:36:55 +02:00
Javier Segarra 504e2f0ed2 Merge branch 'dev' into 7956-itemGetSimilar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 17:42:05 +00:00
Ivan Mas 0feb44e404 refactor: refs #7923 Delete Logiflora functions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 15:07:37 +02:00
Carlos Satorres 757cd78cfc fix: refs #7354 fix files
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 14:42:21 +02: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
Sergio De la torre 99761c97e8 Merge pull request '6861-availableReserve' (!2952) from 6861-availableReserve into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2952
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-11 12:38:14 +00:00
Guillermo Bonet 956058c10c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 14:19:51 +02:00
Guillermo Bonet 8518351790 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 14:19:37 +02:00
Jon Elias eab0a7d914 Merge branch 'master' into Hotfix-BalanceDialog
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 12:19:13 +00:00
Guillermo Bonet 889f3bdab4 fix: refs #7213 risk F11
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 14:12:07 +02:00
Sergio De la torre 7e06c2ab37 fix: available refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 13:57:03 +02:00
Carlos Satorres f696c4043d Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix into 7354_ZoneMigration_End
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 13:47:30 +02:00
Ivan Mas d15be5100d refactor: refs #7952 Deprecate creditInsurance.creditClassification
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 13:42:04 +02:00
Jon Elias e5161fe9e2 fix: fixed balanceDialog amount field
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 13:26:40 +02:00
Sergio De la torre db7d5c5e52 fix: available refs #6861
gitea/salix/pipeline/pr-master Build queued... Details
2024-09-11 13:18:09 +02:00
Guillermo Bonet 6b5f59a09b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 12:54:27 +02:00
Guillermo Bonet 4c6aba96e5 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 12:54:16 +02:00
Guillermo Bonet 479fc02245 Merge pull request 'feat: refs #6727 Added util logClean' (!2602) from 6727-logClean into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2602
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-09-11 10:48:02 +00:00
Sergio De la torre 87182abf7e fix: available refs #6861
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-11 12:47:51 +02:00
Guillermo Bonet 07f7f87c28 Merge pull request 'fix: refs #7213 change rounding problems' (!2943) from 7213-changeRoundingProblem into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2943
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-11 10:32:59 +00:00
Guillermo Bonet 011c16180d fix: refs #7213 buyUltimate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 12:31:16 +02:00
Javier Segarra ace4e6975d Merge pull request 'refs #6156 new field' (!1718) from 6156-advanceTicketsNewField into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1718
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-11 10:27:05 +00:00
Guillermo Bonet 2a41fc6fc4 Merge branch 'dev' into 6727-logClean
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 09:25:52 +00:00
Javi Gallego 10f7583587 feat: refs #7956 sin AS
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-11 11:22:22 +02:00
Sergio De la torre 037e3fab23 Merge pull request 'fix: debugAdd refs #6861' (!2944) from 6861_debugAdd_hotFix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2944
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-11 09:02:18 +00:00
Alex Moreno 17fecf6dcb Merge branch '7182-workerDms_optimization' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 10:31:44 +02:00
Alex Moreno c21da8d258 fix: refs #7182 function name 2024-09-11 10:31:43 +02:00
Alex Moreno e062088f1e Merge branch 'dev' into 7182-workerDms_optimization
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:29:38 +00:00
Pablo Natek 842c98edfc Merge branch 'dev' into 6156-advanceTicketsNewField
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:22:24 +00:00
Pablo Natek 92f305b9fd fix: refs #6156 proc and version 2024-09-11 10:19:55 +02:00
Carlos Andrés ad8f27ea81 fix: refs #7213 change rounding problems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 10:15:37 +02:00
Jorge Penadés d699d9f60c Merge pull request '#7663 setWeight' (!2817) from 7663-setWeight into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2817
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-11 07:40:31 +00:00
Jorge Penadés 2ee0c93e24 chore: refs #7663 fix test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 09:35:26 +02:00
Jorge Penadés 249646236a Merge branch '7663-setWeight' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-11 09:30:31 +02:00
Jorge Penadés 558ab6eba2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight 2024-09-11 09:30:18 +02:00
Carlos Satorres 6c8c617837 Merge pull request 'fix: setDeleted' (!2947) from hotfix7960-setDeleted into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2947
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-11 06:51:54 +00:00
Carlos Satorres 838b8f541f fix: setDeleted
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 08:45:00 +02:00
Carlos Satorres ccaf56f842 fix: setDeleted
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 08:35:19 +02:00
Alex Moreno a65506aebd Merge branch 'dev' into 7663-setWeight
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-11 06:35:01 +00:00
Javier Segarra 0aadb6d70f Merge pull request '#5938 - fine_ticketAdvance' (!2940) from 5938_fine_ticketAdvance into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2940
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-11 06:29:34 +00:00
Alex Moreno 63866a34da Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 06:21:31 +00:00
Alex Moreno fbfbf21e06 fix: refs #7182 unnesesary file
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:17:18 +02:00
Alex Moreno 8dc83e2444 feat: refs #7182 optimize workerDms filter 2024-09-11 08:16:21 +02:00
Javi Gallego ed8cf628a5 feat: refs #7956 tabulaciones
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:15:32 +02:00
Javi Gallego 6ae15a8e64 feat: refs #7956 definer 2024-09-11 08:13:28 +02:00
Javi Gallego 56e6a7e6aa feat: refs #7956 parametro daysInForward 2024-09-11 08:10:21 +02:00
Alex Moreno e7d3062208 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization 2024-09-11 08:07:29 +02:00
Sergio De la torre b492a1e6a8 feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:05:26 +02:00
Sergio De la torre f7f7df55f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin 2024-09-11 08:00:07 +02:00
Pablo Natek 8607a60ca7 feat: refs #7404 format date before select
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-11 07:56:08 +02:00