Commit Graph

24476 Commits

Author SHA1 Message Date
Pako Natek 3347cde109 Merge branch 'master' into 8075-master-itemShelvingMoving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-10 06:33:13 +00:00
Pako Natek 32c01f22d5 Merge pull request '8069-hotFix-oversTocking' (!3088) from 8069-hotFix-oversTocking into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3088
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-10 06:25:20 +00:00
Pako Natek 208869bd30 fix: refs #8069 removed obsolete variables
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-10 08:20:41 +02:00
Pako Natek 4eab12dd04 fix: refs #8069 throw message in spanish
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-09 07:41:43 +02:00
Pako Natek 679773b33e feat: refs #8075 itemShelvingMoving 2024-10-09 07:26:22 +02:00
Pako Natek f0ac12d52e Merge branch 'master' into 8069-hotFix-oversTocking
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-09 05:21:02 +00:00
Alex Moreno 087818e39d Merge pull request 'fix(closeAll): not use transaction' (!3087) from hotFix_closure_withoutTransaction into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3087
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-10-08 15:08:52 +00:00
Alex Moreno 3cf7591206 fix(closeAll): not use transaction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-08 17:03:27 +02:00
Sergio De la torre 4894cb140e Merge pull request 'fix: refs #6861 duplicatedTicketsInReserve' (!3053) from 6861-itemShelvingSaleDelete into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3053
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-10-08 05:41:54 +00:00
Pako Natek 20836d734c fix: refs #8069 order_confirmWithUser
gitea/salix/pipeline/pr-master Build queued... Details
2024-10-07 14:25:46 +02:00
Pako Natek 33a4061058 feat: refs #8069 8069-overStocking 2024-10-07 14:24:55 +02:00
Sergio De la torre a96d6f7ed8 Merge pull request 'fix: refs #7524 backSuppliersPackaging' (!3074) from 7524-WhereWithoutLimit into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3074
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-07 10:47:14 +00:00
Sergio De la torre 129b70d8d1 Merge branch 'master' into 7524-WhereWithoutLimit
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-07 06:08:37 +00:00
Sergio De la torre e90d48c777 fix: refs #7524 backSuppliersPackaging
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-07 08:00:34 +02:00
Guillermo Bonet 1205475c4c Merge pull request 'fix: refs #7760 collection_assing added global handler sqlexception' (!3076) from 7760-collectionAssingHandler into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3076
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-07 05:47:54 +00:00
Guillermo Bonet 4da63900a2 fix: refs #7760 collection_assing added global handler sqlexception
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-07 07:36:50 +02:00
Guillermo Bonet 6b7f161d9a fix: refs #7844 sale_problems llena
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-10-07 06:39:41 +02:00
Guillermo Bonet 4a17d9ec0e fix: refs #7760 collection_assing
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-10-06 09:07:48 +02:00
Sergio De la torre 52e8bac168 fix: refs #7524 backSuppliersPackaging
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 13:34:04 +02:00
Carlos Andrés 5d7d9f8d9e fix: refs #6861 deleteAdded
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 13:07:54 +02:00
Sergio De la torre 324875ec1f fix: refs #6861 deleteAdded
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 10:42:33 +02:00
Javier Segarra 7e27026cbc Merge pull request 'FIX: #8081 - Redirect to Lilium from create claim' (!3070) from hotfix_redirect_to_lilium into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #3070
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-04 07:24:26 +00:00
Javier Segarra c1d0037d00 Merge branch 'master' into hotfix_redirect_to_lilium
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 07:13:05 +00:00
Javier Segarra 9843d001b5 fix(salix): change parse method
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 07:09:59 +00:00
Guillermo Bonet b07ffd2a56 Merge pull request 'fix: refs #7956 item_getSimilar' (!3073) from 7956-itemGetSimilarFix into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3073
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-04 07:08:53 +00:00
Guillermo Bonet 7aa8200fca fix: refs #7956 item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 09:02:59 +02:00
Javier Segarra 2b0d9bd0b4 Merge branch 'master' into hotfix_redirect_to_lilium
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 06:52:06 +00:00
Pablo Natek 98d22c5c59 Merge pull request 'fix: refs #7781 prevent pallet merge' (!2792) from 7781-fixPalletMerge into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2792
Reviewed-by: Pako Natek <pako@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-04 06:17:56 +00:00
Pablo Natek c203d5d5e7 Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 05:52:45 +00:00
Pablo Natek 72bab95be1 fix: refs #7781 leave early before any updates on the proc
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 07:52:13 +02:00
Javier Segarra 83f0f11332 fix(salix): redirect from travel to addEntry
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 22:33:56 +02:00
Javier Segarra 80750079e1 Merge branch 'hotfix_redirect_to_lilium' of https://gitea.verdnatura.es/verdnatura/salix into hotfix_redirect_to_lilium
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 22:32:58 +02:00
Javier Segarra 4f9c9dbace perf(salix): remove space 2024-10-03 22:32:54 +02:00
Javier Segarra b85989105b fix(salix): redirect from travel to addEntry
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 22:29:01 +02:00
Javier Segarra 486c7f4fa3 fix(salix): Redirect to Lilium from create claim
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 20:07:24 +00:00
Ivan Mas ec036de2c9 Merge pull request 'fix: hotfix email rutas' (!3069) from hotfix-email-rutas into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3069
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-10-03 16:23:12 +00:00
Ivan Mas 0374cbd4c9 fix: hotfix email rutas
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 18:20:21 +02:00
Carlos Andrés c683925403 Actualizar db/routines/vn/procedures/item_getSimilar.sql
gitea/salix/pipeline/head This commit looks good Details
2024-10-03 15:19:57 +00:00
Carlos Andrés 197517dfcc fix: refs #7956 item_getSimilar block db
gitea/salix/pipeline/head There was a failure building this commit Details
2024-10-03 17:02:40 +02:00
Carlos Satorres 1c2b7388be Merge pull request 'fix: hotfix redirect' (!3068) from hotfix-redirectID into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3068
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-03 12:38:48 +00:00
Carlos Satorres 90311b047d fix: hotfix redirect
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 14:35:45 +02:00
Javier Segarra d21c31988b Merge pull request 'FIX Filter isWorker in DefaulterView' (!3066) from fix_isWorker_defaulter into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3066
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-03 12:20:48 +00:00
Javier Segarra 0a188e03fe Merge branch 'master' into fix_isWorker_defaulter
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 12:19:27 +00:00
Jon Elias e1eea9cb4e Merge pull request 'Hotfix: recover entry descriptor and deleted code' (!3064) from Hotfix-RecoveryDescriptor into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3064
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-03 11:11:05 +00:00
Jon Elias 7aa7106971 Merge branch 'master' into Hotfix-RecoveryDescriptor
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 10:44:03 +00:00
Guillermo Bonet f1bc959a49 fix: refs #7956 item_getSimilar block db
gitea/salix/pipeline/head This commit looks good Details
2024-10-03 12:40:52 +02:00
Jon Elias f96857457d Merge branch 'master' into Hotfix-RecoveryDescriptor
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 10:14:19 +00:00
Javier Segarra 76308f7e37 fix(salix): filter isWorker in DefaulterView
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 12:13:38 +02:00
Javi Gallego 977ab4264d Merge pull request 'fix: refs #6861 collectionGetTickets' (!3065) from 6861-reserves into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3065
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-03 09:57:53 +00:00
Sergio De la torre 32415d3616 fix: refs #6861 collectionGetTickets
gitea/salix/pipeline/pr-master Build started... Details
2024-10-03 11:56:36 +02:00