8284 Commits

Author	SHA1	Message	Date
Carlos Satorres	0fd7f4183e	refs #5334 fk	2023-05-30 15:36:39 +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
Carlos Satorres	1dcaba1fdc	refs #5334 department workers list	2023-05-30 15:13:16 +02:00
Vicent Llopis	6cf1e0953d	refs #5244 feat: intento de crear el componente workerAutocomplete	2023-05-30 14:49:28 +02:00
Carlos Satorres	26187898e1	refs #5334 popover	2023-05-30 14:02:34 +02:00
Alexandre Riera	576a5f050e	refs #5513 fix back test	2023-05-30 13:48:56 +02:00
Alexandre Riera	c0c522c619	Merge branch '5513-backs-embalajes' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-30 13:47:11 +02:00
Alexandre Riera	1fd51c191f	refs #5513 minor fixes	2023-05-30 13:47:09 +02:00
Carlos Satorres	8860c77147	refs #5334 fix descriptor	2023-05-30 13:21:57 +02:00
Carlos Satorres	45085cccc8	refs #5334 fix search-panel	2023-05-30 12:54:51 +02:00
Carlos Satorres	813c4ede00	Merge branch 'dev' into 5066-vehicleSorted	2023-05-30 10:22:49 +00:00
Carlos Satorres	eaffd61579	Merge branch '5066-vehicleSorted' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted	2023-05-30 12:21:47 +02:00
Carlos Satorres	0661bf8fa9	refs #5066 remake sql without ROW_ORDER	2023-05-30 12:21:44 +02:00
Carlos Satorres	e7d25a6cf3	refs #5334 filter	2023-05-30 12:08:45 +02:00
Carlos Satorres	e26eedb51c	refs #5334 descriptor wprkerFk clientFk	2023-05-30 11:54:14 +02:00
Vicent Llopis	4f9dae3522	refs #5468 fix: no muestra el id de contrato en worker/calendar	2023-05-30 11:52:04 +02:00
Alexandre Riera	30816f7947	Merge branch 'dev' into 5513-backs-embalajes	2023-05-30 09:51:42 +00:00
Carlos Satorres	cf632040e7	refs #5334 workFk, clientFk	2023-05-30 11:48:39 +02:00
Alexandre Riera	060b2fdf50	Merge branch '5137-aviso-impresora' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-30 11:34:55 +02:00
Alexandre Riera	138f03d891	refs #5137 fix back test	2023-05-30 11:34:53 +02:00
Alexandre Riera	32bdaa640e	Merge branch 'dev' into 5137-aviso-impresora	2023-05-30 09:30:34 +00:00
Pablo Natek	382bc06075	refs #5153	2023-05-30 11:23:07 +02:00
Alexandre Riera	632662c440	refs #5595 added userId in makeInvoice	2023-05-30 10:49:10 +02:00
Carlos Satorres	2778858705	refs #5334 search-panel	2023-05-30 10:27:49 +02:00
Alexandre Riera	e05d3b0793	Merge branch 'dev' into 5595-modify-loggable-tables-in-procs	2023-05-30 08:27:35 +00:00
Vicent Llopis	21448a84dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-30 10:16:34 +02:00
Carlos Satorres	107d8d1edd	refs #5334 model y vista	2023-05-30 10:13:49 +02:00
Vicent Llopis	7d59c6ec0c	refs #5468 feat: eliminado acl nativo y añadido a salix.ACL	2023-05-30 10:07:17 +02:00
Vicent Llopis	81a8f383aa	refs #5468 feat: no depender del modulo worker	2023-05-30 10:00:05 +02: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
Carlos Satorres	d9a64211de	refs #5334 fix descriptor, basic-data, summary	2023-05-30 09:16:02 +02:00
Vicent Llopis	ea1c860a18	refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta	2023-05-30 09:13:47 +02:00
Alex Moreno	8fff3989e7	Merge branch 'dev' into 5066-vehicleSorted	2023-05-30 06:30:48 +00:00
Vicent Llopis	27700bd72c	Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas	2023-05-30 06:14:48 +00:00
Carlos Satorres	9ee653dbd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-05-30 08:05:17 +02:00
Carlos Satorres	2d6f0bb2ce	refs #5334 front fix	2023-05-29 15:27:50 +02:00
Alex Moreno	b60cd2539a	refs #5712 feat(workerDms): docuware integration	2023-05-29 15:21:37 +02:00
Carlos Satorres	f4e877dada	refs #5334 refactor summary	2023-05-29 14:46:39 +02:00
Carlos Satorres	3423ce612c	refs #5066 e2e fixs, change name sorted	2023-05-29 13:49:32 +02:00
Alexandre Riera	1bb5033729	Merge branch 'dev' into 5137-aviso-impresora	2023-05-29 10:56:21 +00:00
Alexandre Riera	059467a383	refs #5137 sql moved to template	2023-05-29 12:55:20 +02:00
Carlos Satorres	d8e7c2700a	refs #5066 fix autocomplete	2023-05-29 12:42:27 +02:00
Vicent Llopis	d2355412a0	Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas	2023-05-29 08:59:20 +00:00
Carlos Satorres	2e83d91006	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted	2023-05-29 10:24:19 +02:00
Carlos Satorres	41b1b2fb3f	fix >	2023-05-29 10:02:21 +02: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
Pablo Natek	a232e9ecea	refs #5153	2023-05-29 09:26:36 +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
Carlos Satorres	2a78a912eb	refs #5334 worker.department	2023-05-26 14:35:12 +02:00
Carlos Satorres	3aa5ce6208	refs #5334 fix hasToSendMail	2023-05-26 14:23:34 +02:00
Carlos Satorres	ceaaece007	refs #5334 label-value	2023-05-26 14:08:37 +02:00
Carlos Satorres	07e176ae4f	refs #5334 fix checks basic-data	2023-05-26 13:25:49 +02:00
Carlos Satorres	f74c370446	refs #5334 checks vertical	2023-05-26 13:15:47 +02:00
Alex Moreno	0789804352	refs #5334 fix basic-data	2023-05-26 12:58:03 +02:00
Alex Moreno	2b06c62876	refs #5334 left-menu	2023-05-26 12:21:15 +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
Carlos Satorres	027d45bc25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-05-26 11:47:04 +02:00
Carlos Satorres	10e085ca1b	refs #5334 link department	2023-05-26 11:43:51 +02:00
Carlos Satorres	8adc104cf4	refs #5735 fix currency	2023-05-26 08:39:58 +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
Juan Ferrer	2e0721b101	refs #5667 Fixes: Id filter, translations	2023-05-25 18:22:46 +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
Alex Moreno	dd83b25bb2	Merge branch 'master' into hotfix-item_getBalance	2023-05-25 09:37:38 +00:00
Alexandre Riera	dfac44a87b	hotfix 3rd parameter to null	2023-05-25 11:35:25 +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
Alexandre Riera	de313b6418	refs #3628 Show what's before the inventory	2023-05-24 13:40:26 +02:00
Alexandre Riera	74ba21b1b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto	2023-05-24 13:39:01 +02:00
Alexandre Riera	087fa137fd	Merge branch 'dev' into 5677-fallo-saveSign	2023-05-24 11:14:17 +00: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	49bd9c35b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto	2023-05-24 12:19:45 +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
Carlos Satorres	a99b7cd4f1	Merge branch 'dev' into 5297-newWorker_iban_not_required	2023-05-24 08:02:33 +00:00
Carlos Satorres	6294fc0435	refs #5297 back&e2e fix changes	2023-05-24 10:02:02 +02:00
Carlos Satorres	6cf2c38927	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-24 06:59:04 +00:00
Carlos Satorres	bb39724718	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-05-24 08:09:44 +02:00
Carlos Satorres	e46caffe96	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-24 06:05:44 +00: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
Alex Moreno	c35e2e155f	refs #5472 test(changePassword): back	2023-05-23 15:12:28 +02: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
Carlos Satorres	0dda7791f6	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-23 12:51:10 +00:00
Carlos Satorres	af1f92613f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-05-23 13:57:11 +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
Vicent Llopis	c9b4c68b0c	refs #5468 refactor: actualizada vista	2023-05-23 13:41:13 +02:00
Carlos Satorres	4f5bd95d21	refs #5639 order	2023-05-23 13:23:46 +02:00
Vicent Llopis	0702e4ef43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 13:08:19 +02:00
Vicent Llopis	b7e3e9fa71	refs #5468 feat: add testBack	2023-05-23 13:08:10 +02:00
Vicent Llopis	db55c3e81b	refs #5468 fix: fornt test	2023-05-23 12:49:34 +02:00
Vicent Llopis	191fe4ebf6	refs #5468 feat: añadidas comprobaciones acls en el back en 'Alias de correo'	2023-05-23 12:40:49 +02:00
Carlos Satorres	e2bea16e68	refs #5639 select country, paymethod	2023-05-23 12:31:02 +02:00
Vicent Llopis	940ed29dfc	refs #5468 feat: comprobacion de acl en el back en 'Reenvío de correo'	2023-05-23 12:21:35 +02:00
Carlos Satorres	db7d3b6868	refs #5639 payMethodFk	2023-05-23 11:32:26 +02:00
Carlos Satorres	7fd2927ec9	refs #5639 smart-table country	2023-05-23 11:26:31 +02:00
Vicent Llopis	96163cb07f	refs #5468 feat: update acls	2023-05-23 10:43:46 +02:00
Vicent Llopis	cd244daf84	refs #5468 feat: checkbox 'activo' marcado por defecto	2023-05-23 10:04:31 +02:00
Vicent Llopis	6135a8f576	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 10:03:40 +02:00
Vicent Llopis	4bed88faf5	refs #5468 fix: e2e test	2023-05-23 09:44:07 +02:00
Carlos Satorres	84abba5566	Merge branch 'dev' into 5599-ticketColors	2023-05-23 07:38:01 +00:00
Alex Moreno	9500e99b86	Merge branch 'dev' into 5579-fix-order	2023-05-23 07:17:25 +00:00
Alex Moreno	53e55de605	refs #5579 fix(route_index): order	2023-05-23 09:15:31 +02:00
Carlos Satorres	d7d94796d6	Merge branch 'dev' into 5599-ticketColors	2023-05-23 07:13:47 +00:00
Vicent Llopis	9426ff204f	refs #5468 fix: testFront	2023-05-23 09:12:27 +02:00
Carlos Satorres	0c673e43bc	refs #5639 smart-tabla defaulter	2023-05-23 09:02:05 +02:00
Vicent Llopis	aea39dd0b7	refs #5468 feat: modificalos acl de VnUser	2023-05-23 08:45:03 +02:00
Alexandre Riera	bf8d82f3c6	refs #5581 refresh model	2023-05-23 08:43:31 +02:00
Vicent Llopis	3b7b31deb1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 08:31:52 +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
Alex Moreno	6f06bac0c1	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-23 05:55:08 +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
Vicent Llopis	b65ebc6af3	refs #5468 feat: cambiados acls	2023-05-23 07:09:51 +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	5e651d7b8c	Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim	2023-05-22 14:30:06 +02:00
Carlos Satorres	6d147e7af7	refs #5648 fix spaces	2023-05-22 14:30:04 +02:00
Carlos Satorres	6093cb4794	Merge branch 'dev' into 5648-sureClaim	2023-05-22 10:26:57 +00: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
Alex Moreno	ddab59a10c	refs #5472 refactor(changePassword): convert in async	2023-05-22 09:17:40 +02:00
Carlos Satorres	e9222dbcb7	Merge branch 'dev' into 5689-fixedPricesSize	2023-05-22 06:31:51 +00: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
Alex Moreno	bbc34f04ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-19 07:35:23 +02:00
Carlos Satorres	2b1e951692	refs #5635 smart-table	2023-05-18 15:33:54 +02:00
Alexandre Riera	58c25786a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-18 14:52:33 +02:00
Alexandre Riera	d70a31bfbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-18 14:49:27 +02:00
Alex Moreno	f54d9180b1	fix front test	2023-05-18 14:44:05 +02:00
Alexandre Riera	e8376c00a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-18 14:43:20 +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
Carlos Satorres	814568f2a9	refs #5297 errors solve, trad	2023-05-18 13:11:17 +02:00
Alexandre Riera	2591d2d115	refs #3628 added check & date-picker	2023-05-18 11:42:22 +02:00
Alexandre Riera	4bcb461d36	refs #3628 added check & date-picker	2023-05-18 11:41:46 +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
Carlos Satorres	60bfb1b079	refs #5689 fix pixels	2023-05-17 12:53:18 +02:00
Juan Ferrer	0d51987d47	refs #5667 Client sample translations	2023-05-17 12:41:25 +02:00
Alexandre Riera	0d980334b8	refs #5634 conditional merge	2023-05-17 12:41:00 +02:00
Juan Ferrer	f9fdf80350	refs #5667 Item translations added	2023-05-17 12:06:31 +02:00
Juan Ferrer	f55e5f9f74	refs #5667 Business translations	2023-05-17 11:52:13 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Carlos Satorres	adafd7444b	refs #5334 worker-department	2023-05-17 10:04:44 +02:00
Vicent Llopis	eaaa860e97	Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice	2023-05-17 07:27:46 +00:00
Carlos Satorres	f63dd0f9a3	refs #5334 datos	2023-05-17 09:05:28 +02:00
Juan Ferrer	d8eeacb371	refs #5667 Translation improved	2023-05-16 20:24:04 +02:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Carlos Satorres	5c9ee21cfc	refs #5334 department.card	2023-05-16 14:00:05 +02:00
Carlos Satorres	9f9963af56	refs #5334 descriptor	2023-05-16 13:10:26 +02:00
Carlos Satorres	d09889b08a	refs #5334 fix summary route	2023-05-16 12:12:25 +02:00
Carlos Satorres	3dcdbe0223	refs #5334 summary basic data	2023-05-16 11:41:42 +02:00
Carlos Satorres	612d0a2dfb	refs #5334 fix index	2023-05-16 09:52:48 +02:00
Carlos Satorres	fd4d04756a	refs #5334 routes index fix	2023-05-16 08:54:54 +02:00
Alexandre Riera	d4e2049bc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-15 14:27:49 +02:00
Alex Moreno	08fcbebbaf	refs #5488 polish specifics acls	2023-05-15 14:14:08 +02:00
Carlos Satorres	443821b5c2	refs #5334 ?q	2023-05-15 13:59:54 +02:00
Carlos Satorres	071849065a	refs #5334 fix main	2023-05-15 13:55:35 +02:00
Carlos Satorres	598067f757	refs #5334 routes	2023-05-15 13:15:33 +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	87e1caa4eb	refs #5334 department seccion	2023-05-15 10:43:06 +02:00
Alex Moreno	0aa12a5efb	hotFix(worker_new): use postcode not postalCode	2023-05-15 09:54:40 +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
Pablo Natek	8419c76b12	refs #5153 worker sin tr	2023-05-12 12:51:07 +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	3f26072787	refs #5468 eliminados getters a VnUser	2023-05-12 09:02:55 +02:00
Alexandre Riera	9760e50212	refs #5513 minor fixes	2023-05-12 08:46:12 +02:00
Pablo Natek	65082be077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr	2023-05-12 08:28:19 +02:00
Carlos Satorres	0dea1dfd9e	Merge branch 'dev'	2023-05-11 15:52:35 +02:00
Vicent Llopis	b10f90fbe1	refs #5468 a la seccion privileges se le pasa el parametro user	2023-05-11 15:25:37 +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
Vicent Llopis	74ea0ce9fd	refs #5468 actualizados acls	2023-05-10 13:44:51 +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
Alexandre Riera	3166a9e420	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-10 13:23:10 +02:00
Alexandre Riera	ded8e0e141	refs #5137 added trigger, template and test	2023-05-10 13:22:53 +02:00
Vicent Llopis	62dd64eb89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-10 11:56:50 +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
Alex Moreno	8c0deb6cfa	test(e2e_order): fiter optimized	2023-05-10 09:16:19 +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
Carlos Satorres	5c8e635509	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-05-09 13:38:04 +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
Alexandre Riera	b37bde2ba7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-09 08:14:42 +02:00
Alex Moreno	8ae67799a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-05-09 07:11:09 +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
Alex Moreno	ebbc860ba3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-08 12:03:53 +02:00
Juan Ferrer	68b1b6c5bd	refs #5517 E2E fixes	2023-05-08 12:03:27 +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
Alex Moreno	73fb940c63	refs #5472 try change-password	2023-05-08 10:55:16 +02:00
Carlos Satorres	2c6f71b4c4	Merge branch 'dev'	2023-05-08 10:16:57 +02:00
Alexandre Riera	a2055d35fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-08 09:48:09 +02:00
Alexandre Riera	372b9a2ce2	refs #5513 test getItemsPackaging	2023-05-08 09:46:56 +02:00
Alexandre Riera	d21b949ffb	refs #5513 fix getItemsPackaging	2023-05-08 09:18:53 +02: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
Juan Ferrer	ea5b032b40	refs #5517 Travel create E2E fixes	2023-05-05 13:00:45 +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	805e678ca7	Merge branch 'dev' into 5517-e2eFix	2023-05-05 08:14:13 +02:00
Juan Ferrer	a48e197e46	refs #5517 E2E fixes	2023-05-05 08:12:38 +02:00
Alex Moreno	2da4289695	refs #5472 feat(vn-user): override change-password & set-password	2023-05-04 15:01:29 +02:00
Vicent Llopis	404acdab6f	refs #5638 fix: solucionado problema con el limit	2023-05-04 14:51:47 +02:00
Alexandre Riera	5cdec35ed4	refs #5513 addFromPackaging.spec.js	2023-05-04 14:30:10 +02:00
Alexandre Riera	8ae5a0de0f	refs #5513 adding backs and models	2023-05-04 12:03:47 +02:00
Juan Ferrer	677764f302	refs #5517 Fix e2e	2023-05-04 10:00:21 +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
Alex Moreno	1fa5926c17	Merge branch 'dev' into client_use_account_setPassword	2023-05-04 07:06:44 +00:00
Alex Moreno	b2027fddf3	fix(client): use account setPassword	2023-05-03 14:56:14 +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	a1521f5220	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-03 09:39:39 +00:00
Alexandre Riera	4c0ec6faf5	changedModel sms	2023-05-02 14:26:47 +02:00
Carlos Satorres	17425a627c	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-05-02 11:25:17 +00:00
Alex Moreno	306d73eb69	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 09:42:56 +00:00
Alexandre Riera	13c37e88ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-02 11:38:07 +02:00
Alex Moreno	4a7902ae4d	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 08:41:18 +00:00
Carlos Satorres	5436eec63e	Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-05-02 10:00:50 +02:00
Carlos Satorres	8156c17c7d	refs #5540 del jasmine	2023-05-02 10:00:47 +02:00
Alexandre Riera	c2de5c5ff4	refs #4797 added redirection section	2023-05-02 07:28:59 +02:00
Javi Gallego	ed6b2cf25b	refs #5615	2023-05-01 14:57:50 +02:00
Carlos Satorres	06c01f3e94	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-28 13:02:10 +00:00
Carlos Satorres	fb59371d54	refs #5540 quit logs	2023-04-28 14:38:49 +02:00
Carlos Satorres	0e0db960af	refs #5540 supplier	2023-04-28 14:23:44 +02:00
Alex Moreno	ac55dc4cc7	refs #5297 feat(worker_new): add payMethod	2023-04-28 14:17:19 +02:00
Carlos Satorres	c0deb745d6	refs #5540 arreglo en supplier	2023-04-28 14:03:21 +02:00
Carlos Satorres	38142c121d	refs #5540 mods client	2023-04-28 12:12:26 +02:00
Alex Moreno	e00edf0266	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-04-28 12:06:45 +02:00
Pablo Natek	8651898a1f	Merge branch 'dev' into 5153-worker-sin-tr	2023-04-28 08:36:47 +00:00
Carlos Satorres	cdbbec9d36	refs #5540 validate	2023-04-28 10:21:54 +02:00
Alex Moreno	42e3c8f29d	refs #5488 fix(): use hasWriteRole	2023-04-28 09:35:15 +02:00
Carlos Satorres	b8f7f7bd69	refs #5540 create validateIban	2023-04-28 09:07:06 +02:00
Juan Ferrer	2cfd2d9dda	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-27 18:13:24 +02:00
Vicent Llopis	87ffd2668e	refs #5468 scope para VnUser	2023-04-27 15:06:05 +02:00
Vicent Llopis	1597f7ab69	refs #5468 permitir acceso al módulo 'Usuarios'	2023-04-27 15:05:41 +02:00
Carlos Satorres	66986d3c21	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-04-27 12:08:28 +00:00
Pablo Natek	51624882e8	Merge branch 'dev' into 4795-client_getDebt	2023-04-27 12:05:12 +00:00
Carlos Satorres	08c173acf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-04-27 12:49:01 +02:00
Carlos Satorres	d15a671359	refs #5540 traduccion	2023-04-27 11:40:42 +02:00
Carlos Satorres	07148f6c29	refs #5540 mon message	2023-04-27 11:31:26 +02:00
Alexandre Riera	3bd5582794	Merge branch 'dev' into 5255-revisar-ticketBoxing	2023-04-27 08:42:21 +00:00
Carlos Satorres	f8f4e14351	Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-04-27 10:40:01 +02:00
Carlos Satorres	dd4d0bca84	refs #5540 delete tinIsValid, solve test back, e2e	2023-04-27 10:39:58 +02:00
Alex Moreno	9b13e3fd2f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-04-27 07:23:25 +02:00
Pablo Natek	990bfc63a8	Merge branch 'dev' into 4795-client_getDebt	2023-04-26 16:10:39 +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
Vicent Llopis	c69e038a56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor	2023-04-26 12:45:54 +02:00
Alex Moreno	c62f8e1c14	refs #5297 feat(worker): iban and bankEntity not required	2023-04-26 12:13:14 +02:00
Vicent Llopis	c580be2790	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-04-26 12:07:34 +02:00
Alexandre Riera	1219cfcc5c	refs #5255 fixed condition	2023-04-26 12:03:17 +02:00
Carlos Satorres	a524d7837d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes	2023-04-26 11:45:20 +02:00
Vicent Llopis	2e5a43af68	refs #5468 restringido permisos 'WRITE' para sysadmin en VnUser	2023-04-26 11:40:21 +02:00
Carlos Satorres	b25071f52b	refs #5316 solve e2e	2023-04-26 11:40:18 +02:00
Carlos Satorres	af875dd67e	Merge	2023-04-26 10:26:54 +02:00
Carlos Satorres	899ef23541	refs #084200 test back solve	2023-04-26 10:03:01 +02:00
Vicent Llopis	d6ff61b768	refs #5468 corregidas condiciones de autorización	2023-04-26 09:48:02 +02:00
Alex Moreno	73153071d6	Merge branch 'dev' into 5293-claim-sections	2023-04-26 05:56:46 +00:00
Alex Moreno	af0523a155	refs #5468 descriptor account solo lo puede ejecutar sysadmin y mail-forwarding solo el mismo o un superior	2023-04-25 15:17:45 +02:00
Pablo Natek	e8ce8e42fd	refs #5153	2023-04-25 14:25:22 +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
Alexandre Riera	83319894b2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev	2023-04-25 11:25:29 +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
Alexandre Riera	edb1e2197c	Merge branch 'master' into hotfix-negativeBases	2023-04-25 06:23:08 +00: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	40da3dfe52	Merge branch 'dev' into 5575-tercerDecimalLatest	2023-04-24 12:53:28 +00:00
Carlos Satorres	08e890d6d9	Merge branch 'dev' into 5436-mensajeClienteSinCorreo	2023-04-24 12:40:57 +00:00
Carlos Satorres	1088422360	refs #4764 boton abonar y datos	2023-04-24 13:14:38 +02:00
Juan Ferrer	a053764122	refs #5517 E2E fixes	2023-04-24 12:59:56 +02:00
Alex Moreno	8502b74dee	feat(): replace hasRole to checkAccessAcl	2023-04-24 11:07:04 +02:00
Juan Ferrer	081b4af6d6	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-24 10:44:42 +02:00
Carlos Satorres	4473cc11c7	Merge branch 'dev' into 5439-inheritRole	2023-04-24 08:43:19 +00:00
Carlos Satorres	210bd949d2	Merge branch 'dev' into 5436-mensajeClienteSinCorreo	2023-04-24 08:38:06 +00:00
Carlos Satorres	1717f03ccc	Merge branch 'dev' into 5575-tercerDecimalLatest	2023-04-24 07:38:06 +00: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
Carlos Satorres	67db2f0476	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-24 06:51:41 +00:00
Carlos Satorres	cd4f66e292	refs #5540 arreglar e2e	2023-04-24 08:48:35 +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
Alex Moreno	ef12fdf889	Merge branch 'dev' into 5575-tercerDecimalLatest	2023-04-24 06:02:34 +00:00
Alex Moreno	5e33395534	Merge branch 'dev' into 5436-mensajeClienteSinCorreo	2023-04-24 06:02:00 +00:00
Vicent Llopis	5b7ca82509	Merge branch 'dev' into 5318-deviceProductionLog_toSalix	2023-04-24 04:58:30 +00:00
Alexandre Riera	6609f96f92	Merge branch 'master' into hotfix-negativeBases	2023-04-21 12:56:15 +00: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	e24366707b	refactor: añadido focus a la seccion usuarios	2023-04-21 14:26:12 +02:00
Vicent Llopis	2b74ab43ae	refactor front	2023-04-21 14:12:53 +02:00
Vicent Llopis	9f04581862	refs #5542 "importar reclamacion" crea un registro en ticketRefund	2023-04-21 14:00:28 +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	faee5ccd7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-21 13:53:07 +02:00
Vicent Llopis	ea1035311e	Merge branch 'dev' into 5128-client.credit-management	2023-04-21 11:30:58 +00: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
Carlos Satorres	397d8f658e	refs #5540 error trad	2023-04-21 10:41:50 +02:00
Vicent Llopis	83f71cdd36	refactor: mostrar en columnas visibles 'Frágil'	2023-04-21 10:31:23 +02:00
Vicent Llopis	5af961ac69	fix: maneja si se elimina la sale	2023-04-21 09:53:21 +02:00
Alexandre Riera	af1ad7e08c	fixed e2e	2023-04-21 09:47:34 +02:00
Carlos Satorres	d8b5659a5d	refs #5540 client vies	2023-04-21 09:14:30 +02:00
Alexandre Riera	b3a10698af	hotfix negativeBases	2023-04-21 08:20:38 +02:00
Pablo Natek	de3b4f37c2	Merge branch 'dev' into 5075-client_balance	2023-04-21 05:54:00 +00:00
Juan Ferrer	9694a35343	refs #5517 Added: Tests, filter panel, model and props titles	2023-04-20 19:46:57 +02:00
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +02:00
Carlos Satorres	33c296c34d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-inheritRole	2023-04-20 14:31:46 +02:00
Vicent Llopis	ec9a5722c2	refs #5128 añadido icono de grafana	2023-04-20 13:58:49 +02:00
Carlos Satorres	d6e6dab03b	Merge branch 'dev'	2023-04-20 11:55:52 +02:00
Carlos Satorres	b4183c2698	refs #5436 mod de error	2023-04-20 11:33:28 +02:00
Carlos Satorres	c103eeab7f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5436-mensajeClienteSinCorreo	2023-04-20 10:40:22 +02:00
Carlos Satorres	237c83c6f5	refs #5066 getVehicleSorted small mod	2023-04-20 10:20:15 +02:00
Alex Moreno	63e0031bc6	deploy(231401): test to master	2023-04-20 08:24:43 +02:00
Carlos Satorres	b45b0ff826	refs #5066 copy project from the other	2023-04-20 08:23:46 +02:00
Alexandre Riera	aecde484f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections	2023-04-20 07:52:05 +02:00
Alexandre Riera	84c2512847	refs #5293 open lilium in the same page	2023-04-20 07:51:25 +02:00
Alex Moreno	39333a9119	refs #5488 replace hasRole for checkAccessAcl	2023-04-19 15:23:32 +02:00
Vicent Llopis	f6bf92b74b	refs #5128 intentando poner icono grafana	2023-04-19 15:21:59 +02:00
Vicent Llopis	6fbb734a34	quitado salto de linea	2023-04-19 14:43:23 +02:00
Vicent Llopis	187ba032d2	refs #5128 rol por ACL	2023-04-19 14:43:15 +02:00
Alex Moreno	c1d4281b1b	refs #5488 replace hasWriteRole, hasReadRole	2023-04-19 13:59:26 +02:00
Vicent Llopis	34b360040b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management	2023-04-19 12:18:45 +02:00
Vicent Llopis	5ace66ebca	refs #5318 fix e2e	2023-04-19 09:54:54 +02:00
Vicent Llopis	be8a11cafc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix	2023-04-19 09:52:28 +02:00
Carlos Satorres	a559c1f648	refs #5575 mod3Decimal	2023-04-19 09:02:04 +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	6f2aa0f618	Worker note ACL	2023-04-18 14:51:48 +02:00
Joan Sanchez	c3443ecc7c	Updated e2e	2023-04-18 14:37:20 +02:00
Joan Sanchez	32c9e22d96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 11:41:55 +02:00
Joan Sanchez	a0d8ed1433	E2e fixes	2023-04-18 11:33:36 +02:00
Alexandre Riera	2df362327f	Merge branch 'dev' into 5418-buscador-lateral-fixed-price	2023-04-18 08:33:15 +00:00
Joan Sanchez	a5f6991511	continue	2023-04-18 10:18:44 +02:00
Joan Sanchez	aabc4ec58d	fix(consumption): continue queue if client mailing fails	2023-04-18 10:08:04 +02:00
Alexandre Riera	28a7722bb6	Merge branch 'dev' into 5518-log-user-role	2023-04-18 08:01:42 +00:00
Joan Sanchez	fded7d062b	section fix	2023-04-18 09:49:23 +02:00
Vicent Llopis	b3e7cedd1e	refs #5128 borrada línea por error	2023-04-18 09:49:12 +02:00
Vicent Llopis	c5225cb632	refs #5128 borrado código innecesario	2023-04-18 09:23:19 +02:00
Vicent Llopis	48cd23750e	refs #5128 add testBack	2023-04-18 09:09:09 +02:00
Vicent Llopis	c9dffe9175	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management	2023-04-18 08:39:43 +02:00
Joan Sanchez	6fd5c8ae2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 08:34:20 +02:00
Joan Sanchez	6d593a0937	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2	2023-04-18 08:32:22 +02:00
Pablo Natek	3636543f73	refs #5075	2023-04-18 08:19:23 +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
Alexandre Riera	7d8a0597c1	Merge branch 'dev' into 5518-log-user-role	2023-04-17 09:53:36 +00:00
Alexandre Riera	2675c02d13	refs #5518 moved models to account	2023-04-17 11:52:52 +02:00
Alexandre Riera	2bc190b01e	Merge branch 'dev' into 5293-claim-sections	2023-04-17 08:49:41 +00:00
Alexandre Riera	0dcbc9fc8b	refs #5293 redirected claim.photos to lilium	2023-04-17 10:46:26 +02:00
Carlos Satorres	d399cda050	refs #5316 quitar comment	2023-04-17 10:34:08 +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	f53ebb7641	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-17 08:59:34 +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
Carlos Satorres	60d3729b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes	2023-04-17 08:55:22 +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
Carlos Satorres	af8603185c	refs #5439 inheritedRole	2023-04-17 08:35:44 +02:00
Juan Ferrer	c5dcfd3cab	refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing	2023-04-15 14:24:50 +02:00
Juan Ferrer	2af48b3049	refs #4480 Fix: VnUser before save hook removed -> setting password attribute	2023-04-15 01:51:38 +02:00
Juan Ferrer	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Alexandre Riera	ad3836552e	refs #5518 sections added	2023-04-14 14:16:29 +02:00
Vicent Llopis	4c18efa589	refs #5128 creado método setRating	2023-04-14 13:05:57 +02:00
Joan Sanchez	35f94c58b7	reafactor(image): upload image using gm library	2023-04-14 13:04:40 +02:00
Vicent Llopis	83dd386eed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management	2023-04-14 10:39:16 +02:00
Alexandre Riera	b9b52c6b1d	Merge branch 'dev' into 5418-buscador-lateral-fixed-price	2023-04-14 07:08:02 +00: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
Alexandre Riera	ac4772e44e	refs #5418 mistake doing git pull origin dev	2023-04-13 13:46:29 +02:00
Carlos Satorres	90268a79b0	refs #5284 test createClaim	2023-04-13 13:41:10 +02:00
Vicent Llopis	2ada64e1bf	refs #5517 eliminadas traducciones duplicadas	2023-04-13 08:49:50 +02:00
Alexandre Riera	71e202d586	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro	2023-04-13 08:45:05 +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
Carlos Satorres	ad267c933c	refs #5540 country.code	2023-04-13 08:30:33 +02:00
Pablo Natek	9594bd68b5	refs #4795	2023-04-12 21:10:50 +02:00
Juan Ferrer	7e1d6f4339	Merge branch 'dev' into 5522-loggable-deadlock	2023-04-12 15:33:23 +00:00
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
Carlos Satorres	60103fa80a	refs #5540 validacion nif	2023-04-12 14:39:40 +02:00
Carlos Satorres	ef6e85532e	refs #5213 cambios e2e, descriptor	2023-04-12 14:20:05 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +02:00
Carlos Satorres	117849f093	refs #5540 supplier js	2023-04-12 12:03:55 +02:00
Vicent Llopis	58750aa065	refs #5318 eliminido triggers y añadido loggable en salix	2023-04-12 10:02:06 +02:00
Pablo Natek	1456da58f5	refs #5075	2023-04-11 15:41:45 +02:00
Pablo Natek	c928274e24	Merge branch 'dev' into 5075-client_balance	2023-04-11 13:19:54 +00:00
Carlos Satorres	1ce2705869	refs #5316 last kkentry	2023-04-11 15:04:49 +02:00
Vicent Llopis	d03ca01b73	refs #5128 añadida subseccion "Gestión de crédito"	2023-04-11 14:57:56 +02:00
Pablo Natek	ccf26c5413	Merge branch 'dev' into 5211-cleanItemShelvings	2023-04-11 11:56:33 +00:00
Pablo Natek	1770b8c038	refs #5075	2023-04-11 13:42:28 +02:00
Carlos Satorres	d21ab7a5a7	refs #5316 primer kkeo	2023-04-11 10:32:21 +02:00
Vicent Llopis	ec03c6edfa	fix intermittent backTest	2023-04-11 10:23:33 +02:00
Alexandre Riera	161fc25c5b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price	2023-04-11 10:01:21 +02:00
Alexandre Riera	53bd6cd729	Merge branch 'dev' into 5522-loggable-deadlock	2023-04-11 07:52:16 +00:00
Alexandre Riera	ce28339973	refs #5522 deleted trigger afterInsert, added hook beforeInsert	2023-04-11 09:48:31 +02:00
Joan Sanchez	5732f9a33b	Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev ... Reviewed-on: #1407 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 07:07:55 +00:00
Joan Sanchez	fe0d861dc0	Merge pull request '4856-worker.time-control_2' (!1418) from 4856-worker.time-control_2 into dev ... Reviewed-on: #1418 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 07:06:04 +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	ba31613ac9	Merge branch 'dev' into 5275-item.fixed-price_refactor	2023-04-06 09:58:07 +00:00
Carlos Satorres	b3f946e15f	Merge branch 'dev' into 5250-observacionesWorker	2023-04-06 08:32:05 +00:00
Vicent Llopis	d9ae24c927	Merge branch 'dev' into 4856-worker.time-control_2	2023-04-06 08:08:10 +00:00
Vicent Llopis	8a297469d6	refs #4856 añadido myOptions	2023-04-06 10:06:29 +02:00
Vicent Llopis	faab024e24	test	2023-04-06 09:59:45 +02:00
Carlos Satorres	68a24b7335	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker	2023-04-06 09:33:50 +02:00
Alexandre Riera	5cbc826281	Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk	2023-04-06 07:16:00 +00:00
Joan Sanchez	b71ad207ff	Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev ... Reviewed-on: #1420 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 07:07:35 +00:00
Joan Sanchez	a8af280de5	Merge pull request '5439-newFilterEnPeticionesDeCompra' (!1406) from 5439-newFilterEnPeticionesDeCompra into dev ... Reviewed-on: #1406 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 07:05:18 +00:00
Vicent Llopis	041590e541	refs #4856 maneja errores y notifica a los jefes	2023-04-06 08:54:12 +02:00
Vicent Llopis	6fc2867551	permite decimales	2023-04-06 08:05:37 +02:00
Alexandre Riera	c823a0d6f1	Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk	2023-04-06 05:44:33 +00:00
Vicent Llopis	a44a640d15	refs #4856 manejo errores	2023-04-05 15:14:42 +02:00
Vicent Llopis	6a0bca1a94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2	2023-04-05 14:06:33 +02:00
David Domenech	44d4df9c21	Merge branch 'dev' into 5211-cleanItemShelvings	2023-04-05 11:00:08 +00:00
Carlos Satorres	8741a9f913	Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra	2023-04-05 06:51:21 +00:00
Carlos Satorres	7d3c6a98f3	refs #5439 search panel solve	2023-04-05 08:48:15 +02:00
Vicent Llopis	fb5969a120	refs #5275 add test	2023-04-05 08:43:47 +02: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
Vicent Llopis	e97b5a9f80	refs #5275 fix backTest	2023-04-05 07:54:56 +02:00
Vicent Llopis	28a12d0706	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor	2023-04-05 07:36:53 +02:00
Carlos Andrés	e342852ed8	Merge branch 'master' into 5529-invoicingFixes	2023-04-04 13:05:49 +00:00
Carlos Andrés	0372d44415	fixes #5529 Fixes: missing awaits, buffer-to-file	2023-04-04 15:00:28 +02:00
Alexandre Riera	eed1ecc208	refs #4954 trigger modified	2023-04-04 14:47:13 +02:00
Vicent Llopis	35d19e586a	add translatiojn	2023-04-04 14:27:16 +02:00
Vicent Llopis	7a274e2721	Merge branch 'dev' into 5410-client.defaulter_getChecked	2023-04-04 12:12:20 +00:00
Vicent Llopis	3630c7d398	refs #5410 creada ruta de back para enviar emails	2023-04-04 14:09:55 +02:00
Joan Sanchez	c126c6044a	Updated format	2023-04-04 13:55:44 +02:00
Vicent Llopis	c89f95a33e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-04-04 13:40:12 +02:00
Alexandre Riera	9380b88460	refs #5437 back and test deprecated	2023-04-04 12:40:03 +02:00
Vicent Llopis	0bfa4c54aa	fix: inserta en workerTimeControlMail	2023-04-04 09:52:46 +02:00
Alexandre Riera	1a14c793cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price	2023-04-04 09:47:31 +02:00
Vicent Llopis	0db3bc5e26	refs #4856 fix test	2023-04-04 09:29:51 +02:00
Vicent Llopis	21b7050cfd	refs #4856 otros usuarios pueden actualizar el estado	2023-04-04 09:29:40 +02:00
Alexandre Riera	24f576a4b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-04-04 08:40:03 +02:00
Vicent Llopis	d1100384bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2	2023-04-04 08:27:27 +02:00
Vicent Llopis	862101c4b0	refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador	2023-04-03 21:29:02 +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
Vicent Llopis	67689695e4	refs #5275 filtra por defecto por el this.vnConfig.warehouseFk	2023-03-30 14:29:19 +02:00
Vicent Llopis	e1bfdc3f3c	eliminada variable que no se usa	2023-03-30 11:13:40 +02:00
Carlos Satorres	60383eda0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker	2023-03-30 08:26:45 +02:00
Carlos Satorres	4edb2463b8	refs #5250 eliminacion isEnabled	2023-03-30 08:23:53 +02:00
Vicent Llopis	5a67f47305	refs #4856 fix: actualizar estado a 'SENDED' movido al back	2023-03-30 08:14:17 +02:00
Joan Sanchez	6aca23e466	Merge pull request 'fixes #5056 Nuevo sistema de sacado de pedidos: Gestión de vagones' (!1386) from 5056-gestion-vagones into dev ... Reviewed-on: #1386 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-30 05:23:29 +00:00
Joan Sanchez	cafb21d90b	Merge pull request 'fixes #5206 travel buscador en el lateral' (!1384) from 5206-travel-buscadorLateral into dev ... Reviewed-on: #1384 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-30 05:21:24 +00:00
Joan Sanchez	26bddef5e5	Merge pull request 'refs #5425 modificacion de los campos' (!1394) from 5425-modCamposBasicos(pesoycaja) into dev ... Reviewed-on: #1394 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:50 +00: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
Joan Sanchez	30a4356139	Merge pull request 'fixes #5184 InvoiceIn crear seccion invoiceIn serial' (!1414) from 5184-invoiceIn-serial into dev ... Reviewed-on: #1414 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:18:44 +00:00
Joan Sanchez	6366af9a15	Merge pull request 'refs #5490 traducción corregida' (!1415) from 5490-arregloExpedition into dev ... Reviewed-on: #1415 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-30 05:18:21 +00:00
Vicent Llopis	d066c4ea0b	refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'	2023-03-29 11:27:48 +02:00
Vicent Llopis	b8da868095	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro	2023-03-29 09:22:23 +02:00
Vicent Llopis	3b615d9879	refs #5275 fix: actualiza correctamete los elementos del checkedDummy	2023-03-29 09:11:40 +02:00
Alexandre Riera	9a713d2753	refs #5184 stmts removed	2023-03-29 08:48:54 +02:00
Alexandre Riera	3ad85c0de3	refs #5184 subselect deleted	2023-03-29 08:44:35 +02:00
Vicent Llopis	c53c54b6cd	refs #5275 feat: modificar masivamente	2023-03-28 14:59:08 +02:00
Carlos Satorres	bf5f1011e8	refs #5490 traducción corregida	2023-03-28 14:56:20 +02:00
Vicent Llopis	b4e04fcdad	refs #5275 feat: colorear fechas	2023-03-28 14:40:14 +02:00
Alexandre Riera	69be91b964	refs #5184 fix back test, added e2e	2023-03-28 13:45:26 +02:00
Pablo Natek	2c01ebf681	Merge branch 'dev' into 5075-client_balance	2023-03-28 13:26:17 +02:00
Alexandre Riera	695444f6ae	refs #5184 back and front tests added	2023-03-28 11:34:14 +02:00
Vicent Llopis	fb1b39da17	refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto	2023-03-28 10:30:02 +02:00
Carlos Satorres	809c24f6cf	Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker	2023-03-28 10:07:18 +02:00
Carlos Satorres	564165dc0f	refs #5250 Self.validatesPresenceOf	2023-03-28 10:07:14 +02:00
Vicent Llopis	06ac8f9910	refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas	2023-03-28 09:41:39 +02:00
Alexandre Riera	05caf0c6d8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-28 08:26:11 +02:00
Alexandre Riera	87d0dc3cec	refs #5092 changed name to negative bases	2023-03-28 08:25:41 +02:00
Alexandre Riera	6f2de903bc	refs #5184 working on search panel	2023-03-27 14:29:22 +02:00
Alexandre Riera	188e592d28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price	2023-03-27 11:20:05 +02:00
Carlos Satorres	1302665d98	refs #5436 showSucces	2023-03-27 10:00:00 +02:00
Alexandre Riera	0c8fe855ac	refs #5418 lateral search panel added, missing e2e	2023-03-27 09:11:29 +02:00
Alexandre Riera	8b4121e021	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-27 08:38:35 +02:00
Alexandre Riera	39af68c3dc	Merge branch 'dev' into 5056-gestion-vagones	2023-03-27 05:39:22 +00:00
Carlos Satorres	b199ca4a6e	Merge branch 'dev' into 5250-observacionesWorker	2023-03-24 11:48:31 +00:00
Carlos Satorres	c68c78cc5b	refs #5250 solucion error WorkerObserv	2023-03-24 12:11:42 +01:00
Vicent Llopis	a32dea0acd	Merge branch 'dev' into 5395-travel.extra-community	2023-03-24 11:00:22 +00:00
Vicent Llopis	f689d35100	refs #5410 fix test	2023-03-24 10:05:17 +01:00
Joan Sanchez	00a0f88dc4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-24 10:03:23 +01:00
Joan Sanchez	e67a40714c	Claim log hotfix	2023-03-24 09:59:55 +01:00
Vicent Llopis	6c75853ce6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-03-24 09:43:13 +01:00
Carlos Satorres	fa78649607	refs #5439 url filter	2023-03-24 08:54:03 +01:00
Vicent Llopis	5784f05fd4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community	2023-03-24 08:34:04 +01:00
Alexandre Riera	0baccc4745	refs #5206 fix tests front	2023-03-24 08:25:37 +01:00
Alexandre Riera	8f2398bc8c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-24 08:12:50 +01:00
Vicent Llopis	92aed3eac1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro	2023-03-24 08:11:35 +01:00
Vicent Llopis	a45308c6a5	refs #5342 fix: testFront	2023-03-24 07:58:27 +01:00
Vicent Llopis	0f6092483c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro	2023-03-24 07:51:31 +01:00
Alexandre Riera	24d032910a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-23 14:58:31 +01:00
Vicent Llopis	afdfe5e3f3	refs #5331 al filtrar por 'Pendiente' no muestra los estados 'Previa x'	2023-03-23 14:55:19 +01:00
Vicent Llopis	2513377add	Merge branch 'dev' into 5342-monitor.tickets_isFragile	2023-03-23 13:38:08 +00:00
Joan Sanchez	ea50da8a19	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-23 14:33:10 +01:00
Carlos Satorres	36af9d45e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-newFilterEnPeticionesDeCompra	2023-03-23 11:56:40 +01:00
Vicent Llopis	805df64bb2	fallo cantidad reclamados	2023-03-23 10:54:04 +01:00
Alexandre Riera	c6fc2dee24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-23 10:53:11 +01:00
Alexandre Riera	4e5364dc0b	refs #5036 fix tests logs	2023-03-23 10:05:02 +01:00
Vicent Llopis	46e61543a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile	2023-03-23 09:29:03 +01:00
Vicent Llopis	34126119e2	fix errors	2023-03-23 09:02:22 +01:00
Carlos Satorres	79c42384ee	refs #5439 role actualizado	2023-03-23 08:26:06 +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
Carlos Satorres	3fd1e7a086	refs #5439 se elimina el filtro de fecha añadido	2023-03-22 15:41:36 +01:00
Vicent Llopis	0579c563b9	refs #5327 ordernar por columnas	2023-03-22 15:03:12 +01:00
Joan Sanchez	fcd422eb49	added relation	2023-03-22 14:55:54 +01:00
Carlos Satorres	1ab8570ed3	Merge branch 'dev' into 5425-modCamposBasicos(pesoycaja)	2023-03-22 13:28:07 +00:00
Carlos Satorres	b2cc79a98e	Merge branch 'dev' into 5432-propiedadesBotonMas	2023-03-22 13:24:32 +00:00
Vicent Llopis	27bb50ad12	refs #5342 esta tabla ya se borra en el proc	2023-03-22 12:17:48 +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
Vicent Llopis	d276c7b611	refs #5342 unificados proc x_getWarnings	2023-03-22 10:57:18 +01:00
Vicent Llopis	2559be8230	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile	2023-03-22 10:29:21 +01:00
Carlos Satorres	fde854f5c2	refs #5250 campo de notes	2023-03-22 10:21:15 +01:00
Vicent Llopis	18afcbabc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community	2023-03-22 10:20:55 +01:00
Vicent Llopis	1b1bca28bd	refs #5410 add frontTest	2023-03-22 10:13:59 +01:00
Vicent Llopis	bf38098e5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-03-22 09:31:08 +01:00
Alexandre Riera	700151b500	refs #5092 amount <> 0	2023-03-22 08:18:56 +01:00
Alexandre Riera	ce67132d7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones	2023-03-22 07:21:20 +01:00
Vicent Llopis	41c79263c4	refs #5410 feat: envia email cuando se añade una nota	2023-03-21 14:53:36 +01:00
Joan Sanchez	d209b35071	Merge pull request 'refs #5423 añadido 3r decimal' (!1392) from #5423-tercerDecimalCoste into dev ... Reviewed-on: #1392 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-21 10:22:37 +00:00
Alexandre Riera	1198ad3b01	refs #5056 wagonType backs and test	2023-03-21 10:44:00 +01:00
Joan Sanchez	3a922b453f	Merge branch 'dev' into 5241-virtual_pos	2023-03-21 09:10:34 +00:00
Joan Sanchez	12a9ff599b	Updated unit test	2023-03-21 10:05:27 +01:00
Joan Sanchez	3881e435f4	Renamed method	2023-03-21 09:55:45 +01:00
Vicent Llopis	46a6a5fc63	refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion	2023-03-21 08:51:30 +01:00
Carlos Satorres	1bc3103d9f	refs #5439 filtro comercial	2023-03-21 08:44:28 +01:00
Joan Sanchez	634db7c7fc	refactor(getTransactions): lilium customer transactions	2023-03-20 23:09:17 +01:00
Carlos Satorres	da05140635	Merge branch '#5423-tercerDecimalCoste' of https://gitea.verdnatura.es/verdnatura/salix into #5423-tercerDecimalCoste	2023-03-20 15:14:11 +01:00
Carlos Satorres	306573b1bf	refs #5439 campos fecha y salesperson	2023-03-20 15:11:55 +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
Carlos Satorres	78d8bbd82a	refs #5423 tercer decimal en entrada	2023-03-20 10:44:44 +01:00
Alexandre Riera	61a0d8bcb2	refs #5092 showing clients with multiple negative bases	2023-03-20 10:15:18 +01:00
Alexandre Riera	a94e47e622	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-20 09:54:02 +01:00
Carlos Satorres	9e42ab52ce	refs #5425 modificación usuario	2023-03-17 09:32:20 +01:00
Robert Ferrús	1d697e1ac5	refs #4357 add operator model	2023-03-17 08:46:01 +01:00
Carlos Satorres	9565bb33f2	refs #5425 modificacion de los campos	2023-03-16 14:12:54 +01:00
Vicent Llopis	6d04933fe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community	2023-03-16 14:01:19 +01:00
Vicent Llopis	5794ae5130	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-03-16 13:55:54 +01:00
Vicent Llopis	bc47fc35d6	refs #5410 feat: añadido filtro a las columnas created y defaulterSinced	2023-03-16 13:55:21 +01:00
Alexandre Riera	a8f92b151d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones	2023-03-16 10:38:04 +01:00
Vicent Llopis	2f2d65bfd6	refs #5342 feat: añadido icono en los tickets que tengan sales fragiles	2023-03-16 10:33:24 +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
Carlos Satorres	aadb796adf	Merge branch 'dev' into #5423-tercerDecimalCoste	2023-03-16 09:12:56 +00:00
Alexandre Riera	3f356335db	refs #5092 added popovers	2023-03-16 09:47:58 +01:00
Alexandre Riera	c46e15c8e4	refs #5092 changed section name	2023-03-16 09:35:00 +01:00
Alexandre Riera	0b4a6874d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-16 09:16:50 +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
Carlos Satorres	70beaf9b6c	refs #5423 añadido 3r decimal	2023-03-16 09:03:16 +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	8fda595c2e	Merge pull request '4856-worker.time-control' (!1375) from 4856-worker.time-control into dev ... Reviewed-on: #1375 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:39:00 +00:00
Joan Sanchez	d373d80b12	Merge pull request '5120-reports_loopback' (!1389) from 5120-reports_loopback into dev ... Reviewed-on: #1389 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:34:02 +00:00
Vicent Llopis	a87e0c52d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-16 07:32:04 +01:00
Joan Sanchez	a8049c5b2c	Merge pull request '5380-m3/itemMaxSize' (!1377) from 5380-m3/itemMaxSize into dev ... Reviewed-on: #1377 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-16 06:28:03 +00:00
Joan Sanchez	e911f7a127	Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev ... Reviewed-on: #1391 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:27:33 +00:00
Joan Sanchez	d9296c139d	Merge pull request 'fix: autocompletar el switf/bic' (!1388) from 5352-worker.create_swift/bic into dev ... Reviewed-on: #1388 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:25:18 +00:00
Joan Sanchez	1f52326091	Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev ... Reviewed-on: #1390 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-03-16 06:22:45 +00:00
Joan Sanchez	4f0ad00a6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-16 07:20:18 +01:00
Joan Sanchez	596a017cfd	Don't throw error on file unlink	2023-03-16 07:18:29 +01:00
Joan Sanchez	0d5272de30	Merge branch 'dev' into 5182-print_publish	2023-03-15 15:05:43 +00:00
Joan Sanchez	a947666838	refactor(imageQueue): remplaced sharp with gm	2023-03-15 14:24:30 +01:00
Vicent Llopis	1b8ed05f71	refs #5395 feat: modificado orderBy, añadida columna importa y corregidos errores	2023-03-15 13:28:28 +01:00
Alexandre Riera	6609cce065	refs #5056 minHeightBetweenTrays	2023-03-15 12:14:58 +01:00
Alexandre Riera	f706b66efc	refs #5056 added divisible in wagonType	2023-03-15 11:57:09 +01:00
Alexandre Riera	53bca1e8a3	refs #5056 added fixtures	2023-03-15 11:36:10 +01:00
Alexandre Riera	6a2542758b	refs #5056 added fixtures	2023-03-15 10:29:44 +01:00
Vicent Llopis	38bf49c0b6	refs #5410 fix: se mantenien los checkbox marcados al paginar	2023-03-15 08:40:53 +01:00
Joan Sanchez	bdb86a432f	Merge branch '5182-print_publish' of https://gitea.verdnatura.es/verdnatura/salix into 5182-print_publish	2023-03-15 08:07:17 +01:00
Joan Sanchez	f052af92cd	Proper template name	2023-03-15 08:07:14 +01:00
Joan Sanchez	dc936fe690	Merge branch 'dev' into 5182-print_publish	2023-03-15 07:05:14 +00:00
Pablo Natek	59a87ba519	Merge branch 'dev' into 5151-claim.descriptor-2-botones-mas	2023-03-14 14:02:25 +00:00
Vicent Llopis	c51e542235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-14 13:43:59 +01:00
Carlos Satorres	5f64c23495	Merge branch 'dev' into 5352-worker.create_swift/bic	2023-03-14 11:12:04 +00:00
Vicent Llopis	1047ac0b64	refs #4980 fix: la sección no estaba filtrando por el filtro por defecto	2023-03-14 10:18:59 +01:00
Vicent Llopis	50ccb61728	refactor: el report llama directamente al filtro de extra-community	2023-03-14 09:59:29 +01: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
Vicent Llopis	29df1ba894	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback	2023-03-14 08:00:02 +01:00
Vicent Llopis	4dc9e9e590	refs #4856 refactor: make agnostic the component calendar	2023-03-14 07:44:39 +01:00
Vicent Llopis	1693907ee0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-14 07:41:36 +01:00
Pablo Natek	584f25dd77	Merge branch 'dev' into 5151-claim.descriptor-2-botones-mas	2023-03-13 16:24:31 +00:00
Carlos Satorres	e947672c69	Merge branch 'dev' into 5352-worker.create_swift/bic	2023-03-13 14:36:51 +00:00
Joan Sanchez	63d7dafcde	feat(print): added reusable pdf print functions ... Refs #5182	2023-03-13 15:05:19 +01:00
Joan Sanchez	b58135f611	Merge pull request '5035-tryToSolve_intermittentBackTest' (!1379) from 5035-tryToSolve_intermittentBackTest into dev ... Reviewed-on: #1379 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-13 09:37:42 +00:00
Joan Sanchez	6cc7017475	Merge branch 'dev' into 4856-worker.time-control	2023-03-13 09:22:36 +00:00
Alexandre Riera	0248c3c9e0	refs #5056 models and tables added	2023-03-13 07:34:49 +01:00
Alexandre Riera	eee4c815e7	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-13 06:10:51 +00:00
Joan Sanchez	1b984f4325	Event callback	2023-03-12 20:51:22 +01:00
Vicent Llopis	5cb28036c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback	2023-03-10 14:25:55 +01:00
Joan Sanchez	9bc86b1617	Added missing relation	2023-03-10 13:29:11 +01:00
Pablo Natek	8a4d9bd2bf	refs #5211	2023-03-10 12:52:51 +01:00
Alexandre Riera	efcf224962	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-10 11:50:11 +00:00
Alexandre Riera	c4d6a19666	refs #5092 download as csv button	2023-03-10 12:49:20 +01:00
Alexandre Riera	874fd0656c	refs #5206 url gets params	2023-03-10 10:05:16 +01:00
Alexandre Riera	0cac62da76	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-10 09:02:54 +00:00
Pablo Natek	63ccb26bf3	refs #5151	2023-03-10 08:17:10 +01:00
Vicent Llopis	b24b6d4121	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback	2023-03-10 07:46:16 +01:00
Pablo Natek	901a8ab112	refs #5151 botones	2023-03-09 14:34:06 +01:00
Carlos Satorres	5a0b567908	Merge branch 'dev' into 5380-m3/itemMaxSize	2023-03-09 13:29:06 +00:00
Carlos Satorres	08254e28bb	refs #5380 mod label max m3	2023-03-09 14:24:00 +01:00
Vicent Llopis	c105316a04	delete testBack	2023-03-09 10:05:24 +01:00
Vicent Llopis	9094c4f1cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-tryToSolve_intermittentBackTest	2023-03-09 09:42:08 +01:00
Vicent Llopis	223b8f6d00	fix: intermittentBack test	2023-03-09 09:41:51 +01:00
Alexandre Riera	4f78eaa14c	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-09 08:29:43 +00:00
Alexandre Riera	a5f6d37f0f	hotfix reload card, improved icon message	2023-03-09 09:29:11 +01:00
Alexandre Riera	2363828092	hotfix clientUnpaid	2023-03-09 08:54:03 +01:00
Alexandre Riera	7c3c3a2d66	refs #4632 added userError	2023-03-09 08:31:38 +01:00
Vicent Llopis	c46d325e23	fix: add transaction	2023-03-09 07:58:39 +01:00
Alexandre Riera	9ff920c67e	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-09 06:50:33 +00:00
Carlos Satorres	7426c97479	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5380-m3/itemMaxSize	2023-03-08 15:11:55 +01:00
Vicent Llopis	e20464cc7c	update css	2023-03-08 13:14:06 +01:00
Carlos Satorres	6d7874d3ab	refs #5380 JSON modificado HTML arreglado	2023-03-08 13:12:21 +01:00
Carlos Andrés	32429a58e0	refs #5000 remove consolelog	2023-03-08 12:36:53 +01:00
Alexandre Riera	423ae85212	refs #4632 dmsRecover deprecated	2023-03-08 12:29:09 +01:00
Vicent Llopis	165dc73b33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-08 12:22:29 +01:00
Vicent Llopis	79023fbfaf	feat: add backTest	2023-03-08 12:16:53 +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
Vicent Llopis	f461c75af1	feat: add front test	2023-03-08 12:06:31 +01:00
Vicent Llopis	776f7783c6	refactor code	2023-03-08 12:06:20 +01:00
Vicent Llopis	0396d3707c	refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front	2023-03-08 11:47:10 +01:00
Alexandre Riera	b1d5a2ba1a	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-08 10:46:16 +00:00
Joan Sanchez	4d2d75e066	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-08 10:19:11 +01:00
Joan Sanchez	aeb50b2c19	Removed callback syntax	2023-03-08 10:19:02 +01:00
Vicent Llopis	760690a625	fix: test front	2023-03-08 09:51:21 +01:00
Carlos Satorres	3d1f640e08	refs #5380 m3Max add and mod itemMaxSize	2023-03-08 09:19:57 +01:00
Joan Sanchez	23a15ee15c	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-08 06:50:16 +00:00
Alexandre Riera	741dd921d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-03-08 07:48:11 +01:00
Joan Sanchez	c93d3f8846	Updated front unit test	2023-03-08 07:47:25 +01:00
Javi Gallego	bb691ccf1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-08 07:45:25 +01:00
Javi Gallego	98c8cd67e5	minor bug	2023-03-08 07:45:22 +01:00
Joan Sanchez	9050c06994	Updated unit test	2023-03-08 07:44:56 +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
Joan Sanchez	3ad96b6ad7	Endpoint fixes	2023-03-07 11:55:13 +01:00
Joan Sanchez	445a0b0e1f	Claim fixes	2023-03-07 10:20:10 +01:00
Joan Sanchez	44e7abd6d3	Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev ... Reviewed-on: #1370 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-03-07 08:28:13 +00:00
Vicent Llopis	0bda8c0ed6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-07 09:14:30 +01:00
Joan Sanchez	bc0a6c33c4	Merge branch 'dev' into 5187-error-permisos	2023-03-06 13:50:21 +00:00
Joan Sanchez	9f4aed7d83	Updated unit test	2023-03-06 13:44:03 +01:00
Vicent Llopis	a98bb59479	fix: test front	2023-03-06 12:47:49 +01:00
Joan Sanchez	4f091330a7	feat(claimLog): added claim log section ... Refs: #5340	2023-03-06 12:37:37 +01:00
Vicent Llopis	9e9807c4b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-06 11:55:30 +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
Alexandre Riera	b828d40464	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-06 09:13:05 +00:00
Juan Ferrer	47f1ad9a0c	Merge pull request 'master' (!1367) from master into test ... Reviewed-on: #1367	2023-03-06 08:28:29 +00:00
Alexandre Riera	f2bd0253e2	refs #5092 added unbilled tickets section	2023-03-06 09:27:53 +01:00
Javi Gallego	780572a9f2	test fixed	2023-03-06 08:14:26 +01:00
Juan Ferrer	99f8bc6bac	refs #5174 TpvTransaction.confirm code refator to improve debugging	2023-03-03 18:55:58 +01:00
Vicent Llopis	497d756af6	fix: autocompletar el switf/bic	2023-03-03 13:46:18 +01:00
Vicent Llopis	727ae1d4e0	Merge branch 'dev' into 5035-intermittent_backTest2	2023-03-03 12:11:28 +00:00
Vicent Llopis	8ac575419a	fix: no mostraba la factura rectificada correcta	2023-03-03 12:31:20 +01:00
Juan Ferrer	73c988b18e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-03-03 10:57:59 +01:00
Juan Ferrer	6eaf4bdd1b	refs #5174 tpvTransaction: Añadidas columnas para depuración	2023-03-03 10:57:57 +01:00
Alexandre Riera	de0e7334df	Merge branch 'master' into hotfix-itemWaste-openOtherTab	2023-03-03 07:55:28 +00:00
Alexandre Riera	d58a5eb1ff	hotfix itemWaste	2023-03-03 08:54:55 +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
Alexandre Riera	ed5208c9e4	refs #5206 implemented general search, missing tests	2023-03-02 15:10:17 +01:00
Vicent Llopis	7c24b940b3	feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes	2023-03-02 14:55:18 +01:00
Alexandre Riera	dbe42e3bf4	refs #5206 version with plane added, needs to implement general search	2023-03-02 13:55:47 +01:00
Javi Gallego	e01fa40531	Merge branch 'dev' into 5187-error-permisos	2023-03-02 11:51:41 +01:00
Alexandre Riera	be1993cf8b	refs #5206 version with top-searcher and two fields for reference and id	2023-03-02 11:33:55 +01:00
Joan Sanchez	b8881a050c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-02 07:41:16 +01:00
Joan Sanchez	ee6d292d6a	Merge pull request 'fixes #5063 Añadir campo doPhoto en la ficha de Item' (!1264) from 5063-item-module-doPhoto into dev ... Reviewed-on: #1264 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:34:45 +00:00
Joan Sanchez	8834d4d0a4	Merge pull request 'fixes #5070 route-tickets city is now a link to buscaman' (!1282) from 5070-route-tickets-link-maps into dev ... Reviewed-on: #1282 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:33:03 +00:00
Joan Sanchez	baedb5b6ca	Merge pull request 'fixes #5202 item waste abrir en otra pestaña' (!1354) from 5202-itemWaste-openOtherTab into dev ... Reviewed-on: #1354 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:31:39 +00: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
Vicent Llopis	3051768781	WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros	2023-03-01 14:50:23 +01:00
Alexandre Riera	d62fbab3f1	refs #5070 refactor and added tests	2023-03-01 14:22:25 +01:00
Vicent Llopis	bc542d8a40	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-01 14:11:12 +01:00
Guillermo Bonet	707ae232a7	refs #5193 ticketCreateWithUser to ticket_add	2023-03-01 12:24:36 +01:00
Alexandre Riera	cd026d79c3	Merge branch 'master' into hotFix-itemDiary-reloadCardConditional	2023-03-01 11:22:41 +00:00
Alexandre Riera	d744cbb1a3	hotFix itemDiary reload card conditional	2023-03-01 12:22:01 +01:00
Vicent Llopis	2f9e9ada43	Merge branch 'dev' into 5240-ticket.sale-tracking	2023-03-01 10:58:49 +00:00
Alexandre Riera	48da6403fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5070-route-tickets-link-maps	2023-03-01 11:20:24 +01:00
Carlos Andrés	6f5e25493d	invoicing test	2023-03-01 10:36:38 +01:00
Alexandre Riera	7aedbda98b	refs #5202 changed vn-tr for a	2023-03-01 10:08:51 +01:00
Vicent Llopis	4567981724	add console.log	2023-03-01 09:09:09 +01:00
Alexandre Riera	915c598c0c	fixed tests	2023-03-01 09:04:53 +01:00
Vicent Llopis	f6afed485c	add console.log	2023-03-01 08:50:30 +01:00
Vicent Llopis	07784ffbfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest2	2023-03-01 08:46:26 +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
Vicent Llopis	da6e29056e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-03-01 08:08:23 +01:00
Alexandre Riera	4d6a770b26	Merge branch 'master' into hotfix-supplier-isTrucker	2023-02-28 13:39:45 +00:00
Alexandre Riera	3dd6232d6a	hotfix isTrucker was not in the params	2023-02-28 14:39:01 +01:00
Guillermo Bonet	656685cd7e	refs #4975 Minor changes	2023-02-28 14:35:34 +01:00
Alexandre Riera	b2bf7f2727	refs #5149 fixing e2e	2023-02-28 14:29:31 +01:00
Juan Ferrer	9336d20e45	refs #4975 MdbVersion/upload fixes & code clean	2023-02-28 13:45:36 +01:00
Alexandre Riera	e9dca9211c	refs #5149 checked if ticket has refunds, added translations	2023-02-28 13:42:18 +01:00
Alexandre Riera	d5ea59e284	refs #5287 permisos añadidos	2023-02-28 12:46:48 +01:00
Alexandre Riera	96e103d76e	refs #5287 sections sorted	2023-02-28 08:37:17 +01:00
Alexandre Riera	7a04b0b3de	refs #5287 icon added	2023-02-28 08:00:18 +01:00
Alexandre Riera	94901d5b1f	refs #5287 pda section added, tests added	2023-02-28 07:49:34 +01:00
Alexandre Riera	5d9220c5c0	refs #5287 locker added	2023-02-27 08:39:46 +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
Joan Sanchez	1bc715cde5	Updated claim state field	2023-02-24 14:32:56 +01:00
Alexandre Riera	698a3396fc	refs #5063 deleted changes in item hook	2023-02-24 10:40:24 +01:00
Alexandre Riera	9da3593dff	Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto	2023-02-24 10:37:38 +01:00
Alexandre Riera	6d6fa11da1	refs #5063 fixed front test	2023-02-24 10:37:35 +01:00
Alexandre Riera	113b37e56f	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-24 09:25:44 +00:00
Alexandre Riera	afb14044cc	refs #5063 deleted item checked in image, added front test	2023-02-24 10:25:08 +01:00
Alexandre Riera	ed7f3f5d63	Merge branch 'dev' into 5172-cliente-impagado	2023-02-24 08:34:41 +00:00
Alexandre Riera	6a65c9f0e2	Merge branch 'dev' into 5168-mostrar-instanceLog	2023-02-24 08:22:45 +00:00
Alexandre Riera	4682497df9	Merge branch 'dev' into 5168-mostrar-instanceLog	2023-02-24 08:08:20 +00:00
Alex Moreno	bd225e6824	Merge branch 'dev' into 4998-claim_photos_back	2023-02-24 07:59:28 +00:00
Joan Sanchez	788e5488ae	Merge branch 'dev' into 5115-transfer_sales	2023-02-24 07:58:26 +00:00
Alexandre Riera	6590c6f1fa	refs #5036 transferSales also transfer sale's logs	2023-02-24 08:55:04 +01:00
Joan Sanchez	fafbfed189	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-24 07:23:38 +01:00
Alexandre Riera	bca9e757d4	hotfix parsed description array to string	2023-02-23 15:52:47 +01:00
Carlos Andrés	ffdfd1a7e5	refs #5000 Invoicing change structure	2023-02-23 14:48:21 +01:00
Vicent Llopis	9b11987d75	feat: desaparecen los botones para las semanas que no tienen registros	2023-02-23 14:33:38 +01:00
Vicent Llopis	475bc2c255	feat: solo puede dar conforme/no confome el propio usuario	2023-02-23 14:33:16 +01:00
Robert Ferrús	1e23dfe34e	Merge branch 'dev' into 5115-transfer_sales	2023-02-23 10:00:32 +00:00
Vicent Llopis	9310e92223	refactor	2023-02-23 10:44:08 +01:00
Carlos Andrés	7f60335a91	refs #5000 Invoicing: front tests refactor & fixes	2023-02-23 09:45:15 +01:00
Carlos Andrés	4cc6485cbd	refs #5000 Invoicing RC	2023-02-23 09:25:23 +01:00
Carlos Andrés	eaa5b4530a	getMinClientId	2023-02-23 09:22:17 +01:00
Vicent Llopis	35b47c6da2	refactor code	2023-02-23 08:21:59 +01:00
Vicent Llopis	05d91ed50e	feat: actualizada interfaz	2023-02-22 15:12:25 +01:00
Alex Moreno	8597497429	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4998-claim_photos_back	2023-02-22 14:31:31 +01:00
Vicent Llopis	a93fb2c69f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-02-22 14:29:29 +01:00
Alexandre Riera	3a3dcc941b	Merge branch '5172-cliente-impagado' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado	2023-02-22 14:24:33 +01:00
Alexandre Riera	0263a4833e	refs #5172 added changelog	2023-02-22 14:24:31 +01:00
Alexandre Riera	ca1f5480ae	refs #5235 added setClientSample(), fixed tests	2023-02-22 13:04:27 +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	c8c48ea175	feat: colorar numeros de semanas segun el registro de horas	2023-02-21 15:16:28 +01:00
Joan Sanchez	3d8add4d6f	Merge branch 'dev' into 5192-db_export	2023-02-21 13:12:27 +00:00
Joan Sanchez	0d16f71fd3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-21 14:10:36 +01:00
Vicent Llopis	c30242f9cc	fix: front test	2023-02-21 12:17:16 +01:00
Vicent Llopis	eda70b009b	fix: cuando haces F5 en cualquier sección que no sea Diary, te coge el warehouse por defecto	2023-02-21 11:48:56 +01:00
Vicent Llopis	432c8a9ab8	refactor: cambiados estilos de los chips	2023-02-21 10:56:46 +01:00
Joan Sanchez	58548164d2	Merge branch 'dev' into 5192-db_export	2023-02-21 09:20:30 +00:00
Joan Sanchez	4c2878e232	Updated unit tests	2023-02-21 09:48:47 +01:00
Joan Sanchez	45c4f2ff45	Updated test	2023-02-21 08:51:50 +01:00
Joan Sanchez	c9840f6985	Updated entry structure	2023-02-21 08:32:46 +01:00
Alex Moreno	cc5a867bf4	feat(claim_model): add claimDms relations	2023-02-20 15:16:19 +01:00
Alexandre Riera	063c60b4a1	Merge branch 'dev' into 5172-cliente-impagado	2023-02-20 13:58:31 +00:00
Joan Sanchez	ab6ca12862	Merge branch 'dev' into 5266-image_fixes	2023-02-20 13:15:40 +00:00
Vicent Llopis	0b240e7925	add console.log	2023-02-20 13:35:50 +01:00
Alexandre Riera	271a6d898d	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-20 12:17:03 +00:00
Alexandre Riera	04877c1425	refs #5063 refactor hook	2023-02-20 13:15:47 +01:00
Joan Sanchez	90e1136ee2	fix(image): store images with a name generated through uuid instead of url path ... Refs: #5266	2023-02-20 12:40:13 +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	c7f22a10ba	refs #5063 refactored hook	2023-02-20 10:39:12 +01:00
Alexandre Riera	5c2c99e397	refs #5172 changed icon name	2023-02-20 09:44:14 +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
Alexandre Riera	08476fe2a6	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-17 13:30:47 +00: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
Vicent Llopis	39a3c8a7fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-17 13:06:30 +01:00
Vicent Llopis	853e06f523	fix: card reload automatic	2023-02-17 12:38:07 +01:00
Joan Sanchez	527caf9ca0	refactor(zerofill): deprecated zerofill and removed function ... Refs: #5207	2023-02-17 11:19:35 +01:00
Vicent Llopis	373be40986	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-17 10:42:50 +01:00
Vicent Llopis	4001a75916	Merge branch 'dev' into 5180-invoice-out_refund	2023-02-17 08:57:48 +00:00
Vicent Llopis	874f459956	refactor: borrada variable innecesaria	2023-02-17 09:49:47 +01:00
Vicent Llopis	885a98457e	feat: sustido sql por loopback del report 'balance-compensation'	2023-02-17 09:11:20 +01:00
Alexandre Riera	8b088e831a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-16 14:43:51 +01:00
Vicent Llopis	b5d2d53435	fix: test back	2023-02-16 10:45:13 +01:00
Vicent Llopis	3096738b84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund	2023-02-16 09:52:18 +01:00
Vicent Llopis	3dd870f7df	fix: test e2e	2023-02-16 09:44:20 +01:00
Vicent Llopis	bb2eddc462	fix: test front	2023-02-16 07:32:44 +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
Alexandre Riera	dca5ae0f72	refs #5223 added params	2023-02-15 13:14:52 +01:00
Vicent Llopis	443118a7ac	esto se debe BORRAR	2023-02-15 12:37:31 +01:00
Vicent Llopis	7439b12d98	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-15 09:31:20 +01:00
Vicent Llopis	df38f30f74	se incluyen los test intermintents que estaban incluidos	2023-02-15 09:10:55 +01:00
Alexandre Riera	ea2fd59cdc	refs #5223 changed ref and email text	2023-02-14 12:41:36 +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
Pau	6a732819ba	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-14 09:58:10 +00:00
Alexandre Riera	b1a6713a3d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-14 09:04:08 +01:00
Alexandre Riera	139dac0bc1	refs #4588 moved hook from entryObservation to entry	2023-02-14 08:08:48 +01:00
Alexandre Riera	e5e86de8d2	Merge branch 'dev' into 5152-ticketBasicData-stepTwo	2023-02-14 07:07:12 +00:00
Alexandre Riera	f6ec6da1c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-13 13:48:12 +01:00
Alexandre Riera	bfc21a7c97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado	2023-02-13 13:36:58 +01:00
Alexandre Riera	4c7aae95aa	refs #5172 added default icon	2023-02-13 13:04:22 +01: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
Alexandre Riera	a7e9e52ad4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-13 07:34:13 +01: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	4787de3df5	fixing merge	2023-02-10 09:04:49 +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
Vicent Llopis	5b22096567	refactor: actuializada consulta par obtener los clientes a facturar. Excluido impresion pdfs de la transaccion	2023-02-09 14:57:08 +01:00
Alex Moreno	f496242fcb	fix description	2023-02-09 10:28:37 +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
Vicent Llopis	222032aae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-02-09 08:38:08 +01:00
Alexandre Riera	725b7b9bce	Merge branch 'master' into hotFix-ticketFutureAdvance-warehouse	2023-02-08 12:48:23 +00: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
Vicent Llopis	b70311999d	refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción	2023-02-08 09:41:09 +01:00
Javi Gallego	4a562c3110	unificado todo a claimState isEditable	2023-02-07 15:40:03 +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	6cb3930be0	feat: añadido icono info, que indica de que almacén se saca la información	2023-02-07 13:40:39 +01:00
Alexandre Riera	9f2ff4e4b7	addFilter	2023-02-07 12:30:30 +01:00
Alexandre Riera	d3564209ba	findById	2023-02-07 08:05:48 +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
Vicent Llopis	4f76465246	fix: no recarga cada vez	2023-02-06 12:24:26 +01:00
Alexandre Riera	68b4d269ff	Merge branch 'dev' into 4588-campo-nota-ultimo-usuario	2023-02-06 09:18:13 +00:00
Alexandre Riera	3879dfc89b	Merge branch '5074-ticket-balance-null' of https://gitea.verdnatura.es/verdnatura/salix into 5074-ticket-balance-null	2023-02-06 08:19:16 +01:00
Alexandre Riera	f2f8a4eb04	fix test	2023-02-06 08:19:13 +01:00
Alexandre Riera	2c946b38d4	Merge branch 'dev' into 5074-ticket-balance-null	2023-02-06 07:08:50 +00:00
Alexandre Riera	df3e818182	refs #5074 refactor this.receipt.description	2023-02-06 08:07:50 +01:00
Alex Moreno	c11df75a82	Merge branch 'master' into hotFix_invoiceIn_supplier_email	2023-02-06 06:30:56 +00:00
Alexandre Riera	fd31547b22	Merge branch 'dev' into 3291-entryLatestBuys-buscador	2023-02-06 06:00:41 +00:00
Alexandre Riera	546b3f6c9b	refs #3291 lateral menu added, fixed tests	2023-02-03 15:21:27 +01:00
Alex Moreno	2717c6420c	fix(invoiceIn_descriptor): supplier.email	2023-02-03 14:58:58 +01:00
Joan Sanchez	d773837740	Removed user model	2023-02-03 14:44:00 +01:00
Vicent Llopis	ba5616055b	feat: item.descriptor en summary coge el warehouse por defecto	2023-02-03 14:31:50 +01:00
Joan Sanchez	38f34adc9a	Merge pull request 'master → test' (!1305) from master into test ... Reviewed-on: #1305	2023-02-03 12:44:42 +00:00
Vicent Llopis	c32a627fe5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day	2023-02-03 13:23:42 +01:00
Guillermo Bonet	ca24de7ee5	refs #4975 Changed description	2023-02-03 12:50:19 +01:00
Guillermo Bonet	dddeca0832	refs #4975 Added property dsName in mdbBranch tab	2023-02-03 12:46:01 +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
Alexandre Riera	141ae7b11c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador	2023-02-03 11:56:09 +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
Juan Ferrer	f4fc597c2c	Merge pull request 'master to test' (!1302) from master into test ... Reviewed-on: #1302	2023-02-03 08:12:09 +00: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	e3de54b811	changed styles on summary	2023-02-03 08:35:15 +01:00
Pau	199dd2ba8d	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-03 06:09:38 +00:00
Alex Moreno	8a50c56284	fix(updateWorkCenter): use vnNew()	2023-02-02 14:52:40 +01: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
Alexandre Riera	16a6167db0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador	2023-02-02 10:39:26 +01:00
Pau	cadd525380	Merge branch 'dev' into 5174-refactor-ticket-weekly	2023-02-02 08:36:07 +00:00
Joan Sanchez	d45c0cb99a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-02 08:59:39 +01:00
Joan Sanchez	4477486f8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-02 08:58:44 +01:00
Alexandre Riera	5f656a894f	buscador	2023-02-02 08:52:38 +01:00
Joan Sanchez	85bde58752	Merge pull request 'fixes #4927 supplier.fiscal-data permitir 'Razón social' duplicada' (!1230) from 4927-permitir-razonSocial-duplicada into dev ... Reviewed-on: #1230 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-02 07:47:38 +00:00
Alexandre Riera	780018e4df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-02-02 08:40:49 +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
Alex Moreno	5b228c5e71	Merge branch 'master' into hotFix_getRate2	2023-02-02 07:35:34 +00: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
Joan Sanchez	644d98ec1c	syncUser() and setPassword() changes	2023-02-02 07:32:38 +01:00
Alexandre Riera	547c7a336b	Merge branch 'dev' into 5072-comprobar-email-clientFiscalData	2023-02-01 08:52:17 +00:00
Pau	ec73b512fc	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-01 09:26:25 +01:00
Alexandre Riera	73b7a1d761	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary	2023-02-01 08:52:53 +01:00
Alexandre Riera	62766706b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData	2023-02-01 08:52:03 +01:00
Alexandre Riera	7d7e1a74da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-02-01 08:46:28 +01:00
Alexandre Riera	d17f9396ad	refs #3291 save button	2023-02-01 08:43:13 +01:00
Alex Moreno	00ffc82f8d	use CURDATE() in rawSQL	2023-02-01 08:34:14 +01:00
Pau	dcd74bacc0	refs #5181 @1h30	2023-02-01 08:32:22 +01:00
Alex Moreno	ae6e0f0772	Merge branch 'master' into hotFix_getRate2	2023-02-01 06:20:48 +00: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
Guillermo Bonet	909f0c3532	Merge branch 'master' into 4975-mdbConfig-and-upload	2023-02-01 06:09:44 +00:00
Alexandre Riera	11a605ea04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje	2023-01-31 15:40:54 +01:00
Alexandre Riera	c6f87f9084	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5131-cambios-ticketAdvance	2023-01-31 15:39:03 +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
Joan Sanchez	e34d64361b	Account refactor	2023-01-31 14:57:24 +01:00
Guillermo Bonet	18168b07bb	refs #4975 Changes	2023-01-31 14:47:24 +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
Juan Ferrer	5045a8f670	#5175 TpvTransaction.confirm(): Return response	2023-01-31 14:00:10 +01:00
Guillermo Bonet	e12f183968	refs #4975 Added chat/send in mdbVersion/upload	2023-01-31 13:46:42 +01:00
Juan Ferrer	5a4ae7d742	refs #5174 TpvTransaction: Methods start & end added, fixes & refactor	2023-01-31 13:29:17 +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	906f80da5a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5104-convert-prices	2023-01-31 11:56:41 +01: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
Alexandre Riera	1b12770655	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData	2023-01-31 11:31:01 +01:00
Alex Moreno	292898708b	result not null	2023-01-31 11:24:09 +01:00
Alex Moreno	320ceb3e2c	fix: getRate2	2023-01-31 11:17:31 +01:00
Alexandre Riera	ca967a7223	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary	2023-01-31 11:15:46 +01:00
Alex Moreno	62cd6ab0c9	Merge branch 'dev' into fix_e2e_state_and_date	2023-01-31 09:39:08 +00:00
Alex Moreno	4740cdbbb9	fix: e2e	2023-01-31 10:37:18 +01:00
Vicent Llopis	19120ef102	feat: el descriptor coge el warehouseFk dependiendo de la sección	2023-01-31 09:28:28 +01:00
Alexandre Riera	7d617c0ac4	refs #5129 translations and userErrors added	2023-01-31 09:04:45 +01:00
Juan Ferrer	82bc7307f0	#5174 Signature verification fixed & enabled	2023-01-31 00:41:36 +01:00
Juan Ferrer	424dcb954c	refs #5174 Hotfix	2023-01-30 20:23:52 +01:00
Juan Ferrer	64d8ae1f49	refs #5174 Hotfix	2023-01-30 20:22:52 +01:00
Juan Ferrer	339cdab3c4	refs #5174 Debug enabled	2023-01-30 19:59:46 +01:00
Juan Ferrer	d6794cb4c8	#5174 Hotfix	2023-01-30 19:51:01 +01:00
Juan Ferrer	b20194b6d0	#5174 Hotfix	2023-01-30 17:45:36 +01:00
Juan Ferrer	5744759d53	refs #5122 Hotfix: Signature verification	2023-01-30 17:33:15 +01:00
Alexandre Riera	444d2ae4c4	refs #5104 grouping/packing unified	2023-01-30 15:28:47 +01:00
Alex Moreno	a74fb31b5b	fix: vn.time	2023-01-30 15:15:27 +01:00
Alexandre Riera	5a72398393	Merge branch 'dev' into 5074-ticketBalance-null	2023-01-30 14:01:17 +00:00
Alex Moreno	c990b9a564	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 14:37:24 +01:00
Vicent Llopis	a1e86f2bd6	Merge branch 'dev' into fix_e2e_item.tags	2023-01-30 13:28:50 +00: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
Pau	2218197188	Merge branch 'dev' into 5070-route-tickets-link-maps	2023-01-30 12:51:38 +00:00
Alexandre Riera	c3346ebb93	Merge branch 'dev' into 5074-ticketBalance-null	2023-01-30 12:35:07 +00:00
Alexandre Riera	9cb363e4e5	refs #5074 deleted null in reference	2023-01-30 13:34:08 +01:00
Vicent Llopis	0d044b3a73	Merge branch 'dev' into fix_e2e_item.tags	2023-01-30 11:51:10 +00:00
Vicent Llopis	3b94f916b7	refactor	2023-01-30 12:49:01 +01:00
Vicent Llopis	903a42683d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-30 12:45:17 +01:00
Juan Ferrer	109556ae2e	refs #5122 Hotfix: Basic implementation for payment confirmation	2023-01-30 12:39:47 +01:00
Pau	6709012e59	refs #5070 @2h refactor goToBuscaman method	2023-01-30 12:33:28 +01:00
Alexandre Riera	8119b301c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-30 12:21:54 +01:00
Alexandre Riera	77742d94d7	refs #5138 summary changed like route/tickets	2023-01-30 12:19:11 +01:00
Vicent Llopis	0ffbb5fe2c	feat: actualizada visualizacion de datos	2023-01-30 12:13:01 +01:00
Robert Ferrús	7614b48c9a	refs #5115 transfer_sales	2023-01-30 11:44:14 +01:00
Pau	cf64de39f9	refs #5146 @1h add step to vn-inputs	2023-01-30 09:01:20 +01:00
Alexandre Riera	7e5f50e637	refs #5072 email validation added	2023-01-30 08:30:39 +01:00
Alex Moreno	4e65e88621	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 07:56:12 +01:00
Vicent Llopis	79bf1739ba	fix: backTest	2023-01-27 13:52:14 +01:00
Vicent Llopis	29c6ca35ff	fix: test e2e	2023-01-27 13:39:19 +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	0f1f671b84	Merge branch 'dev' into 5077-horaEnvio-ticketBasicData	2023-01-27 09:06:08 +00: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
Alex Moreno	7d9e7d93e5	Merge branch 'dev' into 4925-item.tags	2023-01-27 08:12:32 +00:00
Vicent Llopis	7bcddf73c6	Merge branch 'dev' into 4860-route.index_downloadZip	2023-01-27 08:07:19 +00:00
Vicent Llopis	eb00d98885	Merge branch 'dev' into 4925-item.tags	2023-01-27 08:01:25 +00:00
Vicent Llopis	fe3d81ddd3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day	2023-01-27 08:59:52 +01:00
Vicent Llopis	f7969c616c	fix: tiene el cuenta zonEvent.type	2023-01-27 08:59:28 +01:00
Alexandre Riera	fccfabdcd1	hotfix viewReceipt clientBalance	2023-01-27 08:31:14 +01:00
Vicent Llopis	67a64582e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-27 08:21:30 +01:00
Alexandre Riera	d69b204c4c	refs #5036 loggable refactored, tests fixed	2023-01-26 15:49:30 +01:00
Vicent Llopis	17b3e8c396	Merge branch 'dev' into 4860-route.index_downloadZip	2023-01-26 13:36:50 +00:00
Alexandre Riera	25f0c0d9e3	refs #5141 province added	2023-01-26 14:16: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	f7fa082294	refator: name endpoint	2023-01-26 13:49:09 +01:00
Vicent Llopis	67127554f9	feat: solo muestra los clientes con error y muestra los datos de manera distinta	2023-01-26 13:12:53 +01:00
Vicent Llopis	0ba95bd163	feat: mostrar error	2023-01-26 09:25:52 +01:00
Alex Moreno	0a096bc96f	fix: updateWorkCenter	2023-01-25 15:29:01 +01:00
Vicent Llopis	caf1dcd690	feat: añadido almacén por defecto	2023-01-25 15:19:33 +01:00
Pau	ef6b06e147	added logs	2023-01-25 14:44:00 +01:00
Joan Sanchez	12cf79ab39	Updated e2e	2023-01-25 14:14:55 +01:00
Vicent Llopis	77340c8459	refactor: html	2023-01-25 10:14:37 +01:00
Vicent Llopis	6ea1415895	refactor: traducciones	2023-01-25 09:46:08 +01:00
Vicent Llopis	4a73e4ae5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-25 09:24:55 +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
Vicent Llopis	f22f045444	refactor: add css	2023-01-25 08:27:39 +01:00
Vicent Llopis	06b4e03320	feat: muestra en número de clientes en vez de su id	2023-01-25 08:15:50 +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
Vicent Llopis	61b0aa079a	refactor	2023-01-24 12:40:43 +01:00
Joan Sanchez	2676e09b2b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-24 12:34:00 +01:00
Alexandre Riera	ca7154bff1	hotfix itemName	2023-01-24 12:16:10 +01:00
Joan Sanchez	388af5110f	Updated unit test	2023-01-24 11:57:08 +01:00
Joan Sanchez	f0b44a2992	Updated back unit tests	2023-01-24 10:35:21 +01:00
Vicent Llopis	facaee6f95	feat: añadido contador y porcetaje	2023-01-24 09:45:52 +01:00
Joan Sanchez	3456438485	Model fix	2023-01-24 09:20:02 +01:00
Joan Sanchez	0208b31f44	Naming rollback	2023-01-24 09:12:26 +01:00
Joan Sanchez	3076123c04	Updated models relation	2023-01-24 09:05:50 +01:00
Joan Sanchez	89eb065f6d	Updated models	2023-01-24 09:04:43 +01:00
Vicent Llopis	1154179ddf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-24 08:11:46 +01:00
Vicent Llopis	ec5e2a21f7	feat: añadido icono carro	2023-01-24 08:09:35 +01:00
Vicent Llopis	084a3f0398	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4860-route.index_downloadZip	2023-01-24 08:05:18 +01:00
Joan Sanchez	ee1ce21bb9	refactor(account): account model refactor	2023-01-23 15:24:00 +01:00
Alex Moreno	fe656aa125	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 14:10:20 +01:00
Alexandre Riera	07d3fef8f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-23 13:44:19 +01:00
Alexandre Riera	635e787cce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-01-23 13:26:05 +01:00
Alex Moreno	ce06274d0a	Merge branch 'dev' into 4658-createWorker	2023-01-23 07:12:26 +00: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
Pau	b446f5cf5f	Merge branch 'dev' into 5063-item-module-doPhoto	2023-01-23 07:21:53 +01:00
Pau	2e988ea701	doPhoto updated on item upload	2023-01-20 13:34:36 +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	a473d3a6f9	refs #4945 changed input-number for autocomplete	2023-01-20 12:01:13 +01:00
Alexandre Riera	199fabbb1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal	2023-01-20 10:11:52 +01:00
Alexandre Riera	89700f71f7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-20 10:05:42 +01:00
Alexandre Riera	f30b1ecff1	refs #4927 changed hook for validateAsync	2023-01-20 10:03:00 +01:00
Vicent Llopis	7148da7b72	feat: cuando se descarga una sola factura, no descarga el zip	2023-01-20 08:53:30 +01:00
Vicent Llopis	f7b314daf4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4860-route.index_downloadZip	2023-01-20 08:32:54 +01:00
Alex Moreno	a674169ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-20 08:30:30 +01:00
Vicent Llopis	ef7a0508ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-20 08:29:42 +01:00
Vicent Llopis	5d19da48e2	refactor: actualizada consulta sql	2023-01-20 08:16:02 +01:00
Joan Sanchez	781c751229	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-01-20 07:42:36 +01:00
Alexandre Riera	292372395e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-20 07:15:03 +01:00
Vicent Llopis	eefafb3ac2	fix: available is cero	2023-01-19 15:14:31 +01:00
Vicent Llopis	dfcacdad71	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail	2023-01-19 08:56:39 +01:00
Vicent Llopis	921b5cf3fb	add excluded test	2023-01-19 08:54:36 +01:00
Vicent Llopis	92a9004d98	fix: borrada propiedad transaction cuando se hace commit	2023-01-19 08:54:26 +01:00
Vicent Llopis	38e4349e17	borrado comentario	2023-01-18 14:25:24 +01:00
Vicent Llopis	2c995208d1	fix: transaccionado por trabajador y día	2023-01-18 14:23:05 +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	200a256016	Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal	2023-01-18 12:15:12 +00:00
Alexandre Riera	be5f987b0a	refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig	2023-01-18 13:14:49 +01:00
Vicent Llopis	7368b572a0	fix: añadidos await y actualizado condicional permissionRate	2023-01-18 13:05:02 +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
Vicent Llopis	ae051c73f2	feat: añadir clientes al principio del array y borrarlos si han sido OK	2023-01-18 07:26:57 +01:00
Vicent Llopis	849f4e1a6d	fix: frontTest	2023-01-17 14:24:04 +01:00
Vicent Llopis	ea36c0deb5	feat: el pdf de las rutas se descarga en un zip	2023-01-17 14:06:18 +01:00
Vicent Llopis	b7004e6a76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-17 12:50:34 +01:00
Joan Sanchez	1597c40a16	Merge branch 'dev' into 4930-add-zone	2023-01-17 11:33:56 +00:00
Vicent Llopis	41914f9e4f	feat: añadido desplegable impresora	2023-01-17 10:46:16 +01:00
Alex Moreno	bc9510a317	Merge branch 'dev' into 4523-item_fixed-price_rate2	2023-01-17 09:46:16 +00:00
Pau	99338bb6f8	isPhotoRequired implemented	2023-01-17 10:11:41 +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
Alexandre Riera	77eb9c8013	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal	2023-01-17 10:10:23 +01:00
Alexandre Riera	4e1c43eb4d	refs #4945 nombre temporal removed	2023-01-17 10:01:49 +01:00
Pau	3a1aea2afd	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-17 09:01:45 +00:00
Vicent Llopis	eef926d09d	fix: fixtures	2023-01-17 09:34:51 +01:00
Alexandre Riera	e97a02a871	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-17 09:02:27 +01: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	ff39a81b8c	Merge branch 'dev' into 4523-item_fixed-price_rate2	2023-01-17 06:07:14 +00:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alexandre Riera	7da42a30f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5061-cambios-ticketsFuturo	2023-01-16 14:34:34 +01:00
Alexandre Riera	57c5ea98bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-16 14:27:40 +01:00
Alexandre Riera	4d12e29b3d	refs #5061 fix filter	2023-01-16 14:24:53 +01:00
Guillermo Bonet	3d4600d70d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method	2023-01-16 12:26:10 +01:00
Alexandre Riera	b78bebf27c	refs #5061 added hour in date, changed ipt filter	2023-01-16 12:22:22 +01:00
Alex Moreno	ecfad94057	refactor(worker_new): remove roleFk and profileType	2023-01-16 12:19:03 +01:00
Alexandre Riera	b3c6443277	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-16 10:33:35 +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	2cc89d9ae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-13 13:54:16 +01:00
Alex Moreno	2918c9c71d	skip intermittent test	2023-01-13 13:52:19 +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
Alexandre Riera	7720c32bc4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-13 09:58:03 +01:00
Alex Moreno	d7e8c4fafd	fix(print_invoiceIn): translation invoice to receipt	2023-01-13 09:28:44 +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
Alexandre Riera	41671e8a3a	refs #4927 modified hook to check name & country	2023-01-13 08:38:29 +01:00
Guillermo Bonet	868c2aaaef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method	2023-01-12 15:25:51 +01:00
Alex Moreno	5bb66fec3f	test(docuware): back tests	2023-01-12 15:16:38 +01:00
Alexandre Riera	f01b729a61	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-12 14:09:39 +01:00
Joan Sanchez	54356ece7d	fix(monitor): refresh monitor when using ng-for track ... Refs: #5083	2023-01-12 13:53:38 +01:00
Pau	e05fa7c747	Merge branch 'master' into #5081-hotfix-sms-faltas	2023-01-12 13:00:01 +01:00
Pau	d5a7691b9c	add controller function	2023-01-12 12:56:51 +01:00
Pau	2678d59191	front test expected old value	2023-01-12 11:57:20 +01:00
Vicent Llopis	da8b6b7f2d	fix: comprueba que hay registros	2023-01-12 11:52:27 +01:00
Pau	b6de50848a	refs #5081 fix sms faltas	2023-01-12 11:48:44 +01:00
Vicent Llopis	2451d00998	Merge branch 'dev' into 4925-item.tags	2023-01-12 07:59:43 +00:00
Vicent Llopis	e4603a06f2	refacotor: borrados los await para que devuelva la promesa	2023-01-12 08:59:24 +01:00
Vicent Llopis	4b60aacbbe	refactor: añadidos valores a piñon a la tabla workerTimeControlConfig	2023-01-12 08:50:03 +01:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Vicent Llopis	352fba9acf	Merge branch 'dev' into 5035-intermittent_backTest	2023-01-12 07:32:44 +00: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
Joan Sanchez	3f7dee63ac	Merge branch 'dev' into 4873-zone.delivery-day	2023-01-12 06:17:58 +00:00
Guillermo Bonet	d448f41ac1	refs #4975 Changed description of last method	2023-01-11 15:39:33 +01:00
Alex Moreno	9f324483d6	refactor(docuware): only use axios and refactor all	2023-01-11 15:19:09 +01:00
Pau	c908a71ebf	Merge branch 'dev' into 4875-fix-back-tests	2023-01-11 13:22:40 +00:00
Alexandre Riera	a0491de9f9	refs #5036 refactor transaction and fixing ticket logs	2023-01-11 13:24:55 +01:00
Vicent Llopis	f7ee6c18ca	refactor: movido codigo que imprime pdf dentro del try	2023-01-11 13:04:56 +01:00
Vicent Llopis	1df6ce170d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-11 12:38:47 +01:00
Vicent Llopis	9042eaaf9f	add fixtures	2023-01-11 12:38:37 +01:00
Vicent Llopis	caff537f2e	feat: imprime las facturas	2023-01-11 12:29:03 +01:00
Vicent Llopis	020068006c	fix: manejado error si no se selecciona una empresa	2023-01-11 11:57:52 +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
Vicent Llopis	3e920e6a2f	corregida traduccion	2023-01-10 14:34:25 +01:00
Vicent Llopis	ae3b26b202	Merge branch 'dev' into 4873-zone.delivery-day	2023-01-10 13:14:12 +00:00
Vicent Llopis	6f94987392	Merge branch 'dev' into 2952-ticket.sale-checked	2023-01-10 13:11:06 +00:00
Pau	e0cf45546e	Merge branch 'dev' into 4875-fix-back-tests	2023-01-10 12:57:39 +00: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
Vicent Llopis	484b8d42e1	fix: corregido sql	2023-01-10 13:31:20 +01:00
Vicent Llopis	984a3294f9	Merge branch 'dev' into 4846-claim.search-panel	2023-01-10 11:58:00 +00:00
Alexandre Riera	9f1c6e6d1d	Merge branch 'dev' into 4866-detalle-faltas	2023-01-10 10:48:10 +00:00
Alexandre Riera	6bdbd77640	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-10 10:15:41 +01:00
Vicent Llopis	ac3e68d846	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest	2023-01-10 10:14:46 +01:00
Vicent Llopis	ff653ad834	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-10 09:18:02 +01:00
Alexandre Riera	28ac2677a3	Merge branch 'dev' into 4937-marcar-verRecibo	2023-01-10 08:02:51 +00:00
Joan Sanchez	4cfa63918f	Merge branch 'dev' into 4875-fix-back-tests	2023-01-10 07:41:26 +00:00
Vicent Llopis	eb3ed95b22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-10 08:32:44 +01:00
Alexandre Riera	07fc5b69ad	Merge branch 'dev' into 4926-add-itemPackingOut	2023-01-10 07:32:03 +00:00
Vicent Llopis	cdee85e1e8	refacotor: change description	2023-01-10 08:31:32 +01:00
Guillermo Bonet	f23eb9f4ad	refs #4975 Added call to last method in upload	2023-01-09 18:28:09 +01:00
Alex Moreno	382aad2622	feat(docuware): upload and send pdf	2023-01-09 15:11:53 +01:00
Vicent Llopis	e659f0f020	refacotor: delete duplicated variable	2023-01-09 14:55:25 +01:00
Vicent Llopis	84788afc10	delete: old button	2023-01-09 14:51:41 +01:00
Vicent Llopis	5a5e4c5afb	feat: solo coge los tickets que no esten eliminados	2023-01-09 14:47:52 +01:00
Guillermo Bonet	2803de9445	refs #4975 Return JSON {version:xxx}	2023-01-05 14:20:47 +01:00
Robert Ferrús	6891da4863	refactor(invoiceOut): updated translation ... Refs #4857	2023-01-05 11:43:08 +01:00
Vicent Llopis	1aa21c16b5	refactor: borrado join a worker	2023-01-05 11:42:21 +01:00
Vicent Llopis	810a1afcd9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2023-01-05 11:40:25 +01:00
Vicent Llopis	d16235cba9	fix: show error when is negative base	2023-01-05 10:55:56 +01:00
Vicent Llopis	3abbfc4fa7	refacotr	2023-01-05 10:35:55 +01:00
Vicent Llopis	fd9ca3a4c1	add test	2023-01-05 10:35:49 +01:00
Pau	f0761a92a2	reactivate working tests	2023-01-05 09:26:11 +01:00
Alex Moreno	46f36e1de1	try	2023-01-04 15:03:45 +01:00
Alex Moreno	021c475de7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2023-01-04 09:39:26 +01:00
Alex Moreno	9c044dc95b	fix: phone	2023-01-04 09:38:43 +01:00
Alex Moreno	9b98249398	test: front test and e2e	2023-01-04 09:23:18 +01:00
Alexandre Riera	6ff17f0af0	Merge branch 'dev' into 4588-campo-nota-ultimo-usuario	2023-01-03 13:51:28 +00:00
Alex Moreno	ef437f2fee	test: e2e and backTest	2023-01-03 14:50:29 +01:00
Vicent Llopis	ac5aa815f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-03 14:35:18 +01:00
Vicent Llopis	21a62a0fab	refactor	2023-01-03 13:29:44 +01:00
Vicent Llopis	fec965a8dd	refs 4925 refactor: borrados console.log y actualizada descripción	2023-01-03 13:29:27 +01:00
Pau	56354ba771	reactivate test	2023-01-03 13:24:44 +01:00
Vicent Llopis	22d0da273e	refs #4925 fix: coge únicamente los últimos cambios aplicados	2023-01-03 13:21:51 +01:00
Alexandre Riera	ac56744244	Merge branch 'dev' into 4866-detalle-faltas	2023-01-03 12:15:26 +00:00
Vicent Llopis	ddfee57470	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-03 13:09:02 +01:00
Vicent Llopis	415fa04e3b	refs #2952 feat: add chips	2023-01-03 13:06:30 +01:00
Vicent Llopis	25dad4b358	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-03 13:03:36 +01:00
Alexandre Riera	c6ad9a6aff	Merge branch 'dev' into 4937-marcar-verRecibo	2023-01-03 12:00:39 +00:00
Pau	4dee2313f4	Merge branch 'dev' into 4875-fix-back-tests	2023-01-03 12:53:03 +01:00
Alexandre Riera	2eea1e68e8	Merge branch 'dev' into 4926-add-itemPackingOut	2023-01-03 11:45:35 +00:00
Alex Moreno	29483bcc1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-03 12:28:55 +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	fe7f388f3d	Merge branch 'dev' into 4846-claim.search-panel	2023-01-03 08:07:31 +00:00
Alexandre Riera	9887f87dd3	refs #5051 pending added	2023-01-03 08:34:46 +01:00
Alex Moreno	46c3d87dab	feat(worker_create): add vn-acl	2023-01-03 08:09:46 +01:00
Alex Moreno	aa5cfde1ae	test(worker_new): add back tests	2023-01-02 14:52:03 +01:00
Alexandre Riera	96f2e4b542	refs #5051 skipped tests and changed fixtures	2023-01-02 13:35:33 +01:00
Alexandre Riera	7fcc787a69	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-02 07:14:59 +01:00
Alexandre Riera	f027a7b07f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4937-marcar-verRecibo	2023-01-02 07:12:10 +01:00
Alexandre Riera	7d61933a3c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-02 07:07:09 +01:00
Vicent Llopis	3792a80ad5	refs #4925 feat: añadido back para editar tags	2022-12-29 14:24:32 +01:00
Vicent Llopis	2b62e16164	fix: test	2022-12-29 11:47:12 +01:00
Vicent Llopis	dc93454ac3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2022-12-29 11:34:54 +01:00
Pau	edcc55df26	refs #4875 @3h disable random to be able to test with some kind of reliability	2022-12-29 10:01:38 +01:00
Vicent Llopis	3801436dc0	feat: mostrar fallos, mostrar más datos y actualizar estilo	2022-12-29 08:15:04 +01:00
Vicent Llopis	4579758ba6	refactor: add translation	2022-12-29 07:20:07 +01:00
Alexandre Riera	502461fde5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut	2022-12-28 13:25:10 +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
Vicent Llopis	ba7e5d6a91	refator: se usa loopback cuando se puede	2022-12-28 11:56:34 +01:00
Alex Moreno	2c5e42d408	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-28 11:49:16 +01:00
Alexandre Riera	9971611a0b	Merge branch 'dev' into 4866-detalle-faltas	2022-12-28 09:31:33 +00:00
Alexandre Riera	b6e17d3489	Merge branch 'dev' into 4971-filtrar-articulo	2022-12-28 09:16:14 +00:00
Alexandre Riera	30197e9e15	Merge branch 'dev' into 4866-detalle-faltas	2022-12-28 09:07:26 +00:00
Vicent Llopis	eed6d05e23	delete console.log	2022-12-28 08:51:39 +01:00
Vicent Llopis	eb4cb318ed	refactor: evitar join innecesarios en el filter general	2022-12-28 08:43:02 +01:00
Alex Moreno	bee65f9c69	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2022-12-28 07:24:08 +01:00
Vicent Llopis	3dd0c79629	feat: add ItemShelvingSales/filter	2022-12-27 15:00:49 +01:00
Vicent Llopis	4295ae0108	delete	2022-12-27 14:17:16 +01:00
Vicent Llopis	7b8a9791b4	refactor: code	2022-12-27 13:50:10 +01:00
Vicent Llopis	b406551f52	delete: old section	2022-12-27 12:21:12 +01:00
Vicent Llopis	e324716f2f	feat: add subsection Global invoicing	2022-12-27 12:21:04 +01:00
Alexandre Riera	c06c3dc6a7	refs #4957 saleChecked deleted	2022-12-27 11:50:58 +01:00
Alexandre Riera	5eda1388ef	refs #4927 unique key added	2022-12-27 10:26:56 +01:00
Alexandre Riera	96a6f0b9d9	refs #4926 packingOut added	2022-12-27 07:48:09 +01:00
Pau	1c1cc93ef4	Merge branch 'master' into Hotfix-crear-report-Factura-Electronica	2022-12-26 06:18:47 +00:00
Alexandre Riera	d827795441	refs #4930 agency changed for zone	2022-12-23 12:38:05 +01:00
Vicent Llopis	fb325d5e65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-12-23 12:34:51 +01:00
Vicent Llopis	29e66157ea	fix: se excluyen los test de back que fallan intermitente	2022-12-23 12:29:28 +01:00
Vicent Llopis	d3a9e9ac89	delete: columnas que ya no existen en la tabla	2022-12-23 12:17:24 +01:00
Alexandre Riera	7d1b8c8c56	refs #4971 itemSearchFunc added	2022-12-23 12:11:24 +01:00
Vicent Llopis	16c20e4700	feat: add itemShelvingSale popup	2022-12-23 12:08:16 +01:00
Alexandre Riera	53b5ef6d78	refs #4937 viewReceipt added	2022-12-23 11:48:59 +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
Alexandre Riera	cf527dd8be	refs #4588 hook added	2022-12-23 09:37:19 +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
Joan Sanchez	606bacbad7	Merge branch 'dev' into 4531-monitor_duplicates	2022-12-22 10:37:48 +00:00
Vicent Llopis	7f80c7ed2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-22 09:30:35 +01:00
Pau	314bd69d6e	Merge branch 'master' into Hotfix-crear-report-Factura-Electronica	2022-12-22 06:13:01 +00:00
Guillermo Bonet	5a25b0ef4c	refs #4975 Added model MdbVersionTree	2022-12-22 07:12:44 +01:00
Guillermo Bonet	d97a2738a4	refs #4975 Upload method modified and addedd model	2022-12-22 07:12:09 +01:00
Vicent Llopis	8880a83b89	feat: añadido saleTracking	2022-12-21 15:03:41 +01:00
Alex Moreno	7e6cdc9152	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2022-12-21 13:47:54 +01:00
Alex Moreno	502a692521	test(item_fixedPrice_rate2): backTest and e2e	2022-12-21 12:55:11 +01:00
Vicent Llopis	630890cd04	fix: colum name in model	2022-12-21 12:23:16 +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
Vicent Llopis	a1134879e6	Merge branch 'master' into hotfix_4961-travel.extra-community	2022-12-21 08:57:59 +00:00
Vicent Llopis	7261415e16	fix: añadido length	2022-12-21 09:36:31 +01:00
Alex Moreno	b4b7b8e204	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2022-12-21 09:08:39 +01:00
Alexandre Riera	081ef7fc99	Merge branch 'dev' into 3963-ticket-advance	2022-12-21 07:30:17 +00:00
Vicent Llopis	1d7145d74b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-21 08:05:19 +01:00
Vicent Llopis	5a4a78d045	Merge branch 'dev' into 3951-invoiceOut.index_downloadZip	2022-12-21 07:02:12 +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
Vicent Llopis	8b5f5d928e	fix: backTest	2022-12-20 10:40:39 +01:00
Vicent Llopis	b7100873a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadZip	2022-12-20 10:11:52 +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
Vicent Llopis	63343998d8	refactor: cambiada la forma en que se descarga el zip	2022-12-20 09:48:58 +01:00
Joan Sanchez	c063c0e72f	fix(pagination): duplicated rows on paginate ... Refs: #4531	2022-12-20 09:48:41 +01:00
Vicent Llopis	1a616fa1d4	refactor: delete transaction	2022-12-20 09:09:21 +01:00
Pau	d8cae400a8	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-20 07:11:59 +00:00
Alexandre Riera	cd71a59dfe	Merge branch 'dev' into 4928-supplier-payMethod-notify	2022-12-20 07:01:45 +00:00
Alex Moreno	5d2b69d063	test(item_fixedPrice): front recalculateRate2	2022-12-19 15:06:59 +01:00
Alex Moreno	f82870bec6	feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item	2022-12-19 14:39:38 +01:00
Pau	5a01e49f27	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-19 12:25:58 +00:00
Guillermo Bonet	dc82e610b7	refs #4975 Minor changes	2022-12-19 11:24:18 +01:00
Alex Moreno	17a3896c1c	Merge branch 'dev' into 4548-invoiceIn-pdf-2	2022-12-19 07:32:52 +00:00
Guillermo Bonet	a46c2ced7c	refs #4975: Added last mdbVersion/last method	2022-12-19 07:26:07 +01:00
Pau	28e0d0566c	Merge branch 'dev' into 4875-skip-tests	2022-12-19 06:13:45 +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
Alexandre Riera	b72cb64bf8	refs #4928 findById	2022-12-16 12:50:09 +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
Alexandre Riera	522000cd04	refs #4928 fix fixtures	2022-12-15 09:52:34 +01:00
Alexandre Riera	5a975d0b05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify	2022-12-15 09:22:36 +01:00
Alexandre Riera	33196acac6	refs #4928 fixture notification, fix test supplier	2022-12-15 08:31:47 +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	3b9cd5be09	Merge pull request 'fixes #4859 export_db' (!1200) from 4859-export_db into dev ... Reviewed-on: #1200 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-15 07:21:01 +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
Vicent Llopis	4e8896202a	delete: transacción innecesaria	2022-12-15 07:17:26 +01:00
Vicent Llopis	6793b8e9a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-15 07:13:09 +01:00
Guillermo Bonet	76001ec022	refs #4204 labelCount argument not required	2022-12-14 16:15:41 +01:00
Alex Moreno	156f2b9129	feat: handle errors and autogenerate user and code	2022-12-14 15:03:55 +01:00
Vicent Llopis	e616835600	delete: hasDateRange()	2022-12-14 13:40:28 +01:00
Vicent Llopis	f7a97a8139	fix: siempre muestra el botón si hay datos	2022-12-14 13:31:56 +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
Alex Moreno	b378598113	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-14 10:15:11 +01:00
Alex Moreno	c14059df75	fix(supplier_consumption): fix JOIN	2022-12-14 10:12:51 +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
Alex Moreno	1e0b0028f2	fix: only edit structure	2022-12-13 13:37:25 +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
Alex Moreno	8900656b14	Merge branch 'dev' into 4859-export_db	2022-12-13 08:29:32 +00:00
Alexandre Riera	86a58a26ea	Merge branch 'dev' into 4893-formato-correo	2022-12-13 08:07:48 +00:00
Guillermo Bonet	d7a6350995	refs #4898 Created report expedition-pallet-label	2022-12-12 18:27:45 +01:00
Alex Moreno	bb944f9fee	feat(newWorker): use worker-welcome	2022-12-12 15:05:49 +01:00
Alex Moreno	09edb99a1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-12 13:48:06 +01:00
Alex Moreno	4cb8d8c763	test: enable one test and skip another	2022-12-12 13:11:45 +01:00
Vicent Llopis	2e14e04ed0	Merge branch 'dev' into 4846-claim.search-panel	2022-12-12 11:17:15 +00:00
Vicent Llopis	9bcef08397	feat: buscar por responsibleFk sin afectar a la consulta principal	2022-12-12 12:08:30 +01:00
Alex Moreno	b2dcb84a7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-12-12 11:57:27 +01:00
Joan Sanchez	f93398c783	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-12 10:27:28 +01:00
Alexandre Riera	704cb71b61	refs #4866 instance log added and e2e done	2022-12-07 13:53:59 +01:00
Alex Moreno	995fb6a5c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-12-02 13:13:53 +01:00
Vicent Llopis	14a3a815da	fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE	2022-12-02 12:05:25 +01:00
Joan Sanchez	6128414685	m3 decimal	2022-12-02 11:26:21 +01:00
Joan Sanchez	0c4ab815fd	decimal	2022-12-02 11:24:08 +01:00
Joan Sanchez	6562b68341	fix(agencyTerm): permitir decimales en m3 minimos	2022-12-02 11:16:49 +01:00
Alexandre Riera	48a7635449	refs #4893 regex changed	2022-12-02 09:18:52 +01:00
Pau	691d157da8	Merge branch 'dev' into 4875-skip-tests	2022-12-01 13:33:52 +00:00
Pau	c54844f7ff	removed pending from working test	2022-12-01 14:32:05 +01:00
Joan Sanchez	e815292d6b	fix(componentUpdate): updated filter where sintax	2022-12-01 09:24:56 +01:00
Joan Sanchez	6cb0e518d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-01 07:33:38 +01:00
Vicent Llopis	4c0effc48a	refacor: description actualizada	2022-12-01 07:25:18 +01:00
Vicent Llopis	6c59a3098d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-12-01 07:24:40 +01:00
Vicent Llopis	444d495b7f	refactor: codigo reducido	2022-12-01 07:22:13 +01:00
Vicent Llopis	ba8fe7dfa8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-01 07:11:00 +01:00
Alex Moreno	8df7b91127	fix: entry ref	2022-11-30 15:24:33 +01:00
Alex Moreno	43bd583d6f	Merge branch 'dev' into 4875-skip-tests	2022-11-30 13:49:59 +00:00
Pau	79f8e30ded	add pending to the tests	2022-11-30 14:49:00 +01:00
Pau	67384b724d	refs #4875 skipped failing test	2022-11-30 14:41:03 +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
Vicent Llopis	68855add59	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-11-30 10:53:54 +01:00
Pau	97baa89a71	Merge branch 'dev' into hotfix(#4914)-Bug-Client-Phone	2022-11-30 09:52:19 +01:00
Alexandre Riera	492b852be8	delete orderBy	2022-11-30 09:22:53 +01:00
Pau	bef1071316	refs #4914 @1h	2022-11-30 09:22:03 +01:00
Alexandre Riera	27078595ce	fix balances	2022-11-30 08:39:04 +01:00
Pau	02598ced92	solve merge conficts	2022-11-30 07:12:26 +01:00
Pau	2d7b3cc3a2	Merge branch 'dev' into 4871-socialName-on-client-filter	2022-11-29 13:13:57 +00:00
Joan Sanchez	990dd88e2c	Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev ... Reviewed-on: #1186	2022-11-29 13:08:38 +00:00
Joan Sanchez	5f3e7c3384	Merge branch 'test' into master	2022-11-29 11:49:06 +00:00
Alexandre Riera	cd8d5efa88	corrections	2022-11-29 10:29:18 +01:00
Pau	ddc543ad63	Merge branch 'dev' into 4557-duplicate-tickets-in-routes	2022-11-29 08:22:05 +00:00
Alexandre Riera	acbd0474a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-29 08:50:48 +01:00
Vicent Llopis	e3e337c02e	fix: backTest	2022-11-28 14:28:47 +01:00
Vicent Llopis	4b54cf954b	refactor: envia el email con formato Verdnatura	2022-11-28 13:56:21 +01:00
Carlos Andrés	2a4e8cdde9	Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio	2022-11-28 12:19:58 +00:00
Pau	0d6e424a3e	allow client search by socialname	2022-11-28 10:21:01 +01:00
Alex Moreno	da2d1df522	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:14:16 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Vicent Llopis	7f3265be55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-11-25 12:24:00 +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
Carlos Andrés	8d2e532167	#4613 eliminar uso de portfolio	2022-11-25 09:32:54 +01:00
Vicent Llopis	dbbce77cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-25 07:41:43 +01:00
Pau	65f82c8fc1	Merge branch 'dev' into 4557-duplicate-tickets-in-routes	2022-11-25 06:05:05 +00: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
Joan Sanchez	0f40aa3e27	Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev ... Reviewed-on: #1175 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-11-24 12:49:53 +00:00
Pau	001c3ec2ac	requested changes	2022-11-24 12:06:13 +01:00
Vicent Llopis	20d0d053ac	Merge branch 'dev' into 4682-searchbar_filter	2022-11-24 11:03:23 +00:00
Vicent Llopis	74e8789439	Merge branch 'dev' into 4793-models_translation	2022-11-24 10:54:40 +00:00
Pau	37a7a12f87	requested change	2022-11-24 11:47:32 +01: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
Vicent Llopis	927b5a63ec	Merge branch 'dev' into 4793-models_translation	2022-11-24 09:14:01 +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
Alexandre Riera	5124b3b681	Merge branch 'dev' into 4547-fix-compensation	2022-11-24 08:42:09 +00:00
Alexandre Riera	23cf2d9aaf	Merge branch 'dev' into 3949-invoiceIn-add-docFk	2022-11-24 08:33:39 +00: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
Alex Moreno	f70a9cb785	feat(worker_new): use resetPassword funcionality	2022-11-23 14:46:25 +01:00
Alex Moreno	cbdffc98a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-23 14:16:42 +01:00
Vicent Llopis	14eba75a8e	feat: backTest	2022-11-23 14:08:43 +01:00
Vicent Llopis	1c6a5164d4	feat: buscar por itemFk y claimResponsibleFk	2022-11-23 14:04:43 +01:00
Alexandre Riera	164b797ab8	front and e2e tests done	2022-11-23 11:09:32 +01:00
Vicent Llopis	9a47b2fea4	Merge branch 'dev' into 4682-searchbar_filter	2022-11-23 10:00:27 +00:00
Vicent Llopis	f313a53cde	refactor: cambiadas fixtures, backTest y traducciones	2022-11-23 10:56:55 +01:00
Vicent Llopis	6a2af344aa	feat: antes de bloquear comprobar que no existe un bloqueo previo	2022-11-23 10:41:32 +01:00
Vicent Llopis	9cfab2b3f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-23 10:23:17 +01:00
Vicent Llopis	bf782c3782	fix: añadido esquema account	2022-11-23 10:09:09 +01:00
Vicent Llopis	e854fd248e	feat: add checkInBox	2022-11-23 10:08:58 +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
Vicent Llopis	ccce6af021	fix: add translations	2022-11-23 07:57:27 +01:00
Pablo Natek	83ed79569a	refs #4844	2022-11-22 20:45:18 +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
Vicent Llopis	df4acb70a3	feat: add backTest	2022-11-22 14:43:21 +01:00
Vicent Llopis	e0ba7d523c	refacfor: add ctx	2022-11-22 14:43:15 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Alexandre Riera	8613b196d8	Merge branch 'dev' into 4547-fix-compensation	2022-11-22 13:31:04 +00:00
Vicent Llopis	32f28e91b5	feat: sistema de bloque para ficheros mdb	2022-11-22 14:29:42 +01:00