2045 Commits

Author	SHA1	Message	Date
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	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
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