Commit Graph

6749 Commits

Author SHA1 Message Date
Guillermo Bonet 55df919076 fix: refs #7760 collection_new
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 09:37:25 +02:00
Guillermo Bonet 267ce3167c fix: refs #7760 collection_new
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 09:30:40 +02:00
Guillermo Bonet 3fe1724e84 fix: refs #7760 ticket_splitItemPackingType
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 09:12:25 +02:00
Pablo Natek 81eb875132 Merge pull request 'fix: refs #7760 remove throw on ticket split' (!2980) from 7760-fixTicketSplit into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2980
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-17 06:58:02 +00:00
Guillermo Bonet 88f434435b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 08:42:34 +02:00
Guillermo Bonet 1cbba0b52f Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-17 08:42:02 +02:00
Guillermo Bonet 2980b2da51 fix: refs #7759 Added more grants for vn user
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 08:41:52 +02:00
Pablo Natek 9896ac2361 fix: refs #7760 remove throw on ticket split
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-17 08:21:29 +02:00
Javi Gallego 361d60a8a8 Merge pull request 'feat: refs #7956 itemGetSimilar' (!2945) from 7956-itemGetSimilar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2945
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-17 05:28:48 +00:00
Javi Gallego 06efa8be94 Merge branch 'dev' into 3505-closureTests 2024-09-17 07:12:01 +02:00
Carlos Andrés faf963ba52 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 15:11:51 +02:00
Carlos Andrés 1d42f58c39 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-16 15:09:34 +02:00
Carlos Andrés 2e03fe8193 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:41:29 +02:00
Alex Moreno cabc9660d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:27:08 +02:00
Alex Moreno 8803ae0534 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:25:27 +02:00
Carlos Andrés 33540063f4 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-16 14:17:51 +02:00
Carlos Andrés e7343b7e25 fix: refs #7760 tmp.ticketIPT 2024-09-16 14:16:48 +02:00
Robert Ferrús 10fcbffd37 feat: refs #7964 entry_beforeUpdate not
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 13:37:35 +02:00
Guillermo Bonet 51da7ae063 feat: refs #7893 Created waste_addSalesLauncher
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 13:33:53 +02:00
Javi Gallego e4a74ba0e9 feat: refs #3505 testBack closure 2024-09-16 13:24:33 +02:00
Jon Elias 3aebe88593 Merge branch 'dev' into 6346-WagonToCard
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 11:04:27 +00:00
Robert Ferrús e361b789f4 Merge branch 'dev' into 7964-entry_getCommission
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 11:03:08 +00:00
Sergio De la torre c33740e36e fix: refs #6861 itemShelvingSale debug
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 13:00:20 +02:00
Jon Elias 9aff118b6e feat: refs #6346 added script for wagons
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 13:00:11 +02:00
Guillermo Bonet 0d7953a869 Merge branch 'dev' into 7912-wasteChanges
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:33:23 +00:00
Guillermo Bonet 5c7a537275 feat: refs #7912 Added new waste types
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 12:32:52 +02:00
Robert Ferrús bdef639f78 Merge branch 'dev' into 7964-entry_getCommission
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:29:26 +00:00
Robert Ferrús 7540526b9b feat: refs #7964 entry_beforeUpdate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 12:26:29 +02:00
Jorge Penadés 0a0701f7c2 Merge branch 'dev' into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:24:36 +00:00
Pablo Natek 88962b051f Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:13:13 +00:00
Guillermo Bonet 51cabd06a4 refactor: refs #7562 Deleted deprecated objects
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 10:44:04 +02:00
Guillermo Bonet 738a390ef7 refactor: refs #7886 Deleted proc buy_getVolumeByAgency
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:08:23 +02:00
Guillermo Bonet d7e7647b52 Merge branch 'dev' into 7817-isChecked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 09:17:20 +02:00
Pablo Natek 8f4f2d2d15 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 09:06:04 +02:00
Javi Gallego d7679fcb50 feat: refs #7977 muestra las facturas sin vencimientos tambien
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 09:01:47 +02:00
Pablo Natek cc1cd0563f feat: refs #7404 fixtures and translates
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 09:00:46 +02:00
Pako Natek 6983a2fbd9 fix: refs #7969 no agency restriction removed
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 08:38:06 +02:00
Pako Natek 390b8271c2 fix: root instead of vn
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 08:20:17 +02:00
Jon Elias 8b7beb7247 Merge branch 'dev' into Hotfix-WagonSQL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 06:20:16 +00:00
Pako Natek 6cbf25dee5 fix: refs #7969 fix on collectionNew
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-16 08:10:58 +02:00
Guillermo Bonet 63dde3dd78 fix: refs #7819 Version
gitea/salix/pipeline/head This commit looks good Details
2024-09-13 14:13:14 +02:00
Ivan Mas dc5691fce7 Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 11:49:28 +00:00
Jon Elias 8d050a8e08 Merge branch 'dev' into Hotfix-WagonSQL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 11:07:55 +00:00
Jorge Penadés b083b267b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 11:59:51 +02:00
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 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
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 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
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 05b6c75a19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin 2024-09-13 07:02:15 +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 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
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
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
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
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
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
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
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
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
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 558ab6eba2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight 2024-09-11 09:30:18 +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
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
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
Sergio De la torre bebd49f08a fix: debugAdd refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 07:08:36 +02:00
Javier Segarra f487aed336 Merge branch 'dev' into 5938_fine_ticketAdvance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 14:16:56 +00:00
Jorge Penadés 85c50db19e Merge branch 'dev' into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 11:45:09 +00:00
Carlos Andrés 8fd7c1a8dd fix: refs #7213 change rounding problems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 13:16:15 +02:00
Carlos Andrés 0bbf10ca4f fix: refs #7213 change rounding problems
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-10 12:59:07 +02:00
Guillermo Bonet 01d591af53 fix: refs #7564 Deleted query
gitea/salix/pipeline/head This commit looks good Details
2024-09-10 12:58:16 +02:00
Jorge Penadés e2ef3472b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 09:41:46 +02:00
Pablo Natek fd1370f2e0 Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 06:35:06 +00:00
Alex Moreno e74da7cbab feat: refs #7953 pullinfo
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-10 08:17:47 +02:00
Guillermo Bonet 9d9e0996f6 Merge branch 'dev' into 7882-quadMinds
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 08:12:15 +02:00
Jon Elias 9759715609 fix: refs #6346 created test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 07:52:09 +02:00
Jon Elias 0593ea9a30 Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-10 07:50:42 +02:00
Jon Elias 125c0c9b3b refactor: refs #6346 requested changes 2024-09-10 07:50:40 +02:00
Javier Segarra c407dde7a0 feat(salix): refs #6156 #6156 remove redundant condition 2024-09-09 15:14:01 +02:00
Jorge Penadés 579ac481f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 15:13:52 +02:00
Javier Segarra 615f57b2e6 feat(salix): refs #6156 #6156 simplify CONCAT_WS 2024-09-09 15:13:32 +02:00
Javier Segarra f9a25617f0 feat(salix): refs #6156 #6156 add missing values 2024-09-09 15:13:08 +02:00
Javier Segarra f70f475223 feat(salix): refs #6156 #6156 change user definer 2024-09-09 15:12:44 +02:00
Javier Segarra 773933ca3c feat(salix): refs #6156 #6156 change config sql 2024-09-09 15:11:55 +02:00
Javier Segarra a5f6fe95ea feat(salix): refs #5938 #5938 add futureAlertLevel
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-09 14:58:02 +02:00
Guillermo Bonet bf1a43a23e refactor: refs #7900 Deleted sectorProdPriority column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 14:43:16 +02:00
Guillermo Bonet 946806c98e Merge branch 'test' into dev 2024-09-09 14:25:51 +02:00
Javier Segarra 38ee76f7c9 Merge branch 'dev' into 6156-advanceTicketsNewField 2024-09-09 12:20:02 +00:00
Jorge Penadés 6e511f00c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 13:58:46 +02:00
Javier Segarra 2fef104954 Merge branch 'dev' into 6156-advanceTicketsNewField 2024-09-09 10:48:20 +00:00
Alex Moreno 0949112b13 Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 12:42:13 +02:00
Carlos Andrés 88a8b4975b fix: ticket 218504 ticket_close
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-09 12:37:49 +02:00
Javier Segarra 31b04cba75 feat(salix): refs #6156 #6156 Move to myt version 2024-09-09 12:08:12 +02:00
Guillermo Bonet daf3dfd2ee Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:35:28 +02:00
Javier Segarra 378ee1119f Merge branch 'dev' of https: refs #6156//gitea.verdnatura.es/verdnatura/salix into 6156-advanceTicketsNewField 2024-09-09 10:18:10 +02:00
Jon Elias c93275b62d Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 08:06:04 +00:00
Jorge Penadés 18ec76d156 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 10:03:22 +02:00
Guillermo Bonet 261bebbc3b feat: refs #6727 Deleted duplicated indexes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 09:41:40 +02:00
Guillermo Bonet 56eb3e093d feat: refs #6727 Added indexes in creationDate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 09:39:10 +02:00
Guillermo Bonet 7053f2786a Merge branch 'dev' into 6727-logClean 2024-09-09 09:38:40 +02:00
Guillermo Bonet c4527cc5c5 feat: refs #4515 New throw buy_checkItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 08:28:27 +02:00
Pablo Natek 25ff498a0b Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master Build queued... Details
2024-09-09 05:54:07 +00:00
Jon Elias b3aa263cea Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 07:32:11 +02:00
Juan Ferrer 37fabc38bd fix(hedera): refs #7931 PROC order_addItem NULL available fix, translations added
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-06 14:56:14 +02:00
Jorge Penadés c43c61991d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 14:22:57 +02:00
Jorge Penadés 901cdc7117 feat: refs #4074 modify acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 14:18:15 +02:00
Jorge Penadés b277ae2d92 Merge branch 'dev' into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 12:01:18 +00:00
Guillermo Bonet a718b6e81f Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 13:52:10 +02:00
Guillermo Bonet 5a82ce4aae Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 13:51:13 +02:00
Carlos Andrés d10db686e5 fix: refs #7346 ticket_close serial
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 12:52:24 +02:00
Ivan Mas 762975ed14 Merge branch 'dev' into 7898-New_column_floor_parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 09:54:34 +00:00
Ivan Mas d9c860c44a Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 09:48:58 +00:00
Jorge Penadés 26d47b3f38 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 11:29:53 +02:00
Jorge Penadés af929c1ee9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:45:35 +02:00
Jorge Penadés 2df9bb9bdb Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 08:42:53 +00:00
Jorge Penadés 18d93d93a6 chore: refs #7323 worker changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:40:16 +02:00
Jorge Penadés 0a7a9e2cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:29:44 +02:00
Ivan Mas 900e840eec Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 07:43:06 +00:00
Juan Ferrer 93330db88f Merge branch 'test' into 7931-availableFix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 07:14:08 +00:00
Jorge Penadés 78a851336f chore: refs #7323 worker changes wip
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 09:11:20 +02:00
Juan Ferrer 640b45ed99 fix: refs #7931 Apply PR change requests
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 09:06:00 +02:00
Ivan Mas 26db88b344 Merge branch 'dev' into 7898-New_column_floor_parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 07:00:19 +00:00
Ivan Mas 0626b83370 Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 06:56:15 +00:00
Ivan Mas 747e6a562a feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 08:51:41 +02:00
Guillermo Bonet 1b8583a19d feat: refs #7759 Revoke routine grants vn
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 08:50:50 +02:00
Ivan Mas f193938264 Merge branch 'dev' into 7898-New_column_floor_parking
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-06 06:02:01 +00:00
Guillermo Bonet 925002256a Merge branch 'dev' into 7562-deleteDeprecatedObjects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 05:49:20 +00:00
Guillermo Bonet 7486c4a3c6 feat: refs #7562 refs #7532 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 07:48:53 +02:00
Robert Ferrús 75146f930a Merge branch 'master' into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-06 04:28:11 +00:00
Guillermo Bonet 72024fb854 fix: refs #7759 Added user 'vn'@'localhost' & grants
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 06:12:48 +02:00
Ivan Mas ac8b101455 feat: refs #7898 Modify default
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-05 17:05:48 +02:00
Jorge Penadés cff5bef54b fix: refs #7524 add fixture orm config
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 15:47:45 +02:00
Juan Ferrer a7bc58a5bc fix: refs #7931 Immediately discount order lines from available
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-05 14:45:17 +02:00
Robert Ferrús 5e456a32fb Merge branch '7929-createTableMaterial' of https://gitea.verdnatura.es/verdnatura/salix into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 14:38:58 +02:00
Robert Ferrús 3e4caa8edf feat: refs #7929 autoincrement 1 2024-09-05 14:38:55 +02:00
Robert Ferrús fa34c4328e Merge branch 'master' into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 12:27:41 +00:00
Robert Ferrús 684658bb96 feat: refs #7929 quitar codigo 2024-09-05 14:25:50 +02:00
Jorge Penadés 4869322476 Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-05 09:57:26 +00:00
Guillermo Bonet 620ce5d45e Merge pull request 'feat: refs #7905 getBuysCsv' (!2900) from 7905-getBuysCsv into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2900
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 09:44:38 +00:00
Guillermo Bonet 5a51d5c07b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Build queued... Details
2024-09-05 11:19:02 +02:00
Guillermo Bonet ac01da5eed feat: refs #7759 Deleted version 11163-maroonEucalyptus 2024-09-05 11:19:00 +02:00
Javi Gallego 40a1b24403 Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2904
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 09:07:24 +00:00
Javier Segarra bb401af086 Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 09:00:14 +00:00
Guillermo Bonet 8ca491b8de Merge branch 'dev' into 7759-newDefiner
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 09:40:42 +02:00
Jorge Penadés e98313a1a5 Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 07:37:56 +00:00
Guillermo Bonet d0eab064b7 Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 07:26:27 +00:00
Guillermo Bonet 6df817ea5d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-05 09:25:00 +02:00
Guillermo Bonet 2b465d0d23 Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 07:18:37 +00:00
Jorge Penadés 03d711b694 chore: refs #7524 add select limit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 09:12:52 +02:00
Robert Ferrús 777eba8c53 Merge branch 'master' into ticket216260-buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 05:22:02 +00:00
Carlos Satorres b66386fdb1 Merge pull request 'refs #7407 create models' (!2603) from 7407-workerMedical into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2603
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-04 13:07:50 +00:00
Robert Ferrús 75be124e1f feat: refs #7929 create table material
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 14:14:12 +02:00
Guillermo Bonet 2bb73af47d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 14:12:50 +02:00
Guillermo Bonet 80839100c7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 14:10:33 +02:00
Guillermo Bonet 212e8d1a03 fix: refs #7346 invoiceSerial 2024-09-04 14:09:31 +02:00
Pako Natek e574f0060a hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 13:37:13 +02:00
Guillermo Bonet afcb590a9e fix: ticket #216260 buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 12:45:33 +02:00
Guillermo Bonet 297eb30395 fix: ticket #216260 buy_recalcPrices 2024-09-04 12:41:44 +02:00
Guillermo Bonet 74a5d1f217 fix: ticket #216260 buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 12:23:01 +02:00
Jorge Penadés 544ddb0f15 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-04 10:39:46 +02:00
Guillermo Bonet fbfbcf9bd4 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 09:02:57 +02:00
Guillermo Bonet a8cc3f496f build: refs #7897 dump 24.36
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-04 09:02:38 +02:00
Guillermo Bonet c5521ea021 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 07:06:22 +02:00
Jorge Penadés a07582faa4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 16:22:04 +02:00
Javier Segarra d54361a0bc Merge branch 'dev' into 7277-RefundInvoices
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 13:38:03 +00:00
Guillermo Bonet 3cc19549e4 fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-09-03 15:03:09 +02:00
Ivan Mas 77fd3e7f46 feat: refs #7898 Add column "floor" in vn.parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 14:42:07 +02:00
Jon Elias 26876fd0a6 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 14:35:59 +02:00
Jon Elias 29b0851741 refactor: refs #6346 hook added in wagon-type-tray model
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-03 14:35:05 +02:00
Guillermo Bonet 790a44c62a fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems 2024-09-03 13:29:01 +02:00
Ivan Mas 690898630c Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 10:35:47 +00:00
Ivan Mas d330529bf2 feat: refs #7819 Delete obsolete objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 12:33:26 +02:00
Guillermo Bonet 0c3349dc03 fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-03 12:06:31 +02:00
Guillermo Bonet 6f97d1b83a fix: refs #7844 salesFilter and isTooLittle condition
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-03 09:57:18 +02:00
Guillermo Bonet 7632f33322 fix: refs #7712 sizeLimit
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-03 09:22:55 +02:00
Jorge Penadés a0ac2be203 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 09:08:56 +02:00
Guillermo Bonet 6b53c24f20 feat: refs #6650 Added saleGroupLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 08:17:27 +02:00
Guillermo Bonet 5468049b26 Merge branch 'dev' into 6650-shelvingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 07:59:22 +02:00
Javier Segarra 7d5cb45b3a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7897_masterTest_24_36 2024-09-03 07:57:43 +02:00
Guillermo Bonet 8e34e78964 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-03 07:52:05 +02:00
Pablo Natek e20ef7c699 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-03 07:50:41 +02:00
Guillermo Bonet b436ac0518 fix: refs #7916 itemShelving_transfer
gitea/salix/pipeline/head This commit looks good Details
2024-09-03 07:45:25 +02:00
Javier Segarra 5e26eccd53 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7897_masterTest_24_36
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-02 19:29:23 +02:00
Carlos Andrés 08c7bd2c42 feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 17:59:31 +02:00
Carlos Andrés 0ca1db7633 feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 17:57:39 +02:00
Jorge Penadés b83e548feb Merge branch 'dev' 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-02 17:02:00 +02:00
Pablo Natek f30c0fb94d Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-02 12:52:46 +00:00
Guillermo Bonet 7ab1eea7e9 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-02 14:30:32 +02:00
Guillermo Bonet 89f8e987dc feat: refs #7562 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2024-09-02 14:27:04 +02:00
Carlos Satorres 28a34fa5af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 14:07:01 +02:00
Guillermo Bonet b40ecf9e19 feat: refs #7882 Improved sendOrders and added more config params
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-02 11:48:32 +02:00
Javier Segarra 48c7d1d783 Merge branch 'dev' into 7277-RefundInvoices 2024-09-02 09:35:08 +02:00
Pablo Natek 225060ff74 fix: refs #7781 varible asign value
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-02 09:24:08 +02:00
Guillermo Bonet f15fd66e48 Merge branch 'dev' into 7562-deleteDeprecatedObjects
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-02 07:57:10 +02:00
Guillermo Bonet 2ba391fc85 feat: refs #7562 Deleted deleteDeprecatedObjects objects
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-02 07:57:00 +02:00
Guillermo Bonet 9d35cbfae4 Merge branch 'dev' into 7650-triggerInv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 07:31:04 +02:00
Guillermo Bonet 8fee3dd706 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-02 07:06:13 +02:00
Javier Segarra 8aa4427693 Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-30 21:38:53 +00:00
Carlos Andrés c88b069ac3 fix: refs #7213 problem rounding
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-30 14:16:03 +02:00
Carlos Andrés 4ed5811042 fix: refs #7213 problem rounding
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-30 14:14:06 +02:00
Guillermo Bonet d46a93a96f Merge branch 'dev' into 7564-ticketVolume
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-30 11:55:03 +00:00
Javi Gallego 51535bfa6b feat: refs #7277 refundInvoices 2024-08-30 13:50:51 +02:00
Carlos Andrés beb54aedf8 fix: refs #7213 problem rounding
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-30 13:14:45 +02:00
Carlos Andrés 3da6a700ae fix: refs #7213 problem rounding
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-08-30 13:08:15 +02:00
Guillermo Bonet 7b1a34e249 feat: refs #7860 Update new packagings
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-30 12:47:05 +02:00
Guillermo Bonet e50c67c305 feat: refs #7905 Added new method getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-29 12:22:29 +02:00
Guillermo Bonet 72b4607d54 feat: refs #7905 Added new method getBuysCsv
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-29 12:19:06 +02:00
Guillermo Bonet 6cb6110b14 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-29 07:51:23 +02:00
Guillermo Bonet 6093f2001b Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-08-29 07:51:14 +02:00
Guillermo Bonet 5e95e0465c Merge branch 'dev' into 6727-noDeleteLogInProc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-29 05:06:16 +00:00
Carlos Andrés 1a47040e75 Merge pull request 'fixes: refs #7760 collection problems' (!2888) from 7760-Refactor-collection_assign into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2888
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-28 15:27:14 +00:00
Carlos Andrés 484bb48d04 fix: refs #7760 collection problems
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-28 12:33:05 +02:00
Carlos Andrés 423ba8c218 Hotfix: refs #7213 ticket_isTooLittle group by addressFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-28 11:59:46 +02:00
Jorge Penadés 80844acc61 Merge branch 'test' into 7524-warmfix-modifyColumn
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-28 06:50:28 +00:00
Guillermo Bonet f9c59a9e4c Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-08-28 08:40:24 +02:00
Guillermo Bonet 3dda49b3c5 fix: refs #pako Deleted duplicated version
gitea/salix/pipeline/head This commit looks good Details
2024-08-28 08:40:03 +02:00
Guillermo Bonet 97b839bf1a fix: refs #6727 No delete log tables data in clean procedures
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-28 08:10:32 +02:00
Carlos Andrés 16fd69904b fixes: refs #7760 collection problems
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 18:36:07 +02:00
Carlos Andrés 1ec9e5bf09 Hotfix: refs #7213 ticket_isTooLittle group by addressFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-27 17:39:54 +02:00
Carlos Andrés 9a2351b958 Hotfix: refs #7213 ticket_isTooLittle group by addressFk 2024-08-27 17:12:41 +02:00
Jorge Penadés b833fd5081 chore: refs #7524 modify ormConfig table col
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-27 14:45:11 +02:00
Carlos Andrés 6090e8ceee fixes: refs #7760 collection problems
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 13:47:47 +02:00
Carlos Andrés 58f8903b53 fixes: refs #7760 collection problems
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-27 13:43:20 +02:00
Carlos Andrés 44072de928 fixes: refs #7760 collection problems
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-27 13:36:06 +02:00
Carlos Andrés 3ac2c18da5 fixes: refs #7760 collection problems
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-27 13:31:07 +02:00
Pako Natek a4cc36eed1 version
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-27 11:41:34 +02:00
Carlos Andrés b317c8c462 fixes: refs #7760 collection problems
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 10:47:09 +02:00
Guillermo Bonet 79e2424a41 Merge branch 'dev' into 7844-changeProblemsCalc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 08:04:21 +00:00
Pako Natek ce2058ec8b version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 08:36:14 +02:00
Jorge Penadés 4a3faebe7d Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-26 16:59:40 +02:00
Guillermo Bonet aaf95e3cff fix: refs #7756 id 0
gitea/salix/pipeline/head This commit looks good Details
2024-08-26 14:39:30 +02:00
Guillermo Bonet 1e91d689c5 Merge branch 'dev' into 7564-ticketVolume
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-26 12:18:20 +00:00
Guillermo Bonet 5a22f009f2 refactor: refs #7817 itemShelving_addList change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-26 14:06:10 +02:00
Guillermo Bonet e9870be76f Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-08-26 12:14:38 +02:00
Javi Gallego 638a43d3e6 Merge pull request '#7710 - clone with ticket packaging' (!2878) from 7710-cloneWithTicketPackaging into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2878
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-08-23 13:41:39 +00:00
Javi Gallego 32d36cda21 feat: refs #7710 pr revision
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 14:28:25 +02:00
Ivan Mas c5210157b1 feat: refs #7758 accountDetailType fix deploy error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 13:55:51 +02:00
Guillermo Bonet c9a9a6e074 Merge branch 'dev' into 7882-quadMinds
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 11:26:29 +00:00
Guillermo Bonet 0610cbc32e feat: refs #7882 Added model and method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 13:12:11 +02:00
Ivan Mas 754792e3b5 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 09:36:06 +00:00
Ivan Mas 94461cff58 feat: refs #7758 Modify code lowerCamelCase and UNIQUE
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 11:34:26 +02:00
Guillermo Bonet 3974728658 Merge branch 'dev' into 7567-movingCleanFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 07:09:31 +00:00
Ivan Mas 9806265030 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 06:25:06 +00:00
Ivan Mas 7c545a379f feat: refs #7862 roadmap new fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-22 17:02:59 +02:00
Javi Gallego 24468ad338 Merge pull request 'feat: refs #7346' (!2864) from 7346 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2864
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-08-22 09:30:27 +00:00
Ivan Mas 150c60c894 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 14:49:05 +00:00
Ivan Mas d9d2ae2f7b feat: refs #7758 Add code mandateType and accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 16:45:46 +02:00
Guillermo Bonet c2cc7207c3 Merge branch 'dev' into 7567-movingCleanFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 12:42:29 +00:00
Guillermo Bonet 582fa5faeb feat: refs #7567 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 14:42:03 +02:00
Guillermo Bonet 73fedfabea Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 12:28:22 +00:00
Guillermo Bonet 9c4f4ad5a9 Merge branch 'dev' into 7514-srtLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 11:21:21 +00:00
Guillermo Bonet d63a1c5497 feat: refs #7882 Added quadMindsConfig table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 12:28:14 +02:00
Guillermo Bonet c641b47a9b feat: refs #7882 Added quadMindsConfig table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 12:26:34 +02:00
Guillermo Bonet 29b779d6ab feat: refs #7882 Added quadMindsConfig table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 12:03:49 +02:00
Guillermo Bonet 4839add2b4 Merge branch '7567-movingCleanFix' of https://gitea.verdnatura.es/verdnatura/salix into 7567-movingCleanFix
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-21 09:35:43 +02:00
Guillermo Bonet 62176b8517 feat: refs #7567 Changed time to call event 2024-08-21 09:35:42 +02:00
Guillermo Bonet 0bd64a790e Merge branch 'dev' into 7567-movingCleanFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 07:34:05 +00:00
Guillermo Bonet d2709a871c feat: refs #7514 Changes to put srt log
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 08:29:32 +02:00
Guillermo Bonet 92f01f79d3 feat: refs #7800 Added company Fk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 13:11:04 +02:00
Guillermo Bonet a967be51e2 Merge branch '3199-ticket_recalc_itemTaxCountry' of https://gitea.verdnatura.es/verdnatura/salix into 3199-ticket_recalc_itemTaxCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 12:59:31 +02:00
Guillermo Bonet d2bd408e31 feat: refs #3199 Requested changes 2024-08-20 12:59:28 +02:00
Guillermo Bonet c991f32f5a feat: refs #7564 Fix version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 12:01:28 +02:00
Guillermo Bonet 9154507b72 Merge branch '7564-ticketVolume' of https://gitea.verdnatura.es/verdnatura/salix into 7564-ticketVolume
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 11:45:52 +02:00
Guillermo Bonet 2b12e046e4 feat: refs #7564 Fix version 2024-08-20 11:45:50 +02:00
Guillermo Bonet 289dc58be4 Merge branch 'dev' into 7564-ticketVolume
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 09:45:01 +00:00
Guillermo Bonet 8a03650eca feat: refs #7564 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 11:44:38 +02:00
Guillermo Bonet 7fc47f0506 feat: refs #7564 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 11:43:08 +02:00
Guillermo Bonet 1db68c08ed Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 08:59:42 +00:00
Guillermo Bonet d0f1362f85 feat: refs #3199 Requested changes
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-20 10:59:05 +02:00
Guillermo Bonet a995d80b46 feat: refs #3199 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 10:58:26 +02:00
Guillermo Bonet 45fa615daf Merge branch 'dev' into 7712-sizeLimit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 08:28:19 +00:00
Javi Gallego 340348a38e feat: refs #7346 backTest checks new implementation 2024-08-20 10:11:42 +02:00
Guillermo Bonet 6acd3e0b1d feat: refs #7759 Changed defined only of vn objects
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 10:10:46 +02:00
Guillermo Bonet 3087a14248 Merge branch 'dev' into 7759-newDefiner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 10:07:33 +02:00
Guillermo Bonet 8e63d85964 feat: refs #7759 Changed name
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 10:06:10 +02:00
Jorge Penadés 81c79967f1 Merge branch 'master' into 7831-hotfix-correctOrder
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-20 08:00:34 +00:00
Guillermo Bonet 0d8d5d8b3d build: dump 2434
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-20 09:57:33 +02:00
Guillermo Bonet 1f5145ba9e feat: refs #7712 Unify
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 09:34:02 +02:00
Guillermo Bonet f9d0afa5da feat: refs #7712 Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 09:30:25 +02:00
Jorge Penadés cf977ce06d fix: refs #7831 sql
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-20 09:12:10 +02:00
Guillermo Bonet 0fcff01433 refactor: refs #7756 Fix tests
gitea/salix/pipeline/head This commit looks good Details
2024-08-20 09:11:30 +02:00
Guillermo Bonet fc1767cab4 refactor: refs #7756 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 08:45:04 +02:00
Guillermo Bonet b1ef037272 Merge branch 'dev' into 7756-fixRefFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 08:05:51 +02:00
Javier Segarra b594011433 feat(salix): refs #7677 #7677 return more postcode fields 2024-08-20 07:01:13 +02:00
Javi Gallego ccfb53891f Merge branch 'dev' into 7346
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-19 09:10:06 +02:00
Javi Gallego 575577d29b feat: refs #7346 add multiple feature
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-16 10:08:58 +02:00
Jorge Penadés 2aaad4316b Merge branch 'dev' into 7524-limitSelect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-16 06:54:35 +00:00
Jorge Penadés 57a1de7f13 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-14 16:29:12 +02:00
Guillermo Bonet 8d35e95731 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-14 12:48:52 +02:00
Guillermo Bonet 5e0bf4c739 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-08-14 12:48:22 +02:00
Javi Gallego f21c292e20 Merge branch 'dev' into 7346 2024-08-14 12:19:40 +02:00
Javi Gallego 7f543e8d3a Merge branch 'dev' into 7346 2024-08-14 10:32:32 +02:00
Javier Segarra befcf89534 fix(salix): #7867 apply SQL conventions
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-13 11:18:23 +00:00
Guillermo Bonet 68ee5e3549 fix: refs #7800 tpvMerchantEnable PRIMARY KEY
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 12:52:39 +02:00
Guillermo Bonet dd5845abae fix: refs #7800 tpvMerchantEnable PRIMARY KEY
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 12:49:56 +02:00
Javier Segarra a178c285c0 fix(salix): #7867 avoid deactivate user when is supplier
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-13 10:44:54 +00:00
Guillermo Bonet 360e20545a feat: refs #7799 Added Fk in vn.item.itemPackingTypeFk
gitea/salix/pipeline/head This commit looks good Details
2024-08-13 12:26:01 +02:00
Guillermo Bonet 38cf5af23e feat: refs #7842 Added editorFk in vn.host
gitea/salix/pipeline/head This commit looks good Details
2024-08-13 12:21:03 +02:00
Guillermo Bonet e4dc86c685 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-13 12:16:01 +02:00
Guillermo Bonet d9f64dea08 fix: refs #7713 ACL Log
gitea/salix/pipeline/head This commit looks good Details
2024-08-13 12:15:30 +02:00
Jorge Penadés 85f064c869 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 11:41:52 +02:00
Sergio De la torre 32d5ca0d5c fix: refs #6861 refs#6861 bySectorCollection
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-13 11:37:08 +02:00
Guillermo Bonet 61d6efaea7 refactor: refs #7798 Drop bi.Greuges_comercial_detail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 09:53:05 +02:00
Jorge Penadés c742f6f79d Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 16:59:28 +02:00
Jorge Penadés 3adb73cddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 15:38:40 +02:00
Jorge Penadés 82da7bff9b Merge branch 'dev' into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 09:28:11 +00:00
Jorge Penadés 1602c12200 fix: refs #7283 sql
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-12 09:13:30 +02:00
Jorge Penadés 6f26dc4990 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 09:06:28 +02:00
Guillermo Bonet 931c13d8ab feat: refs #7774 #7774 Changes ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 09:06:24 +02:00
Guillermo Bonet 3cf2cec946 feat: refs #7774 #7774 Changes ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 09:02:38 +02:00
Guillermo Bonet c4e8202261 feat: refs #7774 #7774 Changes ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 08:53:24 +02:00
Guillermo Bonet 5b2200a134 Merge branch 'dev' into 7774-ticket_cloneWeekly 2024-08-12 08:53:02 +02:00
Guillermo Bonet 8655ca0a21 Merge branch 'dev' into 7646-deleteColumnsProductionConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 06:04:06 +00:00
Guillermo Bonet 00845c0534 refactor: refs #7646 #7646 Deleted scannable* variables productionConfig
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-12 08:03:49 +02:00
Jorge Penadés 9ece46ee46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 15:29:21 +02:00
Guillermo Bonet 5339dcbf19 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 13:53:56 +02:00
Guillermo Bonet 38dbe6e966 fix: #7126 waste_addSales
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 13:53:28 +02:00
Jorge Penadés a512fe75ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 12:12:25 +02:00
Guillermo Bonet 4fc43df11b feat: refs #6650 new itemShelvingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 11:28:30 +02:00
Guillermo Bonet d60f8a5319 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 08:26:22 +02:00
Pablo Natek b636b5429a fix: refs #7404 refactor fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-09 08:20:42 +02:00
Guillermo Bonet cf13aa917e feat: refs #7126 saleQuantity to saleWasteQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 08:18:30 +02:00
Pako Natek cd1eec7e29 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 06:14:15 +00:00
Pako Natek 98f4cb1de5 dropping proc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 08:04:36 +02:00
Pablo Natek e028bc1ddb Merge pull request 'feat: refs #6403 packingSite to productionConfig' (!2793) from 6403-from-packingSite-to-productionConfig into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2793
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-09 05:11:34 +00:00
Pablo Natek 9f2057fdd0 fix: refs #7781 pallet merge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-08 12:46:10 +02:00
Alex Moreno 17d05ecfe2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-08 10:07:26 +02:00
Pako Natek a01794f9cd Merge branch '7836-futureEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7836-futureEntries
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-08 08:27:52 +02:00
Pako Natek 41942783aa dropOldProc 2024-08-08 08:27:50 +02:00
Pako Natek a9cdbb1255 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 06:01:35 +00:00
Guillermo Bonet 4cbea3bf7b refs #7844 Fix tests part 2/2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 13:51:00 +02:00
Guillermo Bonet 8aa06e12b3 refs #7844 Fix tests part 1/2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 12:39:18 +02:00
Robert Ferrús 03cc32a525 Merge branch 'master' into 7818-entry_splitByShelvingFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-07 10:01:32 +00:00
Pako Natek 9b2cbcd5cc reviewed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 10:42:14 +02:00
Guillermo Bonet 4f2e343d0c refs #7844 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 10:40:10 +02:00
Guillermo Bonet ea75446982 refs #7844 Change in problems calc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 10:32:47 +02:00
Jorge Penadés 4b8b7e3a18 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-07 10:16:53 +02:00
Robert Ferrús 41e44b747a fix: refs #7685 hotFixAddress_updateCoordinates
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-07 10:12:39 +02:00
Robert Ferrús f385b9a8a3 feat: refs #7818 entry_splitByShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-07 07:12:29 +02:00
Pablo Natek 9d49d23be8 Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 15:00:13 +00:00
Pablo Natek eaf7730394 Merge branch 'master' into 6403-from-packingSite-to-productionConfig
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 14:58:54 +00:00
Jorge Penadés c31e33535d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 15:23:59 +02:00
Guillermo Bonet fc102eff7b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 14:12:32 +02:00
Guillermo Bonet 03358170d3 fix: refs #7740 ticket route throw
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 14:10:16 +02:00
Pako Natek fc7c7beef7 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 11:23:56 +00:00
Guillermo Bonet 184cbb2800 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 12:58:08 +02:00
Guillermo Bonet ffa775a8a5 Merge pull request 'fix: refs #7834 expeditionScan_Put' (!2832) from 7834-fixExpeditionScanPut into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2832
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-08-06 10:56:10 +00:00
Guillermo Bonet d1bb77d6ed fix: refs #7834 expeditionScan_Put
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 12:51:55 +02:00
Guillermo Bonet 28b848930e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 12:45:55 +02:00
Guillermo Bonet c7c711ac1a fix: refs #7728 duaInvoiceInBooking
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 12:43:51 +02:00
Jorge Penadés b1b7f6639c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 09:52:43 +02:00
Alex Moreno afbba83969 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 09:17:16 +02:00
Alex Moreno 89ba79053a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-08-06 09:17:11 +02:00
Guillermo Bonet 58677dca56 Merge pull request 'refactor: refs #7820 Deprecated silexACL' (!2833) from 7820-silexAcl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2833
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-08-06 07:15:20 +00:00
Jorge Penadés eaea1f3559 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-06 08:47:23 +02:00
Alex Moreno 70a91da0ff build: dump 2432
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-08-06 08:27:40 +02:00
Guillermo Bonet 54e6c63b8b fix: refs #7834 SELECT
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 07:29:32 +02:00
Guillermo Bonet e03a1914d9 fix: refs #7834 Throw
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 07:27:36 +02:00
Guillermo Bonet 1e41f5d533 Merge pull request 'feat: refs #7713 Created ACLLog' (!2783) from 7713-AclLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2783
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-06 05:05:19 +00:00
Pablo Natek 323ab638d7 fix: refs #7404 fix fixtures and back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 15:55:44 +02:00
Pablo Natek f148635c68 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed 2024-08-05 15:41:41 +02:00
Pablo Natek 961fafb33e feat: refs #7404 stockBought add and calculate 2024-08-05 15:32:36 +02:00
Pako Natek dcdbb0bf93 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 12:29:30 +00:00
Pako Natek be5859b8cf prototipo
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-05 14:28:29 +02:00
Guillermo Bonet fa3a7aa931 refactor: refs #7820 Deprecated silexACL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 12:49:04 +02:00
Guillermo Bonet 967443b427 fix: refs #7834 expeditionScan_Put
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 12:26:16 +02:00
Guillermo Bonet 21423d3b48 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-05 12:00:01 +02:00
Guillermo Bonet d5a8e32b52 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 11:59:46 +02:00
Jorge Penadés 09783ae576 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 15:38:49 +02:00
Jorge Penadés bf7cd1530c feat: refs #7283 order by desc date
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 15:36:02 +02:00
Carlos Andrés f431d6c37f Hotfix changes whit conficts merged incorrectly
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 13:45:58 +02:00
Guillermo Bonet abd8bc9639 fix: refs #6453 order_confirmWithUser
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 12:20:50 +02:00
Guillermo Bonet ae9472e092 Merge pull request 'refactor: refs #6453 order_confirmWithUser' (!2694) from 6453-orderConfirm into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2694
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-08-02 10:14:58 +00:00
Guillermo Bonet 6acba08a91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 12:08:40 +02:00
Guillermo Bonet f6db62945d Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 12:08:22 +02:00
Guillermo Bonet dead585a1b Merge pull request 'fix: refs #7812 Added orders in item_getMinacum' (!2810) from 7812-radarOrder into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2810
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-02 10:01:55 +00:00
Guillermo Bonet afb2f8d111 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 11:50:26 +02:00
Guillermo Bonet 4c67daedec Merge branch 'master' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 11:50:16 +02:00
Carlos Andrés 69d4c8bd6e Merge pull request 'fix: refs #7829 Error al calcular problemas de componentes' (!2828) from 7829-Error-calcular-problemas-componentes into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2828
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-02 09:45:06 +00:00
Carlos Andrés 29a50caaca fix: refs #7829 Error al calcular problemas de componentes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 11:43:30 +02:00
Carlos Andrés ddd5e4ffa4 fix: refs #7829 Error al calcular problemas de componentes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 10:28:50 +02:00
Guillermo Bonet 879d48eb27 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 10:00:35 +02:00
Guillermo Bonet 01df29b47c Merge branch 'master' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 10:00:12 +02:00
Guillermo Bonet d852d16ae4 feat: refs #7382 Changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 08:11:38 +02:00
Guillermo Bonet b56260af36 feat: refs #6453 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 07:58:45 +02:00
Alex Moreno 20caa5d9a1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-01 14:11:00 +02:00
Robert Ferrús 619dd2fbe8 Merge pull request 'master' (!2823) 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: #2823
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-08-01 05:05:14 +00:00
Sergio De la torre 94d89f9c99 Merge branch 'master' into 6861_triggerItemShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 19:51:36 +00:00
Carlos Andrés 77f6e80066 Actualizar db/routines/vn/procedures/ticket_setRisk.sql
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 17:38:50 +00:00
Sergio De la torre 65e9ed301f hotFix itemShelving refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 18:11:03 +02:00
Carlos Andrés 6c0aae04c0 fix: refs #7213 componentLack y setRisk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 14:59:12 +02:00
Carlos Andrés 77fa4dd497 fix: refs #7213 componentLack y setRisk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 14:38:12 +02:00
Robert Ferrús dca7900ab2 fix: refs #7818 entry_splitByShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 11:31:02 +02:00
Jorge Penadés 57f6c6d9a1 chore: refs #7663 WIP setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 10:43:55 +02:00
Guillermo Bonet cc78355aad fix: refs #7821 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 09:26:55 +02:00
Robert Ferrús 1d22dc46f0 Merge branch 'dev' into 7646-deleteColumnsProductionConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 06:20:10 +00:00
Sergio De la torre eec7790a02 Merge pull request 'test' (!2815) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2815
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 16:13:13 +00:00
Carlos Andrés a61f68cbc9 Merge pull request 'master' (!2811) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2811
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-07-30 14:49:38 +00:00
Guillermo Bonet 961d05ab35 fix: refs #7821 Added orders in item_getMinacum
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 14:19:04 +02:00
Guillermo Bonet 4ef57e6869 fix: refs #7821 Added orders in item_getMinacum
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 14:17:41 +02:00
Guillermo Bonet 057174ae6a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 13:53:58 +02:00
Sergio De la torre 9e486e4aff hotFix reallocate iss refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 13:04:33 +02:00
Sergio De la torre 2015256f5d hotFix reallocate resfs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 12:38:13 +02:00
Carlos Andrés 01562420d4 Actualizar db/routines/vn/procedures/itemShelvingSale_reallocate.sql
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:14:15 +00:00
Guillermo Bonet bcf08db6d6 Merge pull request 'refs #7531 Modify zone_getAddresses' (!2675) from 7531-Modify-zone_getAddresses into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2675
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-30 10:02:10 +00:00
Carlos Andrés 495bb7e36e Merge branch 'test' into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-30 10:46:00 +02:00
Guillermo Bonet 857b1e9939 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:26:33 +02:00
Guillermo Bonet e2c3539dfc Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-30 10:26:17 +02:00
Guillermo Bonet 1f80117ff7 fix: refs #6861 Column
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:24:50 +02:00
Guillermo Bonet 0451e4bb2a feat: refs #7650 Fix tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-30 10:20:04 +02:00
Guillermo Bonet b6abcbe090 feat: refs #6453 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-30 10:14:20 +02:00
Guillermo Bonet 18dc3873b8 feat: refs #7650 Added no transfer lines to inventory entry and fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-30 09:54:43 +02:00
Jorge Penadés 766da06c2f feat: refs #7524 add mock limit on find query
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-30 09:40:34 +02:00
Carlos Andrés 9fc3516e52 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 19:12:48 +02:00
Guillermo Bonet a01ae9b7b8 fix: refs #7756 Foreign keys invoiceOut
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 14:09:55 +02:00
Jorge Penadés 254cced550 chore: refs #6989 add config model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 13:40:30 +02:00
Guillermo Bonet baa1498923 feat: refs #7712 sizeLimit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 13:29:26 +02:00
Guillermo Bonet 6ad3d5a5eb feat: refs #6453 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 12:36:08 +02:00
Guillermo Bonet e53b12d51b feat: refs #6453 Fixes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 12:31:44 +02:00
Guillermo Bonet 4c602800ea feat: refs #6453 Added new ticket search
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 11:46:59 +02:00
Guillermo Bonet e0b9100de1 fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 07:20:05 +02:00
Guillermo Bonet 6de9ea4b16 Merge branch 'dev' into 7759-newDefiner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 07:18:23 +02:00
Guillermo Bonet 403252ac39 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 14:07:15 +02:00
Guillermo Bonet a4d3eec1e1 fix: refs #7580 Parking deadlock
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 14:05:22 +02:00
Pablo Natek 54a5a91177 Merge branch '7781-fixPalletMerge' of https://gitea.verdnatura.es/verdnatura/salix into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-26 12:39:04 +02:00
Pablo Natek ba494a77e6 fix: refs #7781 conditional 2024-07-26 12:39:00 +02:00
Pablo Natek 000a967a03 feat: refs #6403 packingSite to productionConfig
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-26 07:12:51 +02:00
Pablo Natek 876e08b1da Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-26 04:35:59 +00:00
Pablo Natek 6845f1456e fix: refs #7781 prevent pallet merge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 15:03:33 +02:00
Guillermo Bonet 95b61ae86a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 13:29:42 +02:00
Robert Ferrús 6661cb4c2a fix: refs #7654 itemShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 12:30:18 +02:00
Guillermo Bonet ff8f340978 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 09:40:45 +02:00
Guillermo Bonet 25464f8a96 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 08:57:19 +02:00
Guillermo Bonet af62c2e807 fix: refs #7664 No insert editorFk 2024-07-25 08:57:18 +02:00
Sergio De la torre 2374711a88 hotFix itemShelvingSale_addBySale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 08:36:14 +02:00
Guillermo Bonet 70142c43db Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 07:25:04 +02:00
Guillermo Bonet 1639f7155e fix: refs #7640 multipleInventory
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 07:21:01 +02:00
Jon Elias 9e844c15b7 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-25 05:07:32 +00:00
Guillermo Bonet de850e62c9 Merge pull request 'feat: refs #7728 Added throw due date' (!2787) from 7728-dueDateThrow into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2787
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-25 05:03:29 +00:00
Robert Ferrús cb7d6f25e9 Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 12:45:03 +00:00
Guillermo Bonet 983d66a681 feat: refs #7728 Added throw due date
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 14:24:06 +02:00
Robert Ferrús d0dfb95718 feat: refs #7774
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 13:56:21 +02:00
Guillermo Bonet 3d1d5841fd Merge branch 'dev' into 7728-Vctos-DUA
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 08:25:33 +00:00
Guillermo Bonet cf3ee07dd2 feat: refs #7713 Created ACLLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 10:03:51 +02:00
Guillermo Bonet e214da164a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 09:40:06 +02:00
Guillermo Bonet db31ac3b60 fix: refs #7662 ticket_splitItemPackingType
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 09:39:33 +02:00
Robert Ferrús 896e76016d Merge branch 'dev' into 7646-deleteColumnsProductionConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 07:14:52 +00:00
Robert Ferrús 5a9ab84356 feat: refs #7646 delete scannableCodeType 2024-07-24 09:14:28 +02:00
Guillermo Bonet 0c51a97a17 refactor: refs #7640 Multipleinventory available
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 09:13:47 +02:00
Robert Ferrús 65ac02e468 Merge branch 'master' into 7716-travel_setDeliveredMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 05:47:35 +00:00
Guillermo Bonet 23732ab20a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 07:42:08 +02:00
Guillermo Bonet 2086746eb0 fix: refs #7505 Visible COM
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 07:34:52 +02:00
Robert Ferrús 49888cc3b9 Merge branch 'dev' into 7774-ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 05:27:34 +00:00
Robert Ferrús a7f725a194 feat: refs #7774 ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 07:25:43 +02:00
Guillermo Bonet fdef84f78d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 07:11:56 +02:00
Robert Ferrús bb40e6cbf3 Merge branch 'master' into 7716-travel_setDeliveredMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 04:54:00 +00:00
Guillermo Bonet abfbf13440 fix: refs #7505 fix
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 14:18:52 +02:00
Guillermo Bonet a9aa47fef1 fix: refs #7505 visible_refresh support warehouse null and added isComparative
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 14:17:01 +02:00
Guillermo Bonet 5d2e9c6210 fix: refs #7505 visible_refresh support warehouse null and added isComparative
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 13:59:36 +02:00
Jon Elias 03523afff1 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 11:26:59 +00:00
Jon Elias 2568ac4e92 feat: refs #6346 new wagon type section
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 13:24:43 +02:00
Guillermo Bonet 88724d6d8c fix: refs #7505 visible_refresh support warehouse null
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 13:08:49 +02:00
Robert Ferrús 91db2dc0e0 Merge branch 'master' into 7716-travel_setDeliveredMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-23 09:55:44 +00:00
Alex Moreno 1c45aef883 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 11:46:19 +02:00
Robert Ferrús bfc2d6f734 feat: refs #7716 travel_setDelivered
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-23 11:38:05 +02:00
Alex Moreno 85b7254353 Merge branch 'master' into 7773-dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-23 09:02:18 +00:00
Alex Moreno e35ded5e35 hotFix: add summaryId to productionConfigLog & agencyLog
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 11:01:57 +02:00
Alex Moreno 71cd805b7e build: dump db
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-23 10:23:28 +02:00
Guillermo Bonet c6b49e2134 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 09:27:05 +02:00
Guillermo Bonet 04ff3e0cc7 fix: refs #7382 throw
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 09:23:42 +02:00
Guillermo Bonet bfd2b5aebb fix: refs #7382 invoiceIn_booking change
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 09:22:18 +02:00
Robert Ferrús 2a70df151a Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 07:16:28 +00:00
Sergio De la torre c777b8dbf1 Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2762
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-22 20:33:47 +00:00
Sergio De la torre 296fe3442d Merge pull request 'master' (!2773) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2773
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-22 14:48:36 +00:00
Guillermo Bonet 3fc973dcee Merge pull request 'feat: refs #7740 Ticket before update added restriction' (!2770) from 7740-ticketSignRoute into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2770
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-22 12:02:18 +00:00
Sergio De la torre afbce80303 hotFix solve isPicked refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-22 13:42:42 +02:00
Carlos Andrés 33a71867bd feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 13:39:48 +02:00
Carlos Andrés b086cc7658 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 13:34:04 +02:00
Guillermo Bonet 7e125cdba5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 12:36:29 +02:00
Guillermo Bonet 169534568e Merge branch 'test' into dev 2024-07-22 12:36:27 +02:00
Guillermo Bonet b58cdcc590 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-22 12:24:39 +02:00
Guillermo Bonet 24c85608eb feat: refs #7740 Ticket before update added restriction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 12:09:24 +02:00
Carlos Andrés d7b9a3ffd0 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 11:58:51 +02:00
Guillermo Bonet 219740f669 feat: refs #7759 Changed definer root to vn-admin
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-22 11:52:42 +02:00
Guillermo Bonet ab45b988c8 feat: refs #7704 Added itemMinimumQuantity_check
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 10:27:24 +02:00
Javi Gallego 8f623bd51e feat: refs #7346 mas intuitivo 2024-07-22 10:26:40 +02:00
Guillermo Bonet 32e88532f9 fix: refs #7752 fix table name (change pablo)
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 10:07:21 +02:00
Guillermo Bonet a0abc29167 Revert "Merge pull request 'fix: refs #7752 fix table name' (!2767) from 7752-fixproc into master"
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
This reverts commit d41262798c, reversing
changes made to 3d20908a42.
2024-07-22 10:04:03 +02:00
Pablo Natek 7b44e9f866 fix: refs #7752 fix format
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-22 09:49:54 +02:00
Pablo Natek 2ba4ca088d fix: refs #7752 fix table name
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-22 09:46:20 +02:00
Guillermo Bonet a2799e1e61 feat: refs #7589 Added display (item_valuateInventory)
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 08:01:23 +02:00
Guillermo Bonet ccc02d57b7 feat: refs #7589 Added vItemTypeFk & vItemCategoryFk (item_valuateInventory)
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 07:59:15 +02:00
Carlos Andrés bf0f95f661 Merge branch 'dev' into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 15:57:16 +02:00
Carlos Andrés 5567359d73 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 15:34:32 +02:00
Carlos Andrés 55ea761af4 eat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-19 15:11:14 +02:00
Guillermo Bonet fe363fd4db fix: refs #7126 Primary key no unique data
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 15:00:13 +02:00
Guillermo Bonet 05598b3371 fix: refs #7126 Slow update
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 14:29:20 +02:00
Guillermo Bonet ca48c64163 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 13:19:02 +02:00
Guillermo Bonet b72923f160 Merge pull request 'feat: refs #7681 Optimization and refactor' (!2707) from 7681-routeUpdateM3 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2707
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 11:12:21 +00:00
Guillermo Bonet 6aab5fa9ef fix: refs #7546 Deleted insert util.binlogQueue
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 12:47:05 +02:00
Carlos Andrés b2a8326170 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 12:44:45 +02:00
Javier Segarra 287f9edc83 fix(salix): refs #7648 #7648 improve update ACL
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-19 11:54:21 +02:00
Javier Segarra 376ddebdcd Merge branch 'master' into 7648_myEntries 2024-07-19 11:42:53 +02:00
Guillermo Bonet 578de51f7e feat: #6453 Refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-19 10:54:40 +02:00
Guillermo Bonet 5f29384389 feat: #6453 Rollback always split by itemPackingType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 10:49:45 +02:00
Pablo Natek d0a635e86a Merge pull request 'fix: refs #7752 add new state after scan' (!2760) from 7752-insertExpeditionState into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2760
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-19 08:35:39 +00:00
Guillermo Bonet 9466c7e529 Merge branch 'dev' into 6727-logClean
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 07:30:07 +00:00
Guillermo Bonet c94ca96226 feat: #6727 Minor changes
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-19 09:29:42 +02:00
Guillermo Bonet 1133750629 feat: #6727 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:29:15 +02:00
Guillermo Bonet e61210fd17 feat: #3199 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:09:45 +02:00
Alex Moreno b8244b48e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:08:47 +02:00
Guillermo Bonet 3cf5555612 feat: refs #6727 Fixes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:58:51 +02:00
Guillermo Bonet 930e2951b7 feat: refs #6727 Added started and finished
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:27:39 +02:00
Sergio De la torre f19f107971 feat checkExpeditionPrintOut refs #7751
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:27:22 +02:00
Guillermo Bonet 3525c878b6 Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2711
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 05:46:42 +00:00
Guillermo Bonet 3449aeb673 refactor: refs #7511 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 07:45:17 +02:00
Sergio De la torre dbf91293f8 Merge pull request 'master' (!2761) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2761
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 04:31:34 +00:00
Sergio De la torre 2d2eafd4ed Merge branch 'master' into 6861_hotFix_resevas
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 15:17:26 +00:00
Ivan Mas c44bf909b2 Merge branch 'dev' into 7531-Modify-zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 13:23:38 +00:00
Ivan Mas a6e6f435f7 refs #7531 No assigned department
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 15:21:59 +02:00
Pablo Natek 3b529440ba fix: refs #7752 refactor insert
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 15:16:25 +02:00
Pablo Natek 684983ee42 fix: refs #7752 add new state after scan 2024-07-18 15:14:18 +02:00
Guillermo Bonet f687994a7f refactor: refs #7681 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 14:27:10 +02:00
Guillermo Bonet 625b3a5608 refactor: refs #7567 Minor change
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-18 14:12:37 +02:00
Guillermo Bonet f18b165e4a Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-18 13:45:23 +02:00
Guillermo Bonet ba5c44994d feat: refs #7686 Added cascade on update vn.state.alertLevel
gitea/salix/pipeline/head This commit looks good Details
2024-07-18 13:45:06 +02:00
Sergio De la torre bd10741311 hotFix reservas refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 12:42:00 +02:00
Robert Ferrús 57efba8601 Merge branch '7683-productionControlDeadlock' of https://gitea.verdnatura.es/verdnatura/salix into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 12:04:19 +02:00
Robert Ferrús 15adc59ec5 feat: refs #7683 drop temporary table 2024-07-18 12:04:17 +02:00
Robert Ferrús e878615983 Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 09:53:38 +00:00
Robert Ferrús c17214ce05 feat: refs #7683 drop temporary table
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-18 11:50:01 +02:00
Sergio De la torre fa07d03b8c Merge pull request 'master' (!2753) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2753
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-07-18 05:05:01 +00:00
Carlos Andrés f7429f3927 Hotfix itemShelvingSale_doReserve Ticket #204044
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 18:24:27 +02:00
Sergio De la torre 0181764744 Merge pull request 'master' (!2750) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2750
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-17 15:09:35 +00:00
Sergio De la torre a35ec4a42c hotFix reservas refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 16:48:52 +02:00
Sergio De la torre 8ff3e8acb0 hotFix reservas refs #6861 2024-07-17 16:21:37 +02:00
Sergio De la torre 3aea6fdd46 hotFix reservas refs #6861 2024-07-17 16:13:31 +02:00
Pablo Natek 075f2b7ba4 Merge pull request 'feat: refs #7297 add new columns' (!2740) from 7297-itemAddTags10-13 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2740
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-17 12:58:40 +00:00
Alex Moreno e5bfb4af23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 12:20:22 +02:00
Robert Ferrús 762989557f Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-17 05:18:01 +00:00
Carlos Andrés 4ee0bd687f feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 19:01:02 +02:00
Carlos Andrés 5ca2a432da feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 18:58:26 +02:00
Ivan Mas 350e4b4c53 Merge branch 'dev' into 7531-Modify-zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 16:57:50 +00:00
Ivan Mas 50e2c03d3e refs #7531 Requested modifications in redmine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 18:56:00 +02:00
Carlos Andrés d6a949a9f3 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 18:55:58 +02:00
Carlos Andrés 38d863aac6 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-16 18:44:24 +02:00
Carlos Andrés 2181664c25 fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 15:14:10 +02:00
Javier Segarra 5293becb6d Merge branch 'master' into 7648_myEntries
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-16 11:52:54 +00:00
Sergio De la torre 3f297acbd3 hotFix itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-16 13:06:04 +02:00
Javier Segarra 6856ab0501 feat(salix): refs #7648 #7648 myEntries 2024-07-16 12:45:14 +02:00
Sergio De la torre c086de2644 hotFix itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-16 11:38:44 +02:00
Sergio De la torre dbb893c723 Merge pull request 'refs newStatePartial refs #7642' (!2737) from 7642newState into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2737
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-16 08:19:38 +00:00
Robert Ferrús b1a401444e Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-16 08:19:34 +00:00
Pablo Natek 99bbb55c37 feat: refs #7297 add new columns
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 10:02:57 +02:00
Javi Gallego 63763f2b22 Merge branch 'dev' into 7346 2024-07-16 09:32:16 +02:00
Alex Moreno 4fa9f057de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 07:41:21 +02:00
Carlos Andrés 8d61cb762b feat: tabla config dias margen vctos. refs #7728
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-15 17:53:23 +02:00
Sergio De la torre 87b0d3e8d1 refs newStatePartial refs #7642
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-15 16:18:30 +02:00
Robert Ferrús 0fb882e688 feat: refs #7722 changes required
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 14:55:11 +02:00
Robert Ferrús 8f41546829 feat: refs #7222
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 14:25:42 +02:00
Javi Gallego 3698651306 Merge pull request 'feat: refs #7348 hasDailyInvoice field' (!2670) from 7348-client-hasDailyInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2670
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-15 12:16:31 +00:00
Javi Gallego f25d5c3bb5 Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 10:37:53 +00:00
Robert Ferrús 200a6714bb fix: refs #7722 delete sms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 12:02:00 +02:00
Carlos Andrés 31f537ae28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7213-problemas-columnas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 11:52:57 +02:00
Alex Moreno eca89c1c4e Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 08:19:26 +00:00