Commit Graph

8854 Commits

Author SHA1 Message Date
Guillermo Bonet fcb4fe92e8 Merge branch 'dev' into 6636-pickup 2024-04-04 12:14:23 +00:00
Guillermo Bonet f44e19cae3 feat: refs #6636 Modified updateClaim, model and tests 2024-04-04 14:15:20 +02:00
jcasado 5acef1fcc0 refs #6641 add button my team 2024-04-04 13:53:23 +02:00
Alex Moreno 20e4ab1d2c Merge pull request 'hotFix: handle mail error' (!2253) from hotFix_handleMailErrors into master
Reviewed-on: #2253
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-04-04 11:35:09 +00:00
Alex Moreno dd9c7283c3 hotFix: handle mail error 2024-04-04 13:32:39 +02:00
Guillermo Bonet 29eee4e8a7 Merge branch 'test' into dev 2024-04-04 11:30:03 +02:00
Sergio De la torre 9423a2d043 refs #3520 hotFix: hasUncheckedTickets 2024-04-04 10:38:55 +02:00
Guillermo Bonet c685000b47 hotfix: refs #6930 Rollback tokenMultimedia 2024-04-04 10:13:56 +02:00
Jon Elias 3e044a8efe fix: refs #7152 add supplier storage 2024-04-04 08:16:37 +02:00
Alex Moreno ff2e00c51c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-04-03 16:24:45 +02:00
Alex Moreno 59ead0c2e5 debug(closure): add log 2024-04-03 15:29:56 +02:00
Javier Casado 3968d88a8d Merge branch 'master' into hotfix_languageClaimNotification 2024-04-03 11:37:15 +00:00
jcasado 09f023090e hotfix claimStateLanguage 2024-04-03 13:33:56 +02:00
Sergio De la torre b62905c5ef Merge branch 'dev' into 6964_itemOlder 2024-03-28 10:08:56 +00:00
Alex Moreno a376003da6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-28 10:10:22 +01:00
Alex Moreno ed46ad03d2 refs #7152 warmFix 2024-03-28 09:33:57 +01:00
Carlos Satorres 9f438751d3 Merge branch 'dev' into 6074-KkearisBlocked 2024-03-28 08:13:37 +00:00
Alex Moreno f1931fce69 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-28 08:19:26 +01:00
Alex Moreno c47989c6fe Merge pull request '3520_wareshouse_back' (!2218) from 3520_wareshouse_back into dev
Reviewed-on: #2218
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-28 07:16:56 +00:00
Alex Moreno 0b764ebc1b Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev
Reviewed-on: #2209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-28 07:12:51 +00:00
Sergio De la torre 4ca3e8f650 Merge branch 'dev' into 3520_wareshouse_back 2024-03-28 07:12:24 +00:00
Sergio De la torre 8e6416d59c refs #3520 feat:uncheckedTicket 2024-03-28 08:08:32 +01:00
Alex Moreno 6853454d30 Merge pull request '#7002 update direction if device exists' (!2206) from 7002-fixUpdateTimeEntry into dev
Reviewed-on: #2206
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-28 07:04:17 +00:00
Alex Moreno 8cccc78b88 Merge branch 'dev' into 6532-deleteMermas 2024-03-28 06:42:39 +00:00
Javier Segarra d30cac971f refs #6930 updates 2024-03-28 07:22:28 +01:00
Sergio De la torre 7634d82d8b refs #6964 feat:hasItemOlder 2024-03-28 07:15:30 +01:00
Carlos Satorres f4915fbe2e Merge branch 'dev' into 6074-KkearisBlocked 2024-03-27 16:50:03 +00:00
Jorge Penadés e7a29119d0 feat: refs #7002 add test 2024-03-27 13:38:04 +01:00
Jorge Penadés 227d123247 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7002-fixUpdateTimeEntry 2024-03-27 12:24:19 +01:00
Sergio De la torre 483345666e refs #3520 feat:back WarehouseFk 2024-03-27 11:01:32 +01:00
Sergio De la torre 9240732c00 refs #6964 feat:advice for olderItem 2024-03-27 07:49:51 +01:00
Sergio De la torre 2cf572baf8 refs #3520 hasUncheckedTicket 2024-03-27 07:48:16 +01:00
Sergio De la torre a983f25c57 refs #3520 hasUncheckedTicket 2024-03-27 07:47:36 +01:00
Sergio De la torre 39b1e9ff7b refs #3520 hasUncheckedTicket 2024-03-27 07:26:11 +01:00
Sergio De la torre eaf3749440 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3520_wareshouse_back 2024-03-27 07:11:16 +01:00
Sergio De la torre ff8522cfd1 refs #6964 feat:advice for olderItem 2024-03-27 07:09:18 +01:00
Sergio De la torre 43b042a616 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder 2024-03-27 07:08:47 +01:00
Javier Segarra 38c5209c33 refs #6930 fix more endpoints 2024-03-26 15:01:28 +01:00
Jorge Penadés 6ded14b593 feat: refs #7002 update direction if it was not manual 2024-03-26 14:25:25 +01:00
Sergio De la torre b805a5de0a refs #3520 feat:uncheckedTicket 2024-03-26 12:40:44 +01:00
Robert Ferrús 3e2e0ccadb Merge branch 'master' into 7141-sale_replaceItem 2024-03-26 11:00:44 +00:00
Sergio De la torre caf99a9738 refs #3520 feat:uncheckedTicket 2024-03-26 11:06:14 +01:00
Sergio De la torre 678eb2928f refs #6964 feat:hasItemOlder 2024-03-26 10:30:17 +01:00
Sergio De la torre c265896224 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder 2024-03-26 10:24:27 +01:00
Sergio De la torre dc5f588c8e refs #3520 feat: backWarehouse in Salix 2024-03-26 10:13:57 +01:00
Jon Elias a5082d04f9 refs: #6514 fixed error 2024-03-26 08:52:11 +01:00
Jon Elias 0f4e1acf09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier 2024-03-26 08:37:51 +01:00
Alex Moreno 2212899400 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-26 08:35:38 +01:00
Jon Elias 04e42cd3c8 feat: #6514 created supplierDms functionality 2024-03-26 08:29:07 +01:00
Alex Moreno dce0155c00 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-26 08:18:47 +01:00
Sergio De la torre 1840117b3b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder 2024-03-25 16:08:11 +01:00
Robert Ferrús dd977fab83 fix: refs #7141 catalog_calculate 2024-03-25 14:56:12 +01:00
Jorge Penadés eb2b0d41de feat: refs #7002 update direction if device exists 2024-03-25 13:33:39 +01:00
Sergio De la torre 0f5c5efcaa Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6276-newWarehouse-salix 2024-03-25 13:04:02 +01:00
Sergio De la torre 386bc1c934 refs #6276 hotFix: setUserError and return 2024-03-25 13:00:55 +01:00
Jorge Penadés 308a449b94 Merge branch 'master' into 6085-hotFix-addOwnedAlias 2024-03-25 07:48:08 +00:00
Sergio De la torre a40234ba9b refs #6964 feat:hasItemOlder 2024-03-25 08:20:08 +01:00
Sergio De la torre 22f78dbb91 refs #6964 feat:hasItemOlder 2024-03-25 07:54:51 +01:00
Jorge Penadés 0867f4d501 fix: refs #6951 var names & procedure name 2024-03-22 16:01:22 +01:00
Jorge Penadés e8d1967e11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll 2024-03-22 15:14:12 +01:00
Sergio De la torre c4fcb2cd12 refs #6964 feat:advice for olderItem 2024-03-22 13:04:16 +01:00
Sergio De la torre 61b649fdc5 refs #6964 feat:advice for olderItem 2024-03-22 11:47:12 +01:00
Sergio De la torre 976c5b7ba8 refs #6964 feat:advice for olderItem 2024-03-22 11:42:19 +01:00
Sergio De la torre 027aa86662 refs #6964 feat:advice for olderItem 2024-03-22 10:08:20 +01:00
Sergio De la torre 9e5e49c28f refs #6276 feat:newWarehouse 2024-03-22 06:56:27 +01:00
Carlos Satorres ca0d269ee2 refs #6074 remove isBlocked 2024-03-21 15:02:09 +01:00
Jorge Penadés d8aad86c92 feat: refs #6085 add acl authenticated 2024-03-21 13:42:02 +01:00
Sergio De la torre 2a976664ec refs #6276 feat:newWarehouse 2024-03-21 12:05:34 +01:00
Sergio De la torre 5135bee2d2 refs #6276 feat:newWarehouse 2024-03-21 12:02:57 +01:00
Sergio De la torre d8da317339 Merge branch 'dev' into 6964_itemOlder 2024-03-21 10:10:57 +00:00
Sergio De la torre 1d37d3d8bf refs #6276 feat:newWarehouse 2024-03-21 10:33:49 +01:00
Sergio De la torre 3fbf32bd52 refs #6276 feat:newWarehouse 2024-03-21 10:32:36 +01:00
Pablo Natek 130fb68d27 Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev
Reviewed-on: #2187
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-21 09:28:39 +00:00
Ivan Mas db71e69317 Merge branch 'dev' into 6827-check-usernames-special-characters 2024-03-21 09:21:32 +00:00
Sergio De la torre 9eee26cbe9 refs #6276 feat:newWarehouse 2024-03-21 10:18:54 +01:00
Alex Moreno b087c35a36 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-21 08:01:05 +01:00
Pablo Natek da8fbb5a92 fix: refs #6302 spec 2024-03-20 21:14:01 +01:00
Pablo Natek f7b458d368 feat: refs #6302 delete after add to turn 2024-03-20 20:54:24 +01:00
Alex Moreno adddcc96aa Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-03-20 15:01:17 +01:00
Carlos Satorres b352fc10e7 refs #6532 redirect grafana, remove mermas 2024-03-20 14:44:06 +01:00
Alex Moreno 7895a51e33 hotFix(closeAll): fix debug 2024-03-20 12:15:41 +01:00
Carlos Andrés 913b261f86 Merge branch 'dev' into 6549-ticket_close 2024-03-18 17:55:54 +01:00
Jorge Penadés 3c3dd64da1 feat: refs #6951 test 2024-03-18 09:39:56 +01:00
Jorge Penadés f044809f30 feat: refs #6951 to create back 2024-03-15 15:45:47 +01:00
Alex Moreno 8119106e69 hotFix: try to debug closeAll 2024-03-15 15:40:54 +01:00
Javier Segarra bfdbbc0fdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-15 12:22:57 +01:00
Jorge Penadés 6281ba352b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword 2024-03-15 10:38:08 +01:00
Javier Segarra 6989299593 Merge branch 'dev' into 6930_scopedToken_Multimedia 2024-03-15 08:26:45 +00:00
Pablo Natek e3b7c7bb60 Merge branch 'dev' into 6005-backupLabeler 2024-03-14 09:39:13 +00:00
Carlos Satorres 1457884252 Merge branch 'dev' into 6755-restoreRefactor 2024-03-14 08:54:06 +00:00
Carlos Satorres dd7c700130 refs #6755 fix test 2024-03-14 09:53:50 +01:00
Alex Moreno 4ad562a4da fix: refs #6925 transalation 2024-03-14 09:12:19 +01:00
Alex Moreno 974c95b961 Merge branch 'dev' into 6925-fix_translations 2024-03-14 08:00:29 +00:00
Alex Moreno 0ad052c34a refs #7033 deploy(2412): dev to test 2024-03-14 08:36:19 +01:00
Carlos Satorres 24c1ab541d Merge branch 'dev' into 6913-routeKm 2024-03-14 07:31:31 +00:00
Alex Moreno 977181f156 Merge branch 'dev' into 6925-fix_translations 2024-03-14 07:27:16 +00:00
Carlos Satorres 33bd21d40b refs #6755 fix model 2024-03-13 16:29:05 +01:00
Carlos Satorres 1315bfda88 refs #6755 fix test 2024-03-13 14:18:53 +01:00
Carlos Andrés ff459ea3be fix: closeTicket idem salix refs #6549 2024-03-13 12:18:43 +01:00
Carlos Satorres 92cf8fc5e1 refs #6755 remove console 2024-03-13 11:46:43 +01:00