Commit Graph

2318 Commits

Author SHA1 Message Date
Alex Moreno c23d8282eb refs #5712 feat(workerDms): docuware download
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 15:34:11 +02:00
Vicent Llopis daeed312d0 refs #5244 fix: añadido vn-drop-down em html
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:16:15 +02:00
Vicent Llopis 6cf1e0953d refs #5244 feat: intento de crear el componente workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 14:49:28 +02:00
Alexandre Riera 632662c440 refs #5595 added userId in makeInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 10:49:10 +02:00
Alexandre Riera e05d3b0793 Merge branch 'dev' into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 08:27:35 +00:00
Alexandre Riera 153542d2be refs #5595 taking active connection
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:49:39 +02:00
Carlos Satorres cb664ecec4 Merge branch '5328-abonarTodoTicket' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:18:57 +02:00
Carlos Satorres ec5a5be9e6 refs #5328 remove spaces 2023-05-30 09:18:52 +02:00
Carlos Satorres 3872078507 Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 07:16:38 +00:00
Vicent Llopis 27700bd72c Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 06:14:48 +00:00
Vicent Llopis d2355412a0 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 08:59:20 +00:00
Carlos Satorres b797f747f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaimFIX 2023-05-29 10:00:33 +02:00
Vicent Llopis d313517e14 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:24:28 +00:00
Carlos Satorres 1593b4b626 Merge branch 'dev' into 5398-Agencys&WarehousesData
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:09:08 +00:00
Carlos Satorres 95c438b73a refs #5648 move claimSure
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 14:52:47 +02:00
Vicent Llopis 3ecfbe2052 refs #5252 refactor: creadas varaibles
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 12:03:36 +02:00
Vicent Llopis 9e8efff016 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 11:55:32 +02:00
Alex Moreno c7b8e57d95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 07:41:48 +02:00
Juan Ferrer 27d4d10472 refs #5667 Expedition translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 18:32:03 +02:00
Vicent Llopis 71d8a355bd refs #5252 fix: te2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 15:03:22 +02:00
Vicent Llopis 96feb24f12 refs #5252 fix: back test
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 13:28:44 +02:00
Alexandre Riera a584e1ab5e Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:22:51 +00:00
Vicent Llopis ce211b436d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 13:00:11 +02:00
Carlos Satorres fa8fd8d5bc refs #5398 update from oldbranch
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:41:14 +02:00
Carlos Satorres d82a7eeeb7 Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:25:47 +00:00
Alex Moreno a0da78700b Merge branch 'dev' into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:49:40 +00:00
Alex Moreno 37a3275b27 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:56:10 +02:00
Carlos Satorres 1f24314ab2 refs #5635 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:24:01 +02:00
Alex Moreno 0e6501f306 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_master 2023-05-25 07:42:58 +02:00
Alex Moreno e19ece6119 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:34:54 +02:00
Alex Moreno 42a39b6778 refs #5706 master to test
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:22:56 +02:00
Alex Moreno 03e2b98485 hotFix(closeAll): fix where
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 15:50:59 +02:00
Alex Moreno 6b66eb3bb2 refs #5679 typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:59:58 +02:00
Carlos Satorres d6d72ed289 refs #5635 smart-table, counter, filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-24 12:35:07 +02:00
Alexandre Riera 133c5dbca5 Merge branch 'dev' into 5677-fallo-saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:18:26 +00:00
Alexandre Riera 05fb0a7203 refs #5677 tickets without state fixed
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:16:19 +02:00
Alex Moreno 30c896c975 refs #5678 feat(sale_canEdit): handle exist sale
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 11:20:07 +02:00
Carlos Satorres 9b363bc7a4 refs #5635 remove vn, smart-table
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:57:51 +02:00
Carlos Satorres 1bd54765f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5635-contadotTicketExpedition 2023-05-24 10:05:38 +02:00
Vicent Llopis 3caef0c135 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 07:46:08 +02:00
Vicent Llopis 1ddad7a5ec Merge branch 'dev' into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:45:04 +00:00
Alex Moreno 6a6d28efa0 Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:40:11 +00:00
Alexandre Riera 97653d9b8f Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:07:33 +00:00
Vicent Llopis 3119ae4471 refs #5609 delete: console.log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 15:12:20 +02:00
Vicent Llopis 2c7473b064 refs #5252 feat: permite crear un abono con o sin almacén
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 15:06:38 +02:00
Vicent Llopis 0ab411ddc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 13:45:03 +02:00
Carlos Satorres d7d94796d6 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:13:47 +00:00
Alexandre Riera bf8d82f3c6 refs #5581 refresh model
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 08:43:31 +02:00
Carlos Satorres ee8685329f Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 06:23:19 +00:00
Alex Moreno 6f503e2a81 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-23 08:23:16 +02:00
Carlos Satorres 8ee581eb67 Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 06:02:17 +00:00
Alexandre Riera b9f6dc0a39 Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 05:54:12 +00:00
Alexandre Riera 0e11bfab0b refs #5581 ticketId != id
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:53:25 +02:00
Juan Ferrer da0aa57539 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 19:06:20 +02:00
Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1546
2023-05-22 17:04:32 +00:00
Carlos Satorres 3994e65040 refs #5648 spaces fix2 2023-05-22 15:56:14 +02:00
Carlos Satorres a7c59f51b9 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 13:51:35 +00:00
Carlos Satorres 6d147e7af7 refs #5648 fix spaces 2023-05-22 14:30:04 +02:00
Carlos Satorres 9bc20493fe #refs #5648 e2e fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 12:02:07 +02:00
Carlos Satorres 1b19035d8d refs #5648 vn-confirm
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 10:41:02 +02:00
Carlos Satorres 23287e5ebf refs #5648 setTimeout
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-22 08:30:23 +02:00
Carlos Satorres 32ce0c1a1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim 2023-05-22 08:13:31 +02:00
Juan Ferrer 69b892f2fd refs #5667 Translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-20 16:59:39 +02:00
Vicent Llopis 8eedba8a66 refs #5609 feat: solo muestra error cuando hay 'from' sin 'to y viceversa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 13:34:07 +02:00
Juan Ferrer 6b0fd99eb8 refs #5667 Fixes: Style, translations, fixtures, UI 2023-05-19 10:56:15 +02:00
Vicent Llopis 5ec107188c refs #5609 feat: no deja buscar si no tiene un filtro de fecha
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 10:30:36 +02:00
Vicent Llopis 8cf988b7d2 refs #5638 refactor: code
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 08:02:17 +02:00
Carlos Satorres 2b1e951692 refs #5635 smart-table
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 15:33:54 +02:00
Alex Moreno f54d9180b1 fix front test
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:44:05 +02:00
Alex Moreno 15a1965a53 refs #5094 add scopes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:12:46 +02:00
Vicent Llopis ec02972efb refs #5609 mostrar filtro por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:11:29 +02:00
Vicent Llopis d33a84c39f refs #5638 feat: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 09:30:21 +02:00
Vicent Llopis 463d209d77 refs #5638 refactor: eliminado if innecesario
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 09:21:30 +02:00
Vicent Llopis 9263684ec5 refs #5638 fix: contempla que se le pase un filtro del 'nombre'
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:58:13 +02:00
Vicent Llopis b66362d313 refs #5638 fix: cambiado nombre de variable
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:33:17 +02:00
Alex Moreno 2ef922e80c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:10:10 +02:00
Vicent Llopis a9f71ccbc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 07:33:08 +02:00
Alex Moreno ba763abc26 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 07:17:31 +02:00
Juan Ferrer 48da4b13ff refs #5667 Ticket translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 17:08:20 +02:00
Alex Moreno 02451818ef typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 14:31:19 +02:00
Carlos Satorres 69a25d8d03 refs #5696 horas a 00
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 14:04:13 +02:00
Alex Moreno 6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 11:43:25 +00:00
Carlos Satorres c31eee4906 refs #5696 landed
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 13:35:55 +02:00
Alexandre Riera 0d980334b8 refs #5634 conditional merge
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 12:41:00 +02:00
Juan Ferrer fa40bd9811 refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 10:18:41 +02:00
Juan Ferrer 30d6f56c39 refs #5667 Style fixes, model translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:06:14 +02:00
Alex Moreno 08fcbebbaf refs #5488 polish specifics acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-15 14:14:08 +02:00
Vicent Llopis d5f5115980 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice 2023-05-15 11:50:09 +02:00
Carlos Satorres 8a6881bf73 refs #4764 mod tabindex
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 15:50:32 +02:00
Carlos Satorres ce62b51b29 refs #4764 remove br
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 15:08:04 +02:00
Carlos Satorres ece2875b38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 12:30:34 +02:00
Carlos Satorres 9cbf3006a0 refs #5599 futureState
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 11:17:51 +02:00
Vicent Llopis 2ed99426ef eliminado focus
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 10:18:02 +02:00
Vicent Llopis 90b844062d refs #5327 add frontTest
gitea/salix/pipeline/head Build queued... Details
2023-05-11 10:17:41 +02:00
Vicent Llopis 59f4b63db7 borrado espacio
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 10:04:59 +02:00
Vicent Llopis a7fcd8a1bf changes 2023-05-11 10:04:15 +02:00
Vicent Llopis f00643505d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head Build queued... Details
2023-05-11 10:03:07 +02:00
Vicent Llopis 8ed17d99c3 refs #5327 permite filtrar por columnas (desde el front)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-11 10:02:45 +02:00
Alex Moreno 7704256079 master to test
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 08:00:49 +02:00
Carlos Satorres 43a91194fd refs #5599 remove e2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 15:59:29 +02:00
Carlos Satorres 2111ca0993 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors 2023-05-10 14:49:37 +02:00
Carlos Satorres e258e779b3 refs #5599 ticketFuture
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 14:49:19 +02:00
Carlos Satorres 9a813c075c refs #5599 procedure y colorClass
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 14:43:08 +02:00
Carlos Satorres c59915f951 refs #5599 procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 13:55:36 +02:00
Alex Moreno 29e0562c8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-10 13:33:52 +02:00
Carlos Satorres f4be69c85c refs #5599 select state.classColor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 11:55:56 +02:00
Carlos Satorres 61d6f47162 refs #5599 remove returns
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 11:31:58 +02:00
Carlos Satorres 65646d3b65 refs #4764 validServices
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-09 19:49:16 +02:00
Carlos Satorres 212b848131 refs #4764 check selectedvalidservices
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 19:43:55 +02:00
Carlos Satorres aa96f1eb97 refs #4764 without checkbox
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 19:42:25 +02:00
Carlos Satorres 78f337c6d4 refs 4764 quit index
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 14:56:32 +02:00
Vicent Llopis 461966d73e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-09 11:33:28 +02:00
Juan Ferrer 2aaded4ed4 refs #5517 Fix: Show spinner when loading
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-05-08 16:30:21 +02:00
Carlos Satorres 0b2c91466e refs #5648 create vn-confirm
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 13:25:42 +02:00
Carlos Satorres 202544565e refs #4764 mod query post
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 11:36:52 +02:00
Alex Moreno 7273dd4f1e Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 08:56:06 +00:00
Carlos Satorres 0acb7906cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-05-08 08:33:37 +02:00
Carlos Satorres 3d195bddb9 refs #4764 mod model post
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-05 14:39:46 +02:00
Alex Moreno 456e1d5912 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-05 14:11:47 +02:00
Alex Moreno 97da5e6e24 refs #5488 feat(isRoleAdvanced): use Acl instead of method
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 13:58:11 +02:00
Carlos Satorres c0e13d3339 refs #4754 del ticket.card.service
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 12:00:37 +02:00
Carlos Satorres 80ee73a59b refs #4764 creacion de métodos y back
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 10:01:15 +02:00
Carlos Satorres 8119d38414 Merge branch 'dev'
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 09:35:39 +02:00
Juan Ferrer a48e197e46 refs #5517 E2E fixes 2023-05-05 08:12:38 +02:00
Vicent Llopis 404acdab6f refs #5638 fix: solucionado problema con el limit
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 14:51:47 +02:00
Alexandre Riera 54eb0fc7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 09:59:05 +02:00
Alexandre Riera ad3c6dcee2 wip #5595
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 14:34:36 +02:00
Carlos Satorres dbd0e5138b refs #5328 fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:12:26 +02:00
Carlos Satorres 3ac1ce403c refs #5328 myOptions
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:06:57 +02:00
Carlos Satorres 566f03c497 refs #5328 commit prueba
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 13:03:14 +02:00
Carlos Satorres 3b2e1ca8d5 ref #5328 refundTicket.id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 12:36:30 +02:00
Carlos Satorres eaf425fb51 refs #5328 mod funcion createTicketRefund
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 12:30:33 +02:00
Alex Moreno 4a7902ae4d Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 08:41:18 +00:00
Juan Ferrer 2cfd2d9dda Merge branch 'dev' into 5517-improveLogs+translations
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 18:13:24 +02:00
Alexandre Riera 3bd5582794 Merge branch 'dev' into 5255-revisar-ticketBoxing
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 08:42:21 +00:00
Vicent Llopis 2d181139b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 14:58:34 +02:00
Vicent Llopis 22b223038a delete focus 2023-04-26 14:56:07 +02:00
Vicent Llopis 8bb8b8cfba refs #5594 fix backTest
gitea/salix/pipeline/head Build queued... Details
2023-04-26 14:55:37 +02:00
Vicent Llopis 09dbd29086 refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 14:46:16 +02:00
Alex Moreno c1ea1acc8c refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 13:49:08 +02:00
Alexandre Riera 1219cfcc5c refs #5255 fixed condition
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:03:17 +02:00
Alex Moreno 28ead70615 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:46 +02:00
Alex Moreno 0c668c6ade refs #5488 feat(): replace all hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:36 +02:00
Alex Moreno 11d1900859 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 09:40:36 +02:00
Alex Moreno 4cb231759f feat(State/Supplier): replace hasRole to acls
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 09:15:05 +02:00
Juan Ferrer 49368a837b refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 19:10:04 +02:00
Pablo Natek 3e15728db4 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 15:33:28 +00:00
Carlos Satorres 1088422360 refs #4764 boton abonar y datos 2023-04-24 13:14:38 +02:00
Juan Ferrer 081b4af6d6 Merge branch 'dev' into 5517-improveLogs+translations 2023-04-24 10:44:42 +02:00
Vicent Llopis 4983aa1632 refs #5542 fix backTest
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 09:11:09 +02:00
Carlos Satorres 5ec0cd962d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-04-24 09:04:33 +02:00
Vicent Llopis 9b432bac85 refs #5542 fix: test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 08:57:10 +02:00
Vicent Llopis bf558761a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 08:45:56 +02:00
Alexandre Riera 0a1583aa54 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 08:42:32 +02:00
Alexandre Riera bbf1c40987 Merge branch 'master' into hotfix-dms-hasFile
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 12:48:06 +00:00
Alexandre Riera 2975e7fae3 hotfix savesign
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:46:46 +02:00
Vicent Llopis 38e5660e61 refs #5542 refactorizado "abono" para que siempre cree un único ticket abono 2023-04-21 13:59:28 +02:00
Alex Moreno 294bf2b8a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-21 13:30:34 +02:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Carlos Satorres a9caa92f5c refs #4764 boton abonar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 12:46:01 +02:00
Vicent Llopis 5af961ac69 fix: maneja si se elimina la sale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 09:53:21 +02:00
Pablo Natek de3b4f37c2 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 05:54:00 +00:00
Juan Ferrer 6f1744baff Merge branch 'dev' into 5517-improveLogs+translations 2023-04-20 16:30:24 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Alex Moreno bde81e685f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 07:55:46 +02:00
Alex Moreno db19f153fb refs #5488 removes 'role =='
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 15:03:23 +02:00
Joan Sanchez a0d8ed1433 E2e fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 11:33:36 +02:00
Alex Moreno 560b5b374f Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 05:37:12 +00:00
Vicent Llopis d99815356a refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 07:26:35 +02:00
Alex Moreno 0c475be10b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 14:23:02 +02:00
Joan Sanchez 3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:00:52 +02:00
Joan Sanchez 610f51aaf8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 08:59:49 +02:00
Joan Sanchez 02c573bd23 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-17 08:57:24 +02:00
Alex Moreno 0bfdbcb750 refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:44:24 +02:00
Joan Sanchez 51e42e485b Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-17 06:44:17 +00:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Juan Ferrer b4ef49cf24 Merge branch 'dev' into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 16:48:11 +00:00
Alexandre Riera 8ade602563 hotfix one sign for every ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 14:18:01 +02:00
Carlos Satorres a2ddbd8a66 refs #5284 test update
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 14:04:10 +02:00
Joan Sanchez 6d5167ab7f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:47:18 +02:00
Carlos Satorres 90268a79b0 refs #5284 test createClaim
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:41:10 +02:00
Carlos Satorres 44eab101cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo 2023-04-13 08:44:56 +02:00
Vicent Llopis 3790e3457f refs #5517 añadidas más traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:43:42 +02:00
Vicent Llopis 2a2d03e05a refs #5517 añadidas traducciones de algunos modelos
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 15:02:21 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:33:14 +02:00
Pablo Natek c928274e24 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 13:19:54 +00:00
Vicent Llopis cd6a6f65b3 Merge branch '5327-ticket.sale_ordenarPorColumnas' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 07:45:20 +02:00
Vicent Llopis cc9ce65678 test 2023-04-11 07:44:25 +02:00
Vicent Llopis faab024e24 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 09:59:45 +02:00
Carlos Satorres 8741a9f913 Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 06:51:21 +00:00
Joan Sanchez ca30aaa18a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 08:39:43 +02:00
Carlos Satorres 77b91b77b2 refs #5439 requesterFk solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:19:50 +02:00
Carlos Andrés 0372d44415 fixes #5529 Fixes: missing awaits, buffer-to-file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:00:28 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Joan Sanchez ea60e31361 Merge pull request '5432-propiedadesBotonMas' (!1396) from 5432-propiedadesBotonMas into dev
Reviewed-on: #1396
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-30 05:19:28 +00:00
Carlos Satorres bf5f1011e8 refs #5490 traducción corregida
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:56:20 +02:00
Pablo Natek 2c01ebf681 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 13:26:17 +02:00
Alexandre Riera 4e5364dc0b refs #5036 fix tests logs
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 10:05:02 +01:00
Vicent Llopis 34126119e2 fix errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 09:02:22 +01:00
Joan Sanchez 7b5e0bae8e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 08:20:33 +01:00
Vicent Llopis 0579c563b9 refs #5327 ordernar por columnas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 15:03:12 +01:00
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:37:57 +00:00
Alexandre Riera 81472a5e50 removed duplicated log
gitea/salix/pipeline/head Build queued... Details
2023-03-22 11:36:28 +01:00
Alexandre Riera 59c3ef23de grabUser added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 11:03:13 +01:00
Carlos Satorres f0f2a8c731 refs #5432 quitar comentario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 13:41:32 +01:00
Carlos Satorres a670795f9d refs #5432 mod ng-show, add tooltip and disabled 2023-03-20 13:22:21 +01:00
Alexandre Riera 668fa73386 refs #4632 deleted return in definition
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:32:00 +01:00
Alexandre Riera 60162fe71f refs #4632 removed return
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:30:53 +01:00
Alexandre Riera c0094d8047 Merge branch '4632-guardarFirmas-salix' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:07:21 +01:00
Alexandre Riera a0be5c50fc refs #4632 changed packed from boxed 2023-03-16 09:07:19 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head Build queued... Details
2023-03-16 08:06:17 +00:00
Alexandre Riera 6e2269b428 refs #4632 removed alert level id from code
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:04:57 +01:00
Alexandre Riera a99bd2577a refs #4632 changed route from TicketDms to Ticket
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 08:24:34 +01:00
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 06:42:39 +00:00
Joan Sanchez dc936fe690 Merge branch 'dev' into 5182-print_publish
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 07:05:14 +00:00
Carlos Andrés 67f9cae2f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:04:45 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 08:17:46 +01:00
Joan Sanchez 63d7dafcde feat(print): added reusable pdf print functions
gitea/salix/pipeline/head There was a failure building this commit Details
Refs #5182
2023-03-13 15:05:19 +01:00
Alexandre Riera 0cac62da76 Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 09:02:54 +00:00
Alexandre Riera 4f78eaa14c Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 08:29:43 +00:00
Alexandre Riera 7c3c3a2d66 refs #4632 added userError
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 08:31:38 +01:00
Vicent Llopis e20464cc7c update css
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 13:14:06 +01:00
Alexandre Riera 423ae85212 refs #4632 dmsRecover deprecated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:29:09 +01:00
Alexandre Riera 06dd72f30c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix 2023-03-08 12:13:48 +01:00
Carlos Satorres 955e55a7f4 refs #5284 new onCreateClaimAccepted y createClaim
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 15:43:48 +01:00
Alexandre Riera 59a3ff0f7b Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 12:10:24 +00:00
Alexandre Riera 21c7b18de9 refs #5036 make logs/querys only when grabUser is disabled
gitea/salix/pipeline/head Build queued... Details
2023-03-07 13:10:02 +01:00
Vicent Llopis e39690c2c9 merge with dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 10:21:10 +01:00
Vicent Llopis 5248fd7fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-06 10:20:57 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Joan Sanchez 32b3284e40 Merge pull request 'refs #5115 transfer_sales' (!1344) from 5115-transfer_sales into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1344
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:31:20 +00:00
Joan Sanchez 84dc95621d Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1348
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:30:17 +00:00
Joan Sanchez d819a13597 Merge pull request '5240-ticket.sale-tracking' (!1353) from 5240-ticket.sale-tracking into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1353
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:28:01 +00:00
Guillermo Bonet 707ae232a7 refs #5193 ticketCreateWithUser to ticket_add
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 12:24:36 +01:00
Alexandre Riera 915c598c0c fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 09:04:53 +01:00
Alexandre Riera 2e09845dbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund
gitea/salix/pipeline/head Build queued... Details
2023-03-01 08:29:58 +01:00
Vicent Llopis 8a1a7d7159 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 08:20:28 +01:00
Alexandre Riera b2bf7f2727 refs #5149 fixing e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 14:29:31 +01:00
Alexandre Riera e9dca9211c refs #5149 checked if ticket has refunds, added translations
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 13:42:18 +01:00
Alexandre Riera 76cd2d160e Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-02-27 06:05:21 +00:00
Alexandre Riera 2a4d41cbca refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-24 14:41:02 +01:00
Alexandre Riera 6590c6f1fa refs #5036 transferSales also transfer sale's logs
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 08:55:04 +01:00
Robert Ferrús 1e23dfe34e Merge branch 'dev' into 5115-transfer_sales
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 10:00:32 +00:00
Carlos Andrés 4cc6485cbd refs #5000 Invoicing RC
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-23 09:25:23 +01:00
Alexandre Riera 42b8f08a4d refs #5168 checked sales with logs
gitea/salix/pipeline/head This commit looks good Details
2023-02-22 12:14:17 +01:00
Alexandre Riera be8d19a9f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 09:27:38 +01:00
Vicent Llopis 432c8a9ab8 refactor: cambiados estilos de los chips
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 10:56:46 +01:00
Joan Sanchez 4c2878e232 Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 09:48:47 +01:00
Vicent Llopis 26d72a7b3f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund 2023-02-20 11:49:17 +01:00
Alexandre Riera 77066b2005 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-02-20 09:20:30 +01:00
Joan Sanchez 86dd299292 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:52 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:34 +01:00
Joan Sanchez 527caf9ca0 refactor(zerofill): deprecated zerofill and removed function
gitea/salix/pipeline/head This commit looks good Details
Refs: #5207
2023-02-17 11:19:35 +01:00
Vicent Llopis 4001a75916 Merge branch 'dev' into 5180-invoice-out_refund
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 08:57:48 +00:00
Vicent Llopis b5d2d53435 fix: test back
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 10:45:13 +01:00
Vicent Llopis 73ae45c2c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-15 15:08:58 +01:00
Vicent Llopis a5a0256e44 feat: añadido parametro que indica si genera uno o multiples ticket de abono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-14 10:58:41 +01:00
Alexandre Riera e5e86de8d2 Merge branch 'dev' into 5152-ticketBasicData-stepTwo
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 07:07:12 +00:00
Alexandre Riera 76ed4d2d4b refs #5194 fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 10:16:28 +01:00
Vicent Llopis 4da8546bdf Merge branch 'dev' into 2952-ticket.sale-tracking_part2
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 07:14:28 +00:00
Pau 294b4acbe2 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 06:03:21 +00:00
Alexandre Riera 6cb815faaf .
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-10 10:13:41 +01:00
Alexandre Riera a468fb2c66 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head Build queued... Details
2023-02-10 09:02:44 +01:00
Alexandre Riera 9dc07d88d6 fixing e2e
gitea/salix/pipeline/head This commit looks good Details
2023-02-10 08:56:30 +01:00
Alexandre Riera 194069c0c2 refs #5194 fixed stock, lines 2023-02-10 08:46:54 +01:00
Alex Moreno bbf68a88a7 feat: sendEmail checkBox and docuware open clientBalanceCreate with default data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 10:26:55 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 09:16:30 +01:00
Joan Sanchez 461799f137 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 08:56:30 +01:00
Alexandre Riera ef5b29d6f3 hotfix ticketFutureAdvance warehouse
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 13:47:35 +01:00
Alexandre Riera 4413c8828b refs #5152 added confirmation popup
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 10:54:21 +01:00
Pau 86e6672e49 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 13:39:36 +00:00
Vicent Llopis cec7602e1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-07 13:44:53 +01:00
Vicent Llopis 2e8aabab14 fix: type relation in models
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 14:32:54 +01:00
Vicent Llopis 499c9fa706 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 14:03:38 +01:00
Vicent Llopis a2f93e68b1 feat: add 'parking' column
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 13:57:04 +01:00
Alexandre Riera 0c91f95762 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-02-03 12:03:16 +01:00
Alex Moreno 575784c870 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-03 10:03:59 +01:00
Pau 6c8609e180 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 07:52:14 +00:00
Vicent Llopis 508bce73bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 08:41:35 +01:00
Pau 199dd2ba8d Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 06:09:38 +00:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Joan Sanchez eded1ebf20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 11:42:48 +01:00
Pau cadd525380 Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:36:07 +00:00
Alexandre Riera 5f656a894f buscador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:52:38 +01:00
Alexandre Riera 52a3f77bc5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:39:28 +01:00
Joan Sanchez 7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:23:17 +01:00
Pau dcd74bacc0 refs #5181 @1h30
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:32:22 +01:00
Alex Moreno 2528b2d3ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:10:51 +01:00
Alexandre Riera 349829e5ed refs #5131 fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:29:00 +01:00
Alexandre Riera 3622eda589 refs #5131 added lines liters to origin ticket
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:09:16 +01:00
Pau 5c0354bc17 add method to check if the ticket has refunds
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:26:57 +01:00
Alexandre Riera 19d7e7e610 refs #5131 totalWithVat order
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:23:40 +01:00
Alexandre Riera b70557ee86 refs #5131 agencies icon
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:20:08 +01:00
Alexandre Riera 87bef62e35 refs #5131 hasStock refers to origin
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:21:51 +01:00
Alexandre Riera e5b7ebd8b4 refs #5131 IPT null or value
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:06:58 +01:00
Alexandre Riera 331b278726 refs #5131 checkbox pending origin destination
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 13:00:25 +01:00
Pau 20ffcff219 Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:57:56 +00:00
Alexandre Riera 9d0891e080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:43:49 +01:00
Alexandre Riera c121f184b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:43:26 +01:00
Alex Moreno 4740cdbbb9 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:37:18 +01:00
Alexandre Riera 7d617c0ac4 refs #5129 translations and userErrors added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 09:04:45 +01:00
Alex Moreno d2b21d401a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 14:27:22 +01:00
Joan Sanchez 8969882793 Removed where property dependency
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 14:13:38 +01:00
Robert Ferrús 7614b48c9a refs #5115 transfer_sales
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 11:44:14 +01:00
Pau b1de5bc94e refs #5174, fix banch being created from another branch and not from dev
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 10:06:46 +01:00
Alexandre Riera 35157207dd refs #5077 hours set 00:00:00 only when date change
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 10:05:03 +01:00
Joan Sanchez 9bf4cd5cff Merge branch 'dev' into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 08:20:32 +00:00
Alexandre Riera d69b204c4c refs #5036 loggable refactored, tests fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 15:49:30 +01:00
Vicent Llopis 366748a136 fix: se la pasa la fecha shipped para calcular el visible y disponible
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 14:00:29 +01:00
Vicent Llopis caf1dcd690 feat: añadido almacén por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:19:33 +01:00
Alexandre Riera b72cce9d06 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 08:56:07 +01:00
Alex Moreno 1f52d04d4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-24 15:01:26 +01:00
Joan Sanchez 3076123c04 Updated models relation
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:05:50 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 15:24:00 +01:00
Alex Moreno 8a844917ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 08:07:14 +01:00
Vicent Llopis 9523991b04 fix: mostrar descriptor worker en vez de item
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:45:02 +01:00
Vicent Llopis ab1a9389cb fix: cambiados de donde coge el item id
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:37:41 +01:00
Vicent Llopis b1be6addd1 fix: delete unnecessary code
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:16:06 +01:00
Alexandre Riera e6d6e85217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 13:19:56 +01:00
Alexandre Riera 98d6322b0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 08:00:20 +01:00
Alexandre Riera 2b7383af74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:11:19 +01:00
Pau 3a1aea2afd Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:01:45 +00:00
Alexandre Riera c47cac7d55 refs #5020 isActive column added, filter in front
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 08:54:26 +01:00
Alexandre Riera fea76f29e7 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 07:31:45 +00:00
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +01:00
Alexandre Riera 4d12e29b3d refs #5061 fix filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 14:24:53 +01:00
Alexandre Riera b78bebf27c refs #5061 added hour in date, changed ipt filter
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:22:22 +01:00
Pau 34508425a9 Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 07:08:19 +00:00
Pau 05dfcfd864 Merge branch '4605-Create-Model-PackagingMistake' of https://gitea.verdnatura.es/verdnatura/salix into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 15:42:02 +01:00
Pau a8e4c9e1de cambiar fks por relaciones 2023-01-13 15:42:00 +01:00
Alex Moreno 9a3fea99ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send 2023-01-13 13:45:10 +01:00
Alex Moreno def41c011c feat(docuware_upload): send to trash last file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 13:33:59 +01:00
Joan Sanchez c489c4c6a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 08:55:01 +01:00
Alex Moreno 5bb66fec3f test(docuware): back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:16:38 +01:00
Pau d5a7691b9c add controller function
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 12:56:51 +01:00
Pau b6de50848a refs #5081 fix sms faltas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:48:44 +01:00
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Alex Moreno c2f4648b5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 07:54:09 +01:00
Alex Moreno 9f324483d6 refactor(docuware): only use axios and refactor all
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 15:19:09 +01:00
Alexandre Riera a0491de9f9 refs #5036 refactor transaction and fixing ticket logs
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 13:24:55 +01:00
Pau 30524e382b Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 09:23:40 +00:00
Alex Moreno b8fe919b2a feat(docuware): upload deliveryNote file
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 15:03:23 +01:00
Pau 4f2472ea90 Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 13:56:15 +01:00
Pau d540e278eb refs #4605 @30min
gitea/salix/pipeline/head This commit is unstable Details
2023-01-10 13:52:30 +01:00
Alex Moreno 382aad2622 feat(docuware): upload and send pdf
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 15:11:53 +01:00
Alex Moreno 46f36e1de1 try
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-04 15:03:45 +01:00
Vicent Llopis 415fa04e3b refs #2952 feat: add chips
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 13:06:30 +01:00
Vicent Llopis fa58ac2462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:13:47 +01:00
Vicent Llopis d5b626434b refactor: add translations, change css...
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:42:51 +01:00
Vicent Llopis ab0af27f8b refactor: delete changes in ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:23:41 +01:00