Commit Graph

2798 Commits

Author SHA1 Message Date
Alex Moreno 040e9e4197 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight 2023-07-05 12:50:45 +02:00
Alex Moreno 444b08c566 refs #5712 test(docuware) 2023-07-05 12:09:52 +02:00
Carlos Satorres f42273006c refs #4764 service ant 2023-07-05 07:36:01 +02:00
Carlos Satorres 3b81198a05 refs #4764 mod button 2023-07-04 13:57:52 +02:00
Carlos Satorres 6b813cb859 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-07-04 11:54:19 +02:00
Alex Moreno c7b9d0827e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware 2023-07-03 13:42:54 +02:00
Carlos Satorres d03df4c5cc refs #5690 ticketproblems 2023-07-03 11:38:38 +02:00
Vicent Llopis 7b4e8570aa refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker 2023-06-30 12:03:26 +02:00
Alex Moreno f636c3b1ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-30 11:57:56 +02:00
Alex Moreno 5f42ee5f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-30 07:55:47 +02:00
Javi Gallego bc4058512a Merge branch 'test' into 5900-removeDuplicatedLogs 2023-06-29 12:43:16 +00:00
Vicent Llopis 011db142d3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-06-29 12:49:55 +02:00
Carlos Andrés 1d993c74e5 refs #5590 fix total invoiceOut 2023-06-29 10:39:07 +02:00
Carlos Satorres 454cf30de7 refs #4764 boton save 2023-06-29 08:27:20 +02:00
Carlos Satorres 319c6af354 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-29 06:37:23 +02:00
Vicent Llopis e3e0c7e97a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa 2023-06-28 14:31:54 +02:00
Alex Moreno befa385830 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware 2023-06-28 14:30:20 +02:00
Alex Moreno f8a972c2f2 refs #5094 fix translation 2023-06-27 14:48:22 +02:00
Alex Moreno ecf742959c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-06-26 11:55:28 +02:00
Juan Ferrer e32a29fc09 refs #5900 Remove duplicated logs 2023-06-25 19:08:13 +02:00
Vicent Llopis a699e2d874 refs #5244 feat: añadido 'depatments' como binding 2023-06-21 14:07:36 +02:00
Vicent Llopis dd75302bbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-06-21 13:33:09 +02:00
Vicent Llopis e99627c0b2 codigo innecesario 2023-06-20 11:28:25 +02:00
Vicent Llopis cea6fae649 fix: eliminada variable que no estaba definida 2023-06-20 10:40:57 +02:00
Alex Moreno 5a6a18c76a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-20 09:20:54 +02:00
Carlos Satorres 8dd360bf1e refs #4764 e2e solve 2023-06-19 08:46:15 +02:00
Vicent Llopis 55e123e795 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-06-16 11:45:08 +02:00
Carlos Satorres fbe4441eda refs #4764 e2e solve 2023-06-16 09:06:25 +02:00
Alex Moreno 50fe53fbb6 Merge branch 'test' into warnFix_ticket_sale_orderBy 2023-06-16 05:38:14 +00:00
Carlos Satorres 9b950cd8d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-16 07:23:41 +02:00
Alex Moreno 5163b7b253 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-15 15:14:41 +02:00
Carlos Satorres b3022d0ce2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-14 17:47:56 +02:00
Sergio De la torre c62e6fa0eb refs #5651 packingSiteAdvanced 2023-06-14 10:51:22 +02:00
Juan Ferrer 961941ecb3 refs #5667 TicketRequest translations added/fixed 2023-06-13 20:52:26 +02:00
Alex Moreno 92953b9aa8 refs #5094 test(docuware): adapt tests 2023-06-13 11:37:35 +02:00
Alex Moreno a07ca62476 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware 2023-06-13 07:11:39 +02:00
Alex Moreno d3c4a6ba5c refs #5094 feat(ticket_index): docuware multiple deliveryNote 2023-06-12 15:20:46 +02:00
Carlos Satorres 58bcad7b2d refs #4764 validator create 2023-06-12 12:42:30 +02:00
Carlos Satorres c9bf74dcc4 Merge branch 'dev' into 5635-contadotTicketExpedition 2023-06-12 09:56:34 +00:00
Alex Moreno 2c0c0f24b0 reactive 2023-06-12 08:36:19 +02:00
Alex Moreno 1a58424531 refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType 2023-06-12 08:33:31 +02:00
Alexandre Riera 48ee29568d Merge branch 'dev' into 5595-modify-loggable-tables-in-procs 2023-06-12 05:26:28 +00:00
Carlos Satorres 06d1334e1f refs #4764 withWarehouse 2023-06-09 14:30:46 +02:00
Carlos Satorres 9ca82a2f79 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-09 14:23:55 +02:00
Carlos Satorres 61d9e2dcd3 refs #4764 remake refund, back front 2023-06-09 14:19:17 +02:00
Alexandre Riera 81a96e7d82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs 2023-06-09 09:03:23 +02:00
Carlos Satorres ec9dfa90fd refs #5760 fixtures 2023-06-09 08:06:45 +02:00
Carlos Satorres bdffc0401f refs #5760 update getChanges, traduccion 2023-06-08 15:29:03 +02:00
Vicent Llopis 1e759119db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-06-08 11:13:07 +02:00
Vicent Llopis cf559b2ba5 refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono 2023-06-08 09:19:57 +02:00
Vicent Llopis a88166cdb5 Merge branch 'dev' into 5252-canRefund_withOutWarehouse2 2023-06-08 05:15:24 +00:00
Juan Ferrer 9a63ce86aa refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models 2023-06-07 23:54:27 +02:00
Juan Ferrer 980ea67c24 Merge pull request 'test' (!1596) from test into dev
Reviewed-on: #1596
2023-06-07 21:02:22 +00:00
Vicent Llopis e2c7a38e82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2 2023-06-07 14:18:36 +02:00
Carlos Satorres a34519f6d0 refs #4764 refundTicket 2023-06-07 14:12:04 +02:00
Alex Moreno e5ababb0a9 Merge branch 'dev' into 5712-workerDms_integrateDocuware 2023-06-07 11:49:40 +00:00
Alexandre Riera 7121b1e516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs 2023-06-07 08:50:53 +02:00
Carlos Satorres d09075d490 Merge branch 'dev' into 5635-contadotTicketExpedition 2023-06-07 05:57:05 +00:00
Vicent Llopis 391dba6d2c refs #5561 feat: add async functions 2023-06-06 12:15:39 +02:00
Vicent Llopis 024cb1e3f4 refs #5561 feat: permite modificar registros 2023-06-06 11:56:14 +02:00
Carlos Satorres 05111c9268 hotfix test front 2023-06-06 11:43:14 +02:00
Carlos Satorres 6f3704c365 hotfix colors ticket advance ticket future 2023-06-06 11:42:35 +02:00
Carlos Satorres 4d333c3a68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-05 10:38:59 +02:00
Vicent Llopis 5eac9d20dc a 2023-06-05 09:43:39 +02:00
Vicent Llopis b253ea8edf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel 2023-06-05 09:40:23 +02:00
Alex Moreno bca7224f74 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-05 08:09:16 +02:00
Vicent Llopis 67413360c6 refs #5561 feat: utilizar métodos bd 2023-06-02 13:31:41 +02:00
Vicent Llopis ba64dbbe46 refs #5561 refactor: actualizados nombres 2023-06-02 12:20:29 +02:00
Vicent Llopis 02d2afcb8b refs #5561 feat: permite coloear todos los circulos 2023-06-02 10:57:28 +02:00
Vicent Llopis cf2bf0a17b refs #5561 delete: codigo obsoleto 2023-06-02 08:23:44 +02:00
Vicent Llopis d727ea83ab refs # 5561 feat: cambiar url del crud-model 2023-06-01 15:31:16 +02:00
Vicent Llopis 0d85069e0f refs #5561 feat: permite colorear 2023-06-01 15:01:38 +02:00
Alexandre Riera f9528b922c refs #5595 added userId in options 2023-06-01 08:32:06 +02:00
Alex Moreno 0aed2c2c08 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-05-31 13:10:25 +02:00
Vicent Llopis 3b4626ee74 a 2023-05-31 13:01:16 +02:00
Vicent Llopis 02665ec8e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-05-31 12:28:13 +02:00
Alex Moreno 9ebac5a3f8 Merge branch 'dev' into 5712-workerDms_integrateDocuware 2023-05-31 09:40:32 +00:00
Alexandre Riera eeadd72cc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs 2023-05-31 09:53:56 +02:00
Carlos Satorres d6c588d7eb Merge branch 'dev' into 5398-fixErrorWarehouses 2023-05-30 14:02:54 +00:00
Carlos Satorres 2c3869d961 refs #5398 capital letters 2023-05-30 15:48:09 +02:00
Alex Moreno c23d8282eb refs #5712 feat(workerDms): docuware download 2023-05-30 15:34:11 +02:00
Vicent Llopis daeed312d0 refs #5244 fix: añadido vn-drop-down em html 2023-05-30 15:16:15 +02:00
Vicent Llopis 6cf1e0953d refs #5244 feat: intento de crear el componente workerAutocomplete 2023-05-30 14:49:28 +02:00
Alexandre Riera 632662c440 refs #5595 added userId in makeInvoice 2023-05-30 10:49:10 +02:00
Alexandre Riera e05d3b0793 Merge branch 'dev' into 5595-modify-loggable-tables-in-procs 2023-05-30 08:27:35 +00:00
Alexandre Riera 153542d2be refs #5595 taking active connection 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 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 2023-05-30 07:16:38 +00:00
Vicent Llopis 27700bd72c Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas 2023-05-30 06:14:48 +00:00
Vicent Llopis d2355412a0 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas 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 2023-05-29 07:24:28 +00:00
Carlos Satorres 1593b4b626 Merge branch 'dev' into 5398-Agencys&WarehousesData 2023-05-29 07:09:08 +00:00
Carlos Satorres 95c438b73a refs #5648 move claimSure 2023-05-26 14:52:47 +02:00
Vicent Llopis 3ecfbe2052 refs #5252 refactor: creadas varaibles 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 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 2023-05-26 07:41:48 +02:00
Juan Ferrer 27d4d10472 refs #5667 Expedition translation fixes 2023-05-25 18:32:03 +02:00
Vicent Llopis 71d8a355bd refs #5252 fix: te2e 2023-05-25 15:03:22 +02:00
Vicent Llopis 96feb24f12 refs #5252 fix: back test 2023-05-25 13:28:44 +02:00
Alexandre Riera a584e1ab5e Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos 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 2023-05-25 13:00:11 +02:00
Carlos Satorres fa8fd8d5bc refs #5398 update from oldbranch 2023-05-25 11:41:14 +02:00
Carlos Satorres d82a7eeeb7 Merge branch 'dev' into 5328-abonarTodoTicket 2023-05-25 08:25:47 +00:00
Alex Moreno a0da78700b Merge branch 'dev' into 5678-sale-canEdit-notSale 2023-05-25 07:49:40 +00:00
Alex Moreno 37a3275b27 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-05-25 08:56:10 +02:00
Carlos Satorres 1f24314ab2 refs #5635 fix back 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 2023-05-25 07:34:54 +02:00
Alex Moreno 42a39b6778 refs #5706 master to test 2023-05-25 07:22:56 +02:00
Alex Moreno 03e2b98485 hotFix(closeAll): fix where 2023-05-24 15:50:59 +02:00
Alex Moreno 6b66eb3bb2 refs #5679 typo 2023-05-24 12:59:58 +02:00
Carlos Satorres d6d72ed289 refs #5635 smart-table, counter, filter 2023-05-24 12:35:07 +02:00
Alexandre Riera 133c5dbca5 Merge branch 'dev' into 5677-fallo-saveSign 2023-05-24 10:18:26 +00:00
Alexandre Riera 05fb0a7203 refs #5677 tickets without state fixed 2023-05-24 12:16:19 +02:00
Alex Moreno 30c896c975 refs #5678 feat(sale_canEdit): handle exist sale 2023-05-24 11:20:07 +02:00
Carlos Satorres 9b363bc7a4 refs #5635 remove vn, smart-table 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 2023-05-24 07:46:08 +02:00
Vicent Llopis 1ddad7a5ec Merge branch 'dev' into 5609-ticket.index_searchByFilter 2023-05-24 05:45:04 +00:00
Alex Moreno 6a6d28efa0 Merge branch 'dev' into 5488-use_checkAccessAcl 2023-05-24 05:40:11 +00:00
Alexandre Riera 97653d9b8f Merge branch 'dev' into 5581-transferir-lineas 2023-05-24 05:07:33 +00:00
Vicent Llopis 3119ae4471 refs #5609 delete: console.log 2023-05-23 15:12:20 +02:00
Vicent Llopis 2c7473b064 refs #5252 feat: permite crear un abono con o sin almacén 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 2023-05-23 13:45:03 +02:00
Carlos Satorres d7d94796d6 Merge branch 'dev' into 5599-ticketColors 2023-05-23 07:13:47 +00:00
Alexandre Riera bf8d82f3c6 refs #5581 refresh model 2023-05-23 08:43:31 +02:00
Carlos Satorres ee8685329f Merge branch 'dev' into 5599-ticketColors 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 2023-05-23 06:02:17 +00:00
Alexandre Riera b9f6dc0a39 Merge branch 'dev' into 5581-transferir-lineas 2023-05-23 05:54:12 +00:00
Alexandre Riera 0e11bfab0b refs #5581 ticketId != id 2023-05-23 07:53:25 +02:00
Juan Ferrer da0aa57539 Merge branch 'test' into dev 2023-05-22 19:06:20 +02:00
Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test
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 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 2023-05-22 12:02:07 +02:00
Carlos Satorres 1b19035d8d refs #5648 vn-confirm 2023-05-22 10:41:02 +02:00
Carlos Satorres 23287e5ebf refs #5648 setTimeout 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 2023-05-20 16:59:39 +02:00
Vicent Llopis 8eedba8a66 refs #5609 feat: solo muestra error cuando hay 'from' sin 'to y viceversa 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 2023-05-19 10:30:36 +02:00
Vicent Llopis 8cf988b7d2 refs #5638 refactor: code 2023-05-19 08:02:17 +02:00
Carlos Satorres 2b1e951692 refs #5635 smart-table 2023-05-18 15:33:54 +02:00
Alex Moreno f54d9180b1 fix front test 2023-05-18 14:44:05 +02:00
Alex Moreno 15a1965a53 refs #5094 add scopes 2023-05-18 14:12:46 +02:00
Vicent Llopis ec02972efb refs #5609 mostrar filtro por defecto 2023-05-18 14:11:29 +02:00
Vicent Llopis d33a84c39f refs #5638 feat: updated backTest 2023-05-18 09:30:21 +02:00
Vicent Llopis 463d209d77 refs #5638 refactor: eliminado if innecesario 2023-05-18 09:21:30 +02:00
Vicent Llopis 9263684ec5 refs #5638 fix: contempla que se le pase un filtro del 'nombre' 2023-05-18 08:58:13 +02:00
Vicent Llopis b66362d313 refs #5638 fix: cambiado nombre de variable 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 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 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 2023-05-18 07:17:31 +02:00
Juan Ferrer 48da4b13ff refs #5667 Ticket translation fixes 2023-05-17 17:08:20 +02:00
Alex Moreno 02451818ef typo 2023-05-17 14:31:19 +02:00
Carlos Satorres 69a25d8d03 refs #5696 horas a 00 2023-05-17 14:04:13 +02:00
Alex Moreno 6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl 2023-05-17 11:43:25 +00:00
Carlos Satorres c31eee4906 refs #5696 landed 2023-05-17 13:35:55 +02:00
Alexandre Riera 0d980334b8 refs #5634 conditional merge 2023-05-17 12:41:00 +02:00
Juan Ferrer fa40bd9811 refs #5667 Style & translation fixes 2023-05-17 10:18:41 +02:00
Juan Ferrer 30d6f56c39 refs #5667 Style fixes, model translations 2023-05-16 20:06:14 +02:00
Alex Moreno 08fcbebbaf refs #5488 polish specifics acls 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 2023-05-12 15:50:32 +02:00
Carlos Satorres ce62b51b29 refs #4764 remove br 2023-05-12 15:08:04 +02:00
Carlos Satorres ece2875b38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket 2023-05-12 12:30:34 +02:00
Carlos Satorres 9cbf3006a0 refs #5599 futureState 2023-05-12 11:17:51 +02:00
Vicent Llopis 2ed99426ef eliminado focus 2023-05-11 10:18:02 +02:00
Vicent Llopis 90b844062d refs #5327 add frontTest 2023-05-11 10:17:41 +02:00
Vicent Llopis 59f4b63db7 borrado espacio 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 2023-05-11 10:03:07 +02:00
Vicent Llopis 8ed17d99c3 refs #5327 permite filtrar por columnas (desde el front) 2023-05-11 10:02:45 +02:00
Alex Moreno 7704256079 master to test 2023-05-11 08:00:49 +02:00
Carlos Satorres 43a91194fd refs #5599 remove e2e 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 2023-05-10 14:49:19 +02:00
Carlos Satorres 9a813c075c refs #5599 procedure y colorClass 2023-05-10 14:43:08 +02:00
Carlos Satorres c59915f951 refs #5599 procedure 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 2023-05-10 11:55:56 +02:00
Carlos Satorres 61d6f47162 refs #5599 remove returns 2023-05-10 11:31:58 +02:00
Carlos Satorres 65646d3b65 refs #4764 validServices 2023-05-09 19:49:16 +02:00
Carlos Satorres 212b848131 refs #4764 check selectedvalidservices 2023-05-09 19:43:55 +02:00
Carlos Satorres aa96f1eb97 refs #4764 without checkbox 2023-05-09 19:42:25 +02:00
Carlos Satorres 78f337c6d4 refs 4764 quit index 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 2023-05-09 11:33:28 +02:00
Juan Ferrer 2aaded4ed4 refs #5517 Fix: Show spinner when loading 2023-05-08 16:30:21 +02:00
Carlos Satorres 0b2c91466e refs #5648 create vn-confirm 2023-05-08 13:25:42 +02:00
Carlos Satorres 202544565e refs #4764 mod query post 2023-05-08 11:36:52 +02:00
Alex Moreno 7273dd4f1e Merge branch 'dev' into 5488-use_checkAccessAcl 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 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 2023-05-05 13:58:11 +02:00
Carlos Satorres c0e13d3339 refs #4754 del ticket.card.service 2023-05-05 12:00:37 +02:00
Carlos Satorres 80ee73a59b refs #4764 creacion de métodos y back 2023-05-05 10:01:15 +02:00
Carlos Satorres 8119d38414 Merge branch 'dev' 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 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 2023-05-04 09:59:05 +02:00
Alexandre Riera ad3c6dcee2 wip #5595 2023-05-03 14:34:36 +02:00
Carlos Satorres dbd0e5138b refs #5328 fix 2023-05-03 14:12:26 +02:00
Carlos Satorres 3ac1ce403c refs #5328 myOptions 2023-05-03 14:06:57 +02:00
Carlos Satorres 566f03c497 refs #5328 commit prueba 2023-05-03 13:03:14 +02:00
Carlos Satorres 3b2e1ca8d5 ref #5328 refundTicket.id 2023-05-03 12:36:30 +02:00
Carlos Satorres eaf425fb51 refs #5328 mod funcion createTicketRefund 2023-05-03 12:30:33 +02:00
Alex Moreno 4a7902ae4d Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice 2023-05-02 08:41:18 +00:00
Juan Ferrer 2cfd2d9dda Merge branch 'dev' into 5517-improveLogs+translations 2023-04-27 18:13:24 +02:00
Alexandre Riera 3bd5582794 Merge branch 'dev' into 5255-revisar-ticketBoxing 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 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 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 2023-04-26 14:46:16 +02:00
Alex Moreno c1ea1acc8c refs #4614 fear(ticket): add 'set weight' funcionality 2023-04-26 13:49:08 +02:00
Alexandre Riera 1219cfcc5c refs #5255 fixed condition 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 2023-04-25 14:17:46 +02:00
Alex Moreno 0c668c6ade refs #5488 feat(): replace all hasRole to checkAccessAcl 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 2023-04-25 09:40:36 +02:00
Alex Moreno 4cb231759f feat(State/Supplier): replace hasRole to acls 2023-04-25 09:15:05 +02:00
Juan Ferrer 49368a837b refs #5517 Filter improved 2023-04-24 19:10:04 +02:00
Pablo Natek 3e15728db4 Merge branch 'dev' into 5075-client_balance 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 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 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 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 2023-04-24 08:42:32 +02:00
Alexandre Riera bbf1c40987 Merge branch 'master' into hotfix-dms-hasFile 2023-04-21 12:48:06 +00:00
Alexandre Riera 2975e7fae3 hotfix savesign 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 2023-04-21 12:46:01 +02:00
Vicent Llopis 5af961ac69 fix: maneja si se elimina la sale 2023-04-21 09:53:21 +02:00
Pablo Natek de3b4f37c2 Merge branch 'dev' into 5075-client_balance 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 2023-04-19 07:55:46 +02:00
Alex Moreno db19f153fb refs #5488 removes 'role ==' 2023-04-18 15:03:23 +02:00
Joan Sanchez a0d8ed1433 E2e fixes 2023-04-18 11:33:36 +02:00
Alex Moreno 560b5b374f Merge branch 'dev' into 5075-client_balance 2023-04-18 05:37:12 +00:00
Vicent Llopis d99815356a refs #5144 manejado que el usuario sea NULL 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 2023-04-17 14:23:02 +02:00
Joan Sanchez 3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-17 09:00:52 +02:00
Joan Sanchez 610f51aaf8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 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 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
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 2023-04-13 16:48:11 +00:00
Alexandre Riera 8ade602563 hotfix one sign for every ticket 2023-04-13 14:18:01 +02:00
Carlos Satorres a2ddbd8a66 refs #5284 test update 2023-04-13 14:04:10 +02:00
Joan Sanchez 6d5167ab7f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-04-13 13:47:18 +02:00
Carlos Satorres 90268a79b0 refs #5284 test createClaim 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 2023-04-13 08:43:42 +02:00
Vicent Llopis 2a2d03e05a refs #5517 añadidas traducciones de algunos modelos 2023-04-12 15:02:21 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests 2023-04-12 12:33:14 +02:00
Pablo Natek c928274e24 Merge branch 'dev' into 5075-client_balance 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 2023-04-11 07:45:20 +02:00
Vicent Llopis cc9ce65678 test 2023-04-11 07:44:25 +02:00
Vicent Llopis faab024e24 test 2023-04-06 09:59:45 +02:00
Carlos Satorres 8741a9f913 Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra 2023-04-05 06:51:21 +00:00
Joan Sanchez ca30aaa18a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-04-05 08:39:43 +02:00
Carlos Satorres 77b91b77b2 refs #5439 requesterFk solve 2023-04-05 08:19:50 +02:00
Carlos Andrés 0372d44415 fixes #5529 Fixes: missing awaits, buffer-to-file 2023-04-04 15:00:28 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 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 2023-03-28 14:56:20 +02:00
Pablo Natek 2c01ebf681 Merge branch 'dev' into 5075-client_balance 2023-03-28 13:26:17 +02:00
Alexandre Riera 4e5364dc0b refs #5036 fix tests logs 2023-03-23 10:05:02 +01:00
Vicent Llopis 34126119e2 fix errors 2023-03-23 09:02:22 +01:00
Joan Sanchez 7b5e0bae8e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-03-23 08:20:33 +01:00
Vicent Llopis 0579c563b9 refs #5327 ordernar por columnas 2023-03-22 15:03:12 +01:00
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs 2023-03-22 10:37:57 +00:00
Alexandre Riera 81472a5e50 removed duplicated log 2023-03-22 11:36:28 +01:00
Alexandre Riera 59c3ef23de grabUser added 2023-03-22 11:03:13 +01:00
Carlos Satorres f0f2a8c731 refs #5432 quitar comentario 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 2023-03-16 10:32:00 +01:00
Alexandre Riera 60162fe71f refs #4632 removed return 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 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 2023-03-16 08:06:17 +00:00
Alexandre Riera 6e2269b428 refs #4632 removed alert level id from code 2023-03-16 09:04:57 +01:00
Alexandre Riera a99bd2577a refs #4632 changed route from TicketDms to Ticket 2023-03-16 08:24:34 +01:00
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos 2023-03-16 06:42:39 +00:00
Joan Sanchez dc936fe690 Merge branch 'dev' into 5182-print_publish 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 2023-03-14 09:04:45 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor 2023-03-14 08:17:46 +01:00
Joan Sanchez 63d7dafcde feat(print): added reusable pdf print functions
Refs #5182
2023-03-13 15:05:19 +01:00
Alexandre Riera 0cac62da76 Merge branch 'dev' into 5036-regularizar-historicos 2023-03-10 09:02:54 +00:00
Alexandre Riera 4f78eaa14c Merge branch 'dev' into 4632-guardarFirmas-salix 2023-03-09 08:29:43 +00:00
Alexandre Riera 7c3c3a2d66 refs #4632 added userError 2023-03-09 08:31:38 +01:00
Vicent Llopis e20464cc7c update css 2023-03-08 13:14:06 +01:00
Alexandre Riera 423ae85212 refs #4632 dmsRecover deprecated 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 2023-03-07 15:43:48 +01:00
Alexandre Riera 59a3ff0f7b Merge branch 'dev' into 5036-regularizar-historicos 2023-03-07 12:10:24 +00:00
Alexandre Riera 21c7b18de9 refs #5036 make logs/querys only when grabUser is disabled 2023-03-07 13:10:02 +01:00
Vicent Llopis e39690c2c9 merge with dev 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 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
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
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
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 2023-03-01 12:24:36 +01:00
Alexandre Riera 915c598c0c fixed tests 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 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 2023-03-01 08:20:28 +01:00
Alexandre Riera b2bf7f2727 refs #5149 fixing e2e 2023-02-28 14:29:31 +01:00
Alexandre Riera e9dca9211c refs #5149 checked if ticket has refunds, added translations 2023-02-28 13:42:18 +01:00
Alexandre Riera 76cd2d160e Merge branch 'dev' into 5036-regularizar-historicos 2023-02-27 06:05:21 +00:00
Alexandre Riera 2a4d41cbca refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed 2023-02-24 14:41:02 +01:00
Alexandre Riera 6590c6f1fa refs #5036 transferSales also transfer sale's logs 2023-02-24 08:55:04 +01:00
Robert Ferrús 1e23dfe34e Merge branch 'dev' into 5115-transfer_sales 2023-02-23 10:00:32 +00:00
Carlos Andrés 4cc6485cbd refs #5000 Invoicing RC 2023-02-23 09:25:23 +01:00
Alexandre Riera 42b8f08a4d refs #5168 checked sales with logs 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 2023-02-22 09:27:38 +01:00
Vicent Llopis 432c8a9ab8 refactor: cambiados estilos de los chips 2023-02-21 10:56:46 +01:00
Joan Sanchez 4c2878e232 Updated unit tests 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 2023-02-17 13:33:52 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-17 13:33:34 +01:00
Joan Sanchez 527caf9ca0 refactor(zerofill): deprecated zerofill and removed function
Refs: #5207
2023-02-17 11:19:35 +01:00
Vicent Llopis 4001a75916 Merge branch 'dev' into 5180-invoice-out_refund 2023-02-17 08:57:48 +00:00
Vicent Llopis b5d2d53435 fix: test back 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 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 2023-02-14 10:58:41 +01:00
Alexandre Riera e5e86de8d2 Merge branch 'dev' into 5152-ticketBasicData-stepTwo 2023-02-14 07:07:12 +00:00
Alexandre Riera 76ed4d2d4b refs #5194 fixed tests 2023-02-13 10:16:28 +01:00
Vicent Llopis 4da8546bdf Merge branch 'dev' into 2952-ticket.sale-tracking_part2 2023-02-13 07:14:28 +00:00
Pau 294b4acbe2 Merge branch 'dev' into 5181-ticket.summary-recargo 2023-02-13 06:03:21 +00:00
Alexandre Riera 6cb815faaf . 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 2023-02-10 09:02:44 +01:00
Alexandre Riera 9dc07d88d6 fixing e2e 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 2023-02-09 10:26:55 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-02-09 09:16:30 +01:00
Joan Sanchez 461799f137 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-02-09 08:56:30 +01:00
Alexandre Riera ef5b29d6f3 hotfix ticketFutureAdvance warehouse 2023-02-08 13:47:35 +01:00
Alexandre Riera 4413c8828b refs #5152 added confirmation popup 2023-02-08 10:54:21 +01:00
Pau 86e6672e49 Merge branch 'dev' into 5181-ticket.summary-recargo 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 2023-02-07 13:44:53 +01:00
Vicent Llopis 2e8aabab14 fix: type relation in models 2023-02-06 14:32:54 +01:00
Vicent Llopis 499c9fa706 refactor 2023-02-06 14:03:38 +01:00
Vicent Llopis a2f93e68b1 feat: add 'parking' column 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 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 2023-02-03 08:41:35 +01:00
Pau 199dd2ba8d Merge branch 'dev' into 5181-ticket.summary-recargo 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 2023-02-02 11:42:48 +01:00
Pau cadd525380 Merge branch 'dev' into 5174-refactor-ticket-weekly 2023-02-02 08:36:07 +00:00
Alexandre Riera 5f656a894f buscador 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 2023-02-02 08:39:28 +01:00
Joan Sanchez 7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-02-02 08:23:17 +01:00
Pau dcd74bacc0 refs #5181 @1h30 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 2023-02-01 07:10:51 +01:00
Alexandre Riera 349829e5ed refs #5131 fixed tests 2023-01-31 15:29:00 +01:00
Alexandre Riera 3622eda589 refs #5131 added lines liters to origin ticket 2023-01-31 15:09:16 +01:00
Pau 5c0354bc17 add method to check if the ticket has refunds 2023-01-31 14:26:57 +01:00
Alexandre Riera 19d7e7e610 refs #5131 totalWithVat order 2023-01-31 14:23:40 +01:00
Alexandre Riera b70557ee86 refs #5131 agencies icon 2023-01-31 14:20:08 +01:00
Alexandre Riera 87bef62e35 refs #5131 hasStock refers to origin 2023-01-31 13:21:51 +01:00
Alexandre Riera e5b7ebd8b4 refs #5131 IPT null or value 2023-01-31 13:06:58 +01:00
Alexandre Riera 331b278726 refs #5131 checkbox pending origin destination 2023-01-31 13:00:25 +01:00
Pau 20ffcff219 Merge branch 'dev' into 5174-refactor-ticket-weekly 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 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 2023-01-31 11:43:26 +01:00
Alex Moreno 4740cdbbb9 fix: e2e 2023-01-31 10:37:18 +01:00
Alexandre Riera 7d617c0ac4 refs #5129 translations and userErrors added 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 2023-01-30 14:13:38 +01:00
Robert Ferrús 7614b48c9a refs #5115 transfer_sales 2023-01-30 11:44:14 +01:00
Pau b1de5bc94e refs #5174, fix banch being created from another branch and not from dev 2023-01-27 10:06:46 +01:00
Alexandre Riera 35157207dd refs #5077 hours set 00:00:00 only when date change 2023-01-27 10:05:03 +01:00
Joan Sanchez 9bf4cd5cff Merge branch 'dev' into 4480-vnUser 2023-01-27 08:20:32 +00:00
Alexandre Riera d69b204c4c refs #5036 loggable refactored, tests fixed 2023-01-26 15:49:30 +01:00
Vicent Llopis 366748a136 fix: se la pasa la fecha shipped para calcular el visible y disponible 2023-01-26 14:00:29 +01:00
Vicent Llopis caf1dcd690 feat: añadido almacén por defecto 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 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 2023-01-24 09:05:50 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor 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 2023-01-20 12:45:02 +01:00
Vicent Llopis ab1a9389cb fix: cambiados de donde coge el item id 2023-01-20 12:37:41 +01:00
Vicent Llopis b1be6addd1 fix: delete unnecessary code 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 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 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 2023-01-17 10:11:19 +01:00
Pau 3a1aea2afd Merge branch 'dev' into 4605-Create-Model-PackagingMistake 2023-01-17 09:01:45 +00:00
Alexandre Riera c47cac7d55 refs #5020 isActive column added, filter in front 2023-01-17 08:54:26 +01:00
Alexandre Riera fea76f29e7 Merge branch 'dev' into 4866-detalle-faltas 2023-01-17 07:31:45 +00:00
Alex Moreno e27a559416 refactor: replace all Date 2023-01-16 15:18:24 +01:00
Alexandre Riera 4d12e29b3d refs #5061 fix filter 2023-01-16 14:24:53 +01:00
Alexandre Riera b78bebf27c refs #5061 added hour in date, changed ipt filter 2023-01-16 12:22:22 +01:00
Pau 34508425a9 Merge branch 'dev' into 4605-Create-Model-PackagingMistake 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 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 2023-01-13 13:33:59 +01:00
Joan Sanchez c489c4c6a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-01-13 08:55:01 +01:00
Alex Moreno 5bb66fec3f test(docuware): back tests 2023-01-12 15:16:38 +01:00
Pau d5a7691b9c add controller function 2023-01-12 12:56:51 +01:00
Pau b6de50848a refs #5081 fix sms faltas 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 2023-01-12 07:54:09 +01:00
Alex Moreno 9f324483d6 refactor(docuware): only use axios and refactor all 2023-01-11 15:19:09 +01:00
Alexandre Riera a0491de9f9 refs #5036 refactor transaction and fixing ticket logs 2023-01-11 13:24:55 +01:00
Pau 30524e382b Merge branch 'dev' into 4605-Create-Model-PackagingMistake 2023-01-11 09:23:40 +00:00
Alex Moreno b8fe919b2a feat(docuware): upload deliveryNote file 2023-01-10 15:03:23 +01:00
Pau 4f2472ea90 Merge branch 'dev' into 4605-Create-Model-PackagingMistake 2023-01-10 13:56:15 +01:00
Pau d540e278eb refs #4605 @30min 2023-01-10 13:52:30 +01:00
Alex Moreno 382aad2622 feat(docuware): upload and send pdf 2023-01-09 15:11:53 +01:00
Alex Moreno 46f36e1de1 try 2023-01-04 15:03:45 +01:00
Vicent Llopis 415fa04e3b refs #2952 feat: add chips 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 2023-01-03 09:13:47 +01:00
Vicent Llopis d5b626434b refactor: add translations, change css... 2022-12-28 12:42:51 +01:00
Vicent Llopis ab0af27f8b refactor: delete changes in ticket.sale-checked 2022-12-28 12:23:41 +01:00
Vicent Llopis d0ae97e41b refactor: move changes from ticket.sale-checked to ticket.sale-tracking 2022-12-28 12:16:23 +01:00
Alexandre Riera 30197e9e15 Merge branch 'dev' into 4866-detalle-faltas 2022-12-28 09:07:26 +00:00
Vicent Llopis 3dd0c79629 feat: add ItemShelvingSales/filter 2022-12-27 15:00:49 +01:00
Alexandre Riera c06c3dc6a7 refs #4957 saleChecked deleted 2022-12-27 11:50:58 +01:00
Pau 1c1cc93ef4 Merge branch 'master' into Hotfix-crear-report-Factura-Electronica 2022-12-26 06:18:47 +00:00
Vicent Llopis d3a9e9ac89 delete: columnas que ya no existen en la tabla 2022-12-23 12:17:24 +01:00
Vicent Llopis 16c20e4700 feat: add itemShelvingSale popup 2022-12-23 12:08:16 +01:00
Vicent Llopis 682b6d8961 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2022-12-23 09:59:21 +01:00
Joan Sanchez 93c98e05fc fix(discount): handle error for a worker without business contract 2022-12-23 08:27:03 +01:00
Alexandre Riera aec22fad9d Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas 2022-12-23 08:16:36 +01:00
Vicent Llopis 8880a83b89 feat: añadido saleTracking 2022-12-21 15:03:41 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +01:00
Vicent Llopis 3a33750890 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2022-12-21 10:11:37 +01:00
Alexandre Riera 081ef7fc99 Merge branch 'dev' into 3963-ticket-advance 2022-12-21 07:30:17 +00:00
Pau c9b4e1ab9a Merge branch 'dev' into 4791-refactor-sendsms 2022-12-21 06:38:20 +00:00
Vicent Llopis 799c26796e feat: añadidos chips 2022-12-20 15:19:05 +01:00
Pau 90b36bf1ab Fix missing report for the invoice electronic notification 2022-12-20 14:21:01 +01:00
Alexandre Riera 62152d1668 Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas 2022-12-20 12:16:40 +01:00
Alexandre Riera 721123381c Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-20 11:54:22 +01:00
Alexandre Riera 4c6a735235 refs #4962 moved sql and methods to ticket 2022-12-20 11:53:54 +01:00
Alexandre Riera 8403af7db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour 2022-12-20 11:37:40 +01:00
Alexandre Riera 342eec1e41 refs #3963 autoload fixed 2022-12-20 11:36:58 +01:00
Alexandre Riera b356839148 refs #3963 autoload fixed 2022-12-20 11:36:37 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future 2022-12-20 09:54:28 +01:00
Pau 5a01e49f27 Merge branch 'dev' into 4791-refactor-sendsms 2022-12-19 12:25:58 +00:00
Alexandre Riera 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-16 13:45:25 +01:00
Alexandre Riera 98c9e0ac50 refs #4962 autoload added and second header 2022-12-16 13:42:23 +01:00
Alexandre Riera fb4432b088 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour 2022-12-16 13:06:06 +01:00
Alex Moreno 2a8a928ac5 feat: create invoiceIn 2022-12-16 10:36:18 +01:00
Alexandre Riera 855f00b1c9 Merge branch '4700-split-tour' into 3963-ticket-advance 2022-12-16 09:51:40 +01:00
Alexandre Riera 45317c0850 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-15 14:26:10 +01:00
Joan Sanchez c004a2917d Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev
Reviewed-on: #1204
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:24:34 +00:00
Joan Sanchez e6867f6004 Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev
Reviewed-on: #1203
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:20:00 +00:00
Guillermo Bonet 76001ec022 refs #4204 labelCount argument not required 2022-12-14 16:15:41 +01:00
Alexandre Riera f80f851e8d refs #4962 model TicketFuture deleted 2022-12-14 13:10:33 +01:00
Alexandre Riera 2baa4a1954 refs #4962 ticket tour future refactor 2022-12-14 12:26:18 +01:00
Guillermo Bonet b7a369a41c refs #4204 Added param URL labelCount and
changes in the css
2022-12-13 18:05:29 +01:00
Alexandre Riera 050010c09f refs #4700 success translation 2022-12-13 14:03:37 +01:00
Alexandre Riera dce48a8a93 refs #4700 corrections 2022-12-13 14:00:46 +01:00
Alexandre Riera 72c27f7176 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-13 12:37:56 +01:00
Guillermo Bonet d7a6350995 refs #4898 Created report expedition-pallet-label 2022-12-12 18:27:45 +01:00
Alexandre Riera 704cb71b61 refs #4866 instance log added and e2e done 2022-12-07 13:53:59 +01:00
Joan Sanchez e815292d6b fix(componentUpdate): updated filter where sintax 2022-12-01 09:24:56 +01:00
Alex Moreno b769845a28 hotFix: not transfer all sales if all sales is negatives 2022-11-30 14:29:44 +01:00
Vicent Llopis c1089c637a fix: backTest 2022-11-30 13:43:29 +01:00
Vicent Llopis 1588492f9a feat: solo añade los logs de salix con el model 'Sale' 2022-11-30 13:29:39 +01:00
Alexandre Riera cd8d5efa88 corrections 2022-11-29 10:29:18 +01:00
Vicent Llopis d15e2551a2 feat: add frontTest 2022-11-25 12:16:01 +01:00
Vicent Llopis af87fc2d53 fix: modelo incorrecto 2022-11-25 11:51:07 +01:00
Vicent Llopis bca79e1240 feat: add backTest 2022-11-25 11:50:54 +01:00
Alexandre Riera 8fec0670ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-25 10:25:46 +01:00
Pau 8f98082910 refs #4791 @2h 2022-11-25 09:59:02 +01:00
Vicent Llopis e540bf7b31 feat: inserta en la nueva tabla ticketSms 2022-11-25 09:38:34 +01:00
Vicent Llopis 84c6604dd9 feat: enviar sms con cambios en el pedido 2022-11-24 15:04:15 +01:00
Pau 7c71e40cc5 Merge branch 'dev' into 4791-refactor-sendsms 2022-11-24 13:15:54 +00:00
Vicent Llopis 74e8789439 Merge branch 'dev' into 4793-models_translation 2022-11-24 10:54:40 +00:00
Vicent Llopis b8c6734798 Merge branch 'dev' into 4793-models_translation 2022-11-24 09:40:43 +00:00
Pau f74b257d75 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-24 09:27:49 +00:00
Pau 6a30074a6a Merge branch 'dev' into 4789-search-ticket-without-invoice 2022-11-24 09:23:00 +00:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-24 09:59:59 +01:00
Vicent Llopis 7ccf37c079 Merge branch 'dev' into 4793-models_translation 2022-11-24 08:08:56 +00:00
Vicent Llopis 6f2a7a5cef feat: enviar sms con cambios en las líneas 2022-11-23 15:15:40 +01:00
Pau a8520f851c Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-23 08:28:07 +00:00
Pau ad38f50ae3 Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente 2022-11-23 08:55:46 +01:00
Pau ade2e777d6 refs #4457 @30min requested changes 2022-11-23 08:55:44 +01:00
Pau 88db9c0d80 Merge branch '4789-search-ticket-without-invoice' of https://gitea.verdnatura.es/verdnatura/salix into 4789-search-ticket-without-invoice 2022-11-23 08:25:20 +01:00
Pau 4c4e0e109d refactor test to use toBeGreaterThan 2022-11-23 08:25:15 +01:00
Pau b6ff1d99b1 Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms 2022-11-23 08:20:13 +01:00
Pau 0b6d7eaffc refs #4791 @30min fix broken test 2022-11-23 08:20:12 +01:00
Pau 51d3091a40 Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-22 13:45:03 +00:00
Pau bb640da8f0 Merge branch 'dev' into 4789-search-ticket-without-invoice 2022-11-22 13:44:23 +00:00
Alexandre Riera 6656ea4f54 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour 2022-11-22 10:15:31 +01:00
Pau 3b66da20ca Merge branch 'dev' into 4791-refactor-sendsms 2022-11-22 07:01:33 +00:00
Pau 4bd643143b requested changes refs #4791 @1h 2022-11-22 07:59:18 +01:00
Pau cb6ae41c13 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-21 13:45:28 +00:00
Pau fc08b27fb6 Merge branch 'dev' into 4789-search-ticket-without-invoice 2022-11-21 13:42:53 +00:00
Pau 3003290e61 refs #4551 @20min requested changes 2022-11-21 14:38:51 +01:00
Pau 0099b42fe3 requested changes 2022-11-21 14:06:38 +01:00
Alexandre Riera 6ddd2d95a5 insert acl 2022-11-21 11:48:18 +01:00
Alexandre Riera 4c21ffac3b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-21 11:44:53 +01:00
Alexandre Riera 463e56b631 corrections 2022-11-21 11:41:17 +01:00
Pau 153f5f56fa fix test refs #4791 @30min 2022-11-21 09:11:17 +01:00
Pau 4e97d931f7 refs #4791 @2h 2022-11-21 08:45:45 +01:00
Joan Sanchez 813cf78128 Merge branch 'dev' into 4793-models_translation 2022-11-18 14:03:09 +00:00
Joan Sanchez d7729654ee fix(ordersFilter): wrong table schema 2022-11-17 16:48:31 +01:00
Alexandre Riera c4430b4bca fix acl 2022-11-17 08:56:51 +01:00
Pau a733bc8c2f refs #4789 hasInvoice on ticket searchbar @3h30m 2022-11-16 13:36:26 +01:00
Alexandre Riera 66002968f6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-16 11:10:21 +01:00
Alexandre Riera 489df60afc suggested filter added 2022-11-16 11:10:00 +01:00
Alexandre Riera 4feb2bea2c working on e2e 2022-11-16 10:57:15 +01:00
Alexandre Riera 294f806bd9 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-16 09:52:13 +01:00
Alexandre Riera 78dc7db7a7 correcciones 2022-11-16 09:46:35 +01:00
Vicent Llopis 46c7aa24b8 fix: corregidas traducciones 2022-11-16 07:14:45 +01:00
Alexandre Riera b7c9d6ea50 refs #3963 front and back tests fixed 2022-11-15 15:30:00 +01:00
Pau 192d7336a4 change test 2022-11-15 14:22:09 +01:00
Pau 6e58b1de8b refs #4511 Changed fixtures to fix broken test @30min 2022-11-15 14:17:24 +01:00
Vicent Llopis dd8117b6a4 feat: añadidas traducciones 2022-11-15 14:02:31 +01:00
Pau 56893ea58b Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-15 13:42:06 +01:00
Alexandre Riera 09d7c450a2 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-15 13:08:36 +01:00
Alexandre Riera 97a6aff499 fix workerFk 2022-11-15 13:08:06 +01:00
Alexandre Riera 607f61092a Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-15 13:06:10 +01:00
Alexandre Riera 01607c71b6 fix rocket message and order table 2022-11-15 13:03:55 +01:00
Vicent Llopis fc516d4029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation 2022-11-15 12:23:59 +01:00
Vicent Llopis 843e5ae736 feat: traducciones en los modelos 2022-11-15 11:41:57 +01:00
Pau 4e2741a9cd Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente 2022-11-15 11:01:02 +01:00
Pau 31a0aae8e9 Fixed notification not getting inserted 2022-11-15 11:01:00 +01:00
Pau 2b3b2086d9 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-15 09:39:03 +00:00
Pau f1b706d178 Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente 2022-11-15 10:37:13 +01:00
Pau 6339634756 refs #4457 move sql, remove await on front @2h 2022-11-15 10:37:12 +01:00
Alex Moreno 31eb2c86b5 Merge branch 'dev' into 3569-refactor_isEditable-canEdit 2022-11-15 09:20:26 +00:00
Vicent Llopis b5f67425ff Merge branch 'dev' into jenkins_backTest_solved 2022-11-15 08:54:05 +00:00
Alex Moreno 6fdcb52e2a Merge branch 'dev' into 3569-refactor_isEditable-canEdit 2022-11-15 08:43:19 +00:00
Pau 60d12826e4 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-15 07:59:53 +00:00
Pau 9d0cd36afe Merge branch 'dev' into 4457' 2022-11-15 08:49:21 +01:00
Vicent Llopis 0637050375 fix: frontTest 2022-11-14 15:11:33 +01:00
Alexandre Riera 23ed6c6031 refs #3963 test front done 2022-11-14 14:30:35 +01:00
Alexandre Riera 99aa674995 refs #3963 working on mockup 2022-11-14 14:29:40 +01:00
Vicent Llopis d6a0580203 feat: traducciones modelo Ticket 2022-11-14 11:08:23 +01:00
Vicent Llopis 6e94d7f68e fix: nombre variable incorrecto 2022-11-14 11:00:13 +01:00
Alexandre Riera dc06ba7d89 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-14 09:58:18 +01:00
Alexandre Riera 7dd87b1ea8 refs #4700 icons future 2022-11-14 09:56:23 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance 2022-11-14 09:06:51 +01:00
Alexandre Riera c16210dd8a refs #4700 working on e2e 2022-11-11 15:58:11 +01:00
Alexandre Riera 117e2c03f5 refs #4700 tests back y empezando e2e 2022-11-10 15:54:00 +01:00
Pau 9004839e00 Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true 2022-11-10 14:53:14 +01:00
Pau 01fe8c8997 requested changes 2022-11-10 14:53:08 +01:00
Alex Moreno 37d412bf3b refactor: delete unnecessary test 2022-11-10 14:38:37 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-10 13:34:43 +01:00
Pau c15d40b237 Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true 2022-11-10 08:45:15 +00:00
Pau 2704017486 check default true 2022-11-10 09:43:19 +01:00
Joan Sanchez 5a56fb4b6a Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:50:10 +00:00
Pau c4044ff70d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 2022-11-10 07:40:14 +00:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer 2022-11-09 16:55:29 +01:00
Alexandre Riera ff00066138 refs #4700 tests front y fixtures 2022-11-08 15:56:58 +01:00
Guillermo Bonet 6744b3f797 added collection-label 2022-11-08 14:40:38 +01:00
Pau 2fc12dff52 #4457 @1h notifications working, need refactor ACL 2022-11-08 13:59:00 +01:00
Pau e85505ee8e #4457 implement notification system, @1h 30m 2022-11-08 12:26:01 +01:00
Pau f45eaa07f9 refs #4511 fixed test, changed drop to rename @1h 2022-11-08 09:45:56 +01:00
Pau f1e832ee66 Merge branch 'dev' into 4490-transfer-tickets-between-clients 2022-11-08 08:06:30 +00:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 2022-11-08 08:05:13 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones 2022-11-07 15:55:17 +01:00
Vicent Llopis b1eb7d469f fix: error duplicated key 2022-11-07 09:51:33 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly 2022-11-07 09:19:20 +01:00
Pau a975f37fc3 Merge branch 'dev' into 4490-transfer-tickets-between-clients 2022-11-04 07:27:15 +00:00
Alex Moreno 28edb2e53a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-04 08:09:15 +01:00
Pau 42dd56a78c Merge branch 'dev' into 4490-transfer-tickets-between-clients 2022-11-04 06:46:23 +00:00
Alexandre Riera 8e5f518eb6 refs #4753 texto y fecha sms cambiados 2022-11-03 14:16:11 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit 2022-11-03 08:39:10 +00:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice 2022-11-02 13:55:07 +00:00
Vicent Llopis 8a4aa6285b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-11-02 14:49:39 +01:00
Joan Sanchez 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice 2022-11-02 11:55:47 +00:00
Joan Sanchez 177b448441 Merge branch 'dev' into 4616-ticket.sale_mana 2022-11-02 06:42:35 +00:00
Alex Moreno e7047e982f fix e2e 2022-10-31 15:07:22 +01:00
Alex Moreno b37c257885 feat(canEdit): use checkAccess 2022-10-31 14:13:06 +01:00
Alex Moreno 445c6f1cc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-28 09:32:08 +02:00
Pau c576e503cf fix httpBack.flush error 2022-10-27 09:05:05 +02:00
Pau 04514804b7 fix tests 2022-10-27 08:51:22 +02:00
Pau d4a22f7962 Apply requested changes 2022-10-27 08:46:22 +02:00
Vicent Llopis c671540a7f refactor: renombrada variable 2022-10-26 09:04:53 +02:00
Vicent Llopis d1e2b1f7d5 refactor: tranducciones 2022-10-26 09:02:54 +02:00
Vicent Llopis d4e2783630 refactor: corregidas traducciones, eliminado destroyAll y añadida transacción 2022-10-26 08:39:07 +02:00
Vicent Llopis 925565d3d2 refator: borrada variable global y añadida Promesa al array 2022-10-26 08:23:36 +02:00
Vicent Llopis a8dfc9d06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana 2022-10-26 08:11:15 +02:00
Alex Moreno 342832c475 try 2022-10-25 15:02:22 +02:00
Alex Moreno e1e13468a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-25 11:58:43 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing 2022-10-25 09:58:17 +00:00
Pau d937a1b505 Add acl 2022-10-25 09:45:09 +02:00
Joan Sanchez 8f0b566935 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 2022-10-25 07:25:07 +00:00
Pau a43e642ff7 Add transferclient 2022-10-25 09:23:46 +02:00
Vicent Llopis f968b19d1e fix: testFront 2022-10-21 09:08:17 +02:00
Vicent Llopis c33cab7b10 fix: test back 2022-10-21 09:01:08 +02:00
Vicent Llopis 2d0cb60b50 feat: check if uses mana 2022-10-21 08:55:05 +02:00
Vicent Llopis e7261573d7 delete focus 2022-10-21 08:01:22 +02:00
Vicent Llopis 6f31bea21f feat: update testBack 2022-10-21 08:00:48 +02:00
Vicent Llopis 5da29fe381 refactor: unify duplicated code 2022-10-21 08:00:24 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code 2022-10-20 15:05:46 +02:00
Vicent Llopis 29093d7d30 feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas 2022-10-20 14:25:55 +02:00
Vicent Llopis b0471037a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-20 08:49:08 +02:00
Vicent Llopis bcc9acac0a fix: tBack 2022-10-20 08:41:00 +02:00
Vicent Llopis 51cad75298 fix: testFront 2022-10-20 08:17:15 +02:00
Alex Moreno 508decaf0b try 2022-10-19 08:22:36 +02:00
Pau 8b07180890 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 2022-10-18 11:56:56 +00:00
Vicent Llopis 9ea427dbfe refactor: move front to back funcionality 2022-10-18 13:45:46 +02:00
Vicent Llopis ae3e3c3c49 fix: id model duplicated 2022-10-18 12:37:06 +02:00
Alex Moreno a5ceee07e9 use loopback 2022-10-18 11:50:16 +02:00
Vicent Llopis 5fce93abd5 refactor: change variables name 2022-10-18 11:47:37 +02:00
Vicent Llopis 423454d19e feat: add date-picker 2022-10-18 11:47:22 +02:00
Alex Moreno 8985a678d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-18 09:49:06 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-10-17 14:06:31 +02:00
Vicent Llopis f85c2e9700 refactor: delete code repeated 2022-10-17 14:01:21 +02:00
Joan Sanchez cfdcf91be2 Merge branch 'dev' into 3505-closure_refund 2022-10-17 08:15:16 +00:00
Vicent Llopis 787d10aac6 fix: select one result only 2022-10-17 08:29:09 +02:00
Vicent Llopis cdce628038 refactor: delete line break 2022-10-17 08:11:50 +02:00
Vicent Llopis 06ecceb478 refactor: lines to long 2022-10-17 08:02:19 +02:00
Vicent Llopis a11ef73dfb refactor: code repetead 2022-10-17 08:01:55 +02:00
Vicent Llopis a036578832 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana 2022-10-14 14:43:08 +02:00
Vicent Llopis 40075e7e21 fix: testFront 2022-10-14 14:38:47 +02:00
Vicent Llopis 86b7e9cabe fix: only can exists 'mana' or 'manaClaim' discount. Never both 2022-10-14 14:30:37 +02:00
Vicent Llopis 2455a11c26 feat: changeMultipleDiscount uses the same popover than changeDiscount 2022-10-14 14:29:21 +02:00
Joan Sanchez 390ee60e59 Get first element in array 2022-10-14 07:26:34 +02:00
Joan Sanchez 67097970ed Incoterms required param 2022-10-13 10:44:20 +02:00
Joan Sanchez e81c39d8dc Send delivery note to refund tickets 2022-10-13 09:30:31 +02:00
Vicent Llopis 1f21fdeb65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-10 13:30:27 +02:00
Alex Moreno 99271f275f remove unnecessary isEditable 2022-10-10 13:26:38 +02:00
Alex Moreno 376d46b67e feat(canEdit): integrate isWeekly and adapt back tests and e2e 2022-10-10 13:06:49 +02:00
Vicent Llopis 843f67919c feat: add backTest 2022-10-10 12:56:03 +02:00
Alex Moreno 3ac8e1d3bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-10 09:57:21 +02:00
Joan Sanchez 4ecbb59ac0 Closure hours 2022-10-10 07:49:08 +02:00
Vicent Llopis bb26fa6502 feat: add tFront 2022-10-07 13:49:42 +02:00
Alex Moreno 94a51db3d5 hotFix(ticket_request): autocomplete buyer 2022-10-07 10:56:12 +02:00
Vicent Llopis deb8a00dfb feat: add backRoutes 2022-10-07 10:47:54 +02:00
Vicent Llopis 1894492a2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-07 09:26:51 +02:00
Alex Moreno e7bafb1386 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-07 07:47:46 +02:00
Alex Moreno c29625f079 fix: funcionalityAcl 2022-10-06 15:04:27 +02:00
Joan Sanchez dd9b517883 Merge pull request '4369-ticket.request.create_getItemTypeWorker' (#1061) from 4369-ticket.request.create_getItemTypeWorker into dev
Reviewed-on: #1061
2022-10-06 11:30:49 +00:00
Vicent Llopis c8d270499b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation 2022-10-06 11:50:11 +02:00
Vicent Llopis d427c3a6db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker 2022-10-06 11:48:31 +02:00
Vicent Llopis 37601934f5 feat: first option to delete and update 2022-10-06 11:40:46 +02:00
Vicent Llopis a3a432c753 fix: delete one or more expeditions 2022-10-06 10:18:19 +02:00
Vicent Llopis 26d04ce2d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-06 10:08:29 +02:00
Alex Moreno 9d482f7dfd test(ticket): fix tests and add funcionalityAcl 2022-10-05 15:13:36 +02:00
Pau 940b431059 feat(model) Created the model for packagingMistake 2022-10-05 14:04:30 +02:00
Alex Moreno 8b636497a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-05 13:47:25 +02:00
Alex Moreno 5f39249edb fix(ticket): canEdit use aclFunc 2022-10-04 15:02:00 +02:00
Alex Moreno fe8ae164eb refactor(ticket): isEditable, canEdit 2022-10-04 13:22:11 +02:00
Joan Sanchez 1598b6c703 Back unit tests 2022-10-04 09:39:42 +02:00
Pau 3caf89bddb refactor: Replaced isBox with freightItemFk 2022-10-04 09:27:31 +02:00
Joan Sanchez 3dbd304217 Updated unit tests 2022-10-04 09:21:24 +02:00
Vicent Llopis 5c76437498 refator: delete unnecessary transaction 2022-10-04 08:19:09 +02:00
Vicent Llopis f510e26141 refactor: translation 2022-10-04 07:55:30 +02:00
Vicent Llopis 197bbf392b refator: updates translations 2022-10-04 07:50:37 +02:00
Joan Sanchez c8bad23621 Tests 2022-10-04 07:41:40 +02:00
Vicent Llopis 11484edd10 feat: create new ticket 2022-10-03 15:18:07 +02:00
Joan Sanchez a065d77929 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2 2022-10-03 13:37:59 +02:00
Joan Sanchez 21bb95fc88 CSV refactor 2022-10-03 08:28:47 +02:00
Joan Sanchez 3b0f1efbf4 ACL's 2022-09-30 13:54:20 +02:00
Alex Moreno eec1d6df4a add translation 2022-09-30 09:06:43 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2 2022-09-29 14:52:31 +02:00
Joan Sanchez 5aec280adb Closure migration 2022-09-29 09:07:18 +02:00
Joan Sanchez fe5eb3e13d Changes 2022-09-29 07:35:20 +02:00
Joan Sanchez d7ab95fcc8 closure 2022-09-27 15:00:12 +02:00
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList 2022-09-26 14:49:11 +02:00
Alex Moreno f698a22fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-09-26 09:25:43 +02:00
Joan Sanchez 85698410db Templates refactor 2022-09-26 08:07:45 +02:00
Vicent Llopis c4649352a9 feat: add totalChecked 2022-09-23 08:50:11 +02:00
Vicent Llopis 2a64fde57c feat: add option "move expedition" 2022-09-22 14:58:38 +02:00
Vicent Llopis a486b1593b fix: backTest 2022-09-22 13:55:09 +02:00
Vicent Llopis 95e5b1a970 fix: code for search-function 2022-09-22 13:54:58 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Vicent Llopis 0fb7487191 feat: add getItemTypeWorker endpoint 2022-09-22 08:32:18 +02:00
Vicent Llopis fae1516b33 refactor: correct bleeding 2022-09-21 14:55:43 +02:00
Vicent Llopis 65e15ada69 refator: delete line break 2022-09-21 14:53:02 +02:00
Joan Sanchez 5a43bdb6c9 Delivery note 2022-09-21 13:18:32 +02:00
Joan Sanchez 09bdee8b34 View & send PDF from loopback endpoint 2022-09-19 12:59:32 +02:00
Alex Moreno 55d6dacebb test(ticket_listPackaging):enable back test 2022-09-19 10:11:44 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure 2022-09-19 09:45:28 +02:00
Joan Sanchez 18ac0a0b61 Export Email and Report classes 2022-09-16 23:13:37 +02:00
Alex Moreno c06d2970ae test(boxing): getVideoList 2022-09-07 13:58:39 +02:00
Alex Moreno 8dd02ab6ee quit console.logs 2022-09-06 15:08:28 +02:00
Alex Moreno 43df1e7e10 refactor(boxing): refactor getVideo 2022-09-05 12:06:14 +02:00
Alex Moreno 4a058faaf8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-09-05 08:12:07 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts 2022-08-10 12:13:31 +02:00
Alex Moreno 062806b3f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-08-05 13:19:43 +02:00
Vicent Llopis c3d396b042 fix: test e2e 2022-08-04 13:52:59 +02:00
Vicent Llopis 020990dadc fix: backTest 2022-08-04 09:53:22 +02:00
Alex Moreno b4b6d61460 feat(ticket_boxing): fix getVideo 2022-08-03 14:57:39 +02:00
Alex Moreno 8a08b6f399 feat(ticket_boxing): return video stream 2022-08-02 15:15:05 +02:00
Alex Moreno 7d4dd7bb52 feat(boxing): return stream video 2022-08-01 15:03:17 +02:00
Alex Moreno d040ecb743 feat(ticket): getVideo from shinobi 2022-08-01 07:59:04 +02:00
Carlos Jimenez Ruiz 333828c583 Moved invoiceOut, Ticket and Sales refund loginc to backend + tests 2022-07-14 13:40:50 +02:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages 2022-07-01 09:15:07 +02:00
Carlos Jimenez Ruiz 57a2cd46ce ticket filter pending uses isNotValidated now 2022-06-29 12:55:11 +02:00
Joan Sanchez f7d64e89ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-06-22 08:59:06 +02:00
Joan Sanchez 004f1390fc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2022-06-22 08:58:51 +02:00
Joan Sanchez e7bf88c703 Fix order 2022-06-21 14:26:34 +02:00
Vicent Llopis ec852b898c fix: check if services exists 2022-06-21 12:44:19 +02:00
Joan Sanchez 16d677528a FIX: Sort by id as last field 2022-06-21 12:18:33 +02:00
Carlos Jimenez Ruiz 7c580da6b8 refactor(ticket.create): display only active addresses 2022-06-17 16:42:59 +02:00
Vicent Llopis 00e48f5257 feat: add backTest 2022-06-16 10:59:31 +02:00
Vicent Llopis 84ffe3f594 feat: delete from ticketCollection and sectorCollection when a ticket is deleted 2022-06-16 09:58:15 +02:00
Vicent Llopis 363c5f349a fix: solved bug to create temporary table 2022-06-13 10:04:12 +02:00
Alex Moreno f786cdd33d fix pass dates 2022-06-09 14:39:51 +02:00
Alex Moreno eb9bd66ddb prepare for static dates 2022-06-09 13:33:01 +02:00
Alex Moreno 7eec9de0aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-06-09 07:47:03 +02:00
Joan Sanchez 13e0772f0b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-06-03 14:28:39 +02:00
Alex Moreno 4e3380cf65 hotFix(ticket_expedition): delete e.checked in filter 2022-06-02 15:28:11 +02:00
Joan Sanchez f9b9dfaf4b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-05-24 14:54:06 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2022-05-24 08:45:37 +02:00
Joan Sanchez 4d093d37bd Merge branch 'dev' into 3905-invoice-out_refund 2022-05-20 10:22:48 +00:00
Vicent Llopis c125fd54eb refactor: pull request changes 2022-05-20 12:08:12 +02:00
Vicent Llopis 0425b17b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-05-20 11:57:20 +02:00
Vicent Llopis 605ab2ec62 refactor: delete sms.detinationFk 2022-05-17 12:37:54 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention 2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows 2022-05-16 07:23:08 +00:00
Carlos Jimenez Ruiz 990f7fe4b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation 2022-05-13 18:37:48 +02:00
Joan Sanchez f8db3c31df Proper test result 2022-05-13 10:02:34 +02:00
Joan Sanchez 6b18432f87 Force test to fail 2022-05-13 09:53:47 +02:00
Carlos Jimenez Ruiz cce1d93dde jasmine reporters config for CI 2022-05-12 11:43:41 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types 2022-05-12 09:47:47 +02:00
Vicent Llopis 6441393249 refactor: pull request changes 2022-05-12 08:47:17 +02:00
Joan Sanchez d39147689d Merge branch 'dev' into 3771-ticket.expedition 2022-05-11 12:47:33 +00:00
Alex Moreno d34a8629f7 fix(setSaleQuantity): save originalQuantity 2022-05-06 13:09:37 +02:00
Vicent Llopis 93e3ea103a added frontTest 2022-05-04 12:05:46 +02:00
Vicent Llopis 9862960c99 comment frontTest 2022-05-04 12:00:39 +02:00
Vicent Llopis 38f5541ef4 execute jenkins test 2022-05-04 11:27:03 +02:00
Vicent Llopis 66685e7541 feat(ticket.expedition): add popover 2022-05-04 10:35:31 +02:00
Vicent Llopis 32ec755a35 fix: check if value.length 2022-04-28 08:26:38 +02:00
Vicent Llopis 1766222c12 refactor: updated backTest 2022-04-26 13:25:12 +02:00
Vicent Llopis 7abceb8564 refactor: add frontTest 2022-04-26 13:08:06 +02:00
Vicent Llopis 6d35200607 updated front test 2022-04-25 10:10:59 +02:00
Vicent Llopis 789365799e refactor: changed name 2022-04-25 08:45:50 +02:00
Vicent Llopis 2b9c656d21 feat(invoiceOut): add refund option 2022-04-22 11:46:28 +02:00
Vicent Llopis 4ffb61b75c refactor: refund 2022-04-22 11:45:14 +02:00
Vicent Llopis d1bd2f9c77 refactor: refund 2022-04-21 14:59:41 +02:00
Alex Moreno e00d63d7af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-04-20 14:30:23 +02:00
Alex Moreno 7cecf1584b feat(ticket): change isAvailable to itemShortage 2022-04-19 12:04:06 +02:00
Carlos Jimenez Ruiz 6015050eed Merge branch 'dev' into 3830-ticket_sale 2022-04-13 09:12:14 +00:00