Commit Graph

25554 Commits

Author SHA1 Message Date
Jorge Penadés ccf9dbde8e feat: refs #7919 test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-14 17:11:12 +02:00
Jorge Penadés 32756dabae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-14 16:49:11 +02:00
Jorge Penadés 48e4c68561 Merge pull request '#7874 clientObservationType' (!2960) from 7874-createObservationType into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #2960
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-14 14:16:40 +00:00
Sergio De la torre 13c7b34c98 Merge branch 'master' into 6861-ItemShelvingSaleReserve
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-14 14:15:51 +00:00
Jorge Penadés 0549e22720 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-14 15:38:30 +02:00
Jorge Penadés d02e942dd2 Merge pull request 'feat: refs #7323 show right error' (!3096) from 7323-showRightError into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3096
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-14 13:31:59 +00:00
Jorge Penadés cedb1b570d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-showRightError
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-14 14:42:37 +02:00
Jorge Penadés f3b5a70b67 feat: refs #7323 show right error
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-14 14:41:25 +02:00
Alex Moreno e0b252e6bb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-14 14:12:16 +02:00
Alex Moreno 0063591089 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-14 14:11:57 +02:00
Carlos Satorres 68469e2ba8 Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-14 13:52:08 +02:00
Jon Elias 07849ebeb8 fix: myTeam param
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-14 13:25:09 +02:00
Sergio De la torre 06b7d56837 fix: refs #6861 assignCollection&isOnReservationMode
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-14 13:01:30 +02:00
Alex Moreno 394cf0d18b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8066-docuware_oauth
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-14 12:31:20 +02:00
Jon Elias 4ee6a46bd5 feat: added new filter param
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-14 11:29:49 +02:00
Guillermo Bonet 6c62172633 feat: refs #7006 itemTypeLog created
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-14 09:31:35 +02:00
Guillermo Bonet 78a9b788bf feat: refs #7006 itemTypeLog created
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-14 08:42:54 +02:00
Jorge Penadés b39a749bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-14 08:37:58 +02:00
Alex Moreno d8e0c1debe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-14 07:27:19 +02:00
Jorge Penadés 770c604d6b chore: refs #7919 delete if ticketRefund
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-10 16:30:04 +02:00
Jorge Penadés 295c31a5f0 feat: refs #7874 add finance obs type
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-10 11:01:25 +02:00
Jorge Penadés 2b17e6da4c Merge branch 'dev' into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-10 08:16:29 +00:00
Jorge Penadés 9a7aa315e5 Merge pull request 'feat: refs #7207 show queue in worker summary' (!3007) from 7207-showPbx into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3007
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-10 07:20:17 +00:00
Jorge Penadés f5a43962fd Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-10 07:18:06 +00:00
Pako Natek 714e34e450 Merge pull request 'feat: refs #8075 itemShelvingMoving' (!3090) from 8075-master-itemShelvingMoving into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3090
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-10 06:44:00 +00:00
Pako Natek 3347cde109 Merge branch 'master' into 8075-master-itemShelvingMoving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-10 06:33:13 +00:00
Pako Natek 32c01f22d5 Merge pull request '8069-hotFix-oversTocking' (!3088) from 8069-hotFix-oversTocking into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3088
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-10 06:25:20 +00:00
Pako Natek 208869bd30 fix: refs #8069 removed obsolete variables
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-10 08:20:41 +02:00
Pako Natek 209e65180e Merge pull request 'feat: refs #8075 itemShelvingMoving' (!3089) from 8075-test-itemShelvingMoving into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3089
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-10-10 05:36:06 +00:00
Pako Natek 4eab12dd04 fix: refs #8069 throw message in spanish
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-09 07:41:43 +02:00
Pako Natek 679773b33e feat: refs #8075 itemShelvingMoving 2024-10-09 07:26:22 +02:00
Pako Natek 5eda0af20f feat: refs #8075 itemShelvingMoving
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-09 07:24:34 +02:00
Pako Natek f0ac12d52e Merge branch 'master' into 8069-hotFix-oversTocking
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-09 05:21:02 +00:00
Alex Moreno 040304d04f fix: merge
gitea/salix/pipeline/head This commit looks good Details
2024-10-08 17:10:19 +02:00
Alex Moreno 0c6541372e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-10-08 17:09:26 +02:00
Alex Moreno 087818e39d Merge pull request 'fix(closeAll): not use transaction' (!3087) from hotFix_closure_withoutTransaction into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3087
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-10-08 15:08:52 +00:00
Alex Moreno 3cf7591206 fix(closeAll): not use transaction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-08 17:03:27 +02:00
Carlos Satorres 39e808bca7 fix: refs #7986 fix model 2024-10-08 16:06:38 +02:00
Carlos Andrés d497ffc781 Actualizar modules/ticket/back/methods/ticket/closure.js
gitea/salix/pipeline/head This commit looks good Details
2024-10-08 13:32:57 +00:00
Alex Moreno 02adc6473a fix: duplicate variable
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-08 12:22:47 +02:00
Alex Moreno 5cdb0b7eb6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-10-08 12:19:10 +02:00
Alex Moreno f8a3527680 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-08 12:17:02 +02:00
Alex Moreno 9695fea48f feat(Docuware): refs #8066 add username and password
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-08 12:05:19 +02:00
Carlos Satorres b4dc5276dd fix: refs #7986 create fk 2024-10-08 08:36:17 +02:00
Guillermo Bonet 023842ac33 feat: refs #7994 comment changes
gitea/salix/pipeline/head This commit looks good Details
2024-10-08 08:33:04 +02:00
Pako Natek c7269e77a6 Merge pull request 'feat: refs #8075 itemShelving' (!3081) from 8075-itemShelvingMoving into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3081
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-08 05:48:05 +00:00
Sergio De la torre 4894cb140e Merge pull request 'fix: refs #6861 duplicatedTicketsInReserve' (!3053) from 6861-itemShelvingSaleDelete into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3053
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-10-08 05:41:54 +00:00
Pako Natek ff43533b5a Merge branch 'dev' into 8075-itemShelvingMoving
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-08 05:33:14 +00:00
Pako Natek 34f85fdcc4 Merge pull request 'feat: refs #8069 overStocking protocol' (!3082) from 8069-test-overStocking into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3082
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-08 05:32:57 +00:00
Jorge Penadés 330c1f3de6 chore: refs #7207 drop transaction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-07 17:50:36 +02:00