Commit Graph

24936 Commits

Author SHA1 Message Date
Jorge Penadés cfbc3692e9 feat: refs #7874 clientObservationType
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-13 11:59:28 +02:00
Sergio De la torre 11193bebe6 Merge pull request '6868_createLogin' (!2598) from 6868_createLogin into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2598
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-13 09:43:31 +00:00
Jon Elias 4ba8565006 Merge branch 'dev' into Hotfix-WagonSQL
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-13 09:31:09 +00:00
Jon Elias f1f0f5920c fix: refs #6346 fixed SQL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 11:29:05 +02:00
Ivan Mas 8fce0d969b Merge pull request 'refactor: refs #7923 Delete Logiflora functions' (!2954) from 7923-DeleteLogifloraFunctions into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2954
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-13 08:53:48 +00:00
Ivan Mas d7336b93df Merge branch 'dev' into 7923-DeleteLogifloraFunctions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 08:49:11 +00:00
Javier Segarra 0d47d58b71 Merge branch '7677_vnLocation_perf' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-13 09:45:09 +02:00
Javier Segarra 6f18b8a719 Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 07:28:45 +00:00
Jorge Penadés 2dc55a706c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 09:20:57 +02:00
Alex Moreno bbb3889154 fix: sql wagonTypeTray
gitea/salix/pipeline/head This commit looks good Details
2024-09-13 08:54:03 +02:00
Alex Moreno ebbc143152 fix: sql wagonTypeTray
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-13 08:29:41 +02:00
Jon Elias 67b901e573 Merge pull request '#6346 new WagonType section' (!2778) from 6346-FixWagonModule into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2778
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-13 06:16:08 +00:00
Jon Elias 99bd20bc05 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 06:13:26 +00:00
Jon Elias f15df1ef66 Merge pull request 'Hotfix: fixed balance create amount field' (!2950) from Hotfix-BalanceDialog into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2950
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-13 06:06:37 +00:00
Jon Elias fb7bf5b4eb Merge branch 'master' into Hotfix-BalanceDialog
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-13 06:05:17 +00:00
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
Sergio De la torre e80fe1d0dc feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 07:10:47 +02:00
Sergio De la torre 2d4e667009 feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-13 07:02:30 +02:00
Sergio De la torre 05b6c75a19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin 2024-09-13 07:02:15 +02:00
Sergio De la torre 93e7163858 feat: refs #6868 refs# 6868 handleUser 2024-09-12 17:09:27 +02: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 8a1677f4e9 Merge branch 'dev' into 7923-DeleteLogifloraFunctions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 11:25:45 +00: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
Jorge Penadés 36d8e88ac3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-12 13:10:56 +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
Ivan Mas 37900daf9e Merge branch 'dev' into 7923-DeleteLogifloraFunctions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-12 10:19:51 +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
Jorge Penadés edccd95fa1 fix: refs #7828 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-12 10:29:03 +02:00
Jorge Penadés b2bc095caa fix: refs #7828 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 10:28:29 +02:00
Jorge Penadés 74fafdf330 fix: refs #7828 filter mail access
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 10:27:18 +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
Jorge Penadés 6f81ca08db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 09:55:03 +02: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
Jorge Penadés f1f10d1367 refactor: refs #7828 wip 2024-09-12 09:15:07 +02: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
Pablo Natek 09031822a6 feat: refs #7781 only print when no expedition form other pallets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-12 08:24:33 +02:00
Carlos Satorres 5085921c21 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-12 07:44:50 +02:00
Jon Elias d36ce6bf99 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 05:43:17 +00: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
Jon Elias 0100e03562 Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 07:36:57 +02:00