Commit Graph

24066 Commits

Author SHA1 Message Date
Sergio De la torre 630e9cec1e Merge pull request 'test' (!2958) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2958
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-09-13 05:41:50 +00:00
Sergio De la torre 1ef9cc0458 Merge pull request 'master' (!2957) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2957
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-09-13 05:39:45 +00:00
Guillermo Bonet 3d598a4ec4 fix: refs #7952 Version
gitea/salix/pipeline/head Build queued... Details
2024-09-12 14:57:19 +02:00
Pako Natek bd47420e82 Merge pull request 'locallyTested' (!2956) from 7969-hasPlantTray into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2956
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-12 12:46:43 +00:00
Pako Natek a0bfc20595 revision
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 14:34:19 +02:00
Pako Natek b1027f454b locallyTested
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 14:13:17 +02:00
Alex Moreno ccfff69e90 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-12 13:26:11 +02:00
Alex Moreno 1abf6a14f9 fix: workerDms filter workerFk 2024-09-12 13:26:09 +02:00
Ivan Mas 1c1ce485b3 Merge pull request 'refactor: refs #7952 Deprecate creditInsurance.creditClassification' (!2951) from 7952-DeprecateCreditInsurance.creditClassification into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2951
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-12 11:25:16 +00:00
Ivan Mas e47dfa7f5b Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 11:21:57 +00:00
Guillermo Bonet 6b6eea78da feat: refs #7562 myt version increased to 1.6.11
gitea/salix/pipeline/head This commit looks good Details
2024-09-12 13:21:01 +02:00
Ivan Mas 4f9eb865d0 Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-12 10:27:27 +00:00
Guillermo Bonet 2f6a80a746 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-12 11:02:42 +02:00
Guillermo Bonet b6cba2325a feat: refs #7562 myt version increased to 1.6.10 2024-09-12 11:02:41 +02:00
Guillermo Bonet fcfef2a970 Merge pull request 'refactor: refs #7900 Deleted sectorProdPriority column' (!2941) from 7900-sectorProdPriority into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2941
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-12 08:21:32 +00:00
Guillermo Bonet bb97ccb6bb Merge pull request 'feat: refs #7562 Created deleteDeprecatedObjects' (!2627) from 7562-deleteDeprecatedObjects into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2627
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-09-12 08:08:16 +00:00
Alex Moreno 9435ce8c5b Merge pull request '7182-workerDms_optimization' (!2946) from 7182-workerDms_optimization into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2946
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2024-09-12 07:28:07 +00:00
Guillermo Bonet 6075ec6518 feat: refs #7562 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 09:06:03 +02:00
Guillermo Bonet f46b3122a6 Merge pull request 'refactor: refs #7895 workerDocument to workerDms' (!2953) from 7895-workerDms into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2953
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-12 05:39:41 +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
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
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
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
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
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