17797 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	cfbd24c721	Merge pull request '6146-route-sugestedTicket-error' (!1722) from 6146-route-sugestedTicket-error into dev ... Reviewed-on: #1722 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-25 12:54:52 +00:00
Jorge Penadés	5fe12d9281	Merge branch 'dev' into 5216-expeditionStateAdd	2023-08-25 12:43:26 +00:00
Jorge Penadés	ca28d2d78f	ref #5216 myOptions added	2023-08-25 14:37:32 +02:00
Alex Moreno	2ecc464046	refs #5673 feat(claim_development): redirect to lilium	2023-08-25 14:26:17 +02:00
Alex Moreno	45c58feb8c	Merge branch 'dev' into 6146-route-sugestedTicket-error	2023-08-25 12:10:52 +00:00
Vicent Llopis	00b1746fd8	Merge branch 'dev' into 5918-worker.time-control_resend	2023-08-25 11:32:58 +00:00
Vicent Llopis	864ffd032f	Merge pull request '5244-component_workerAutocomplete' (!1679) from 5244-component_workerAutocomplete into dev ... Reviewed-on: #1679 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-08-25 08:56:42 +00:00
Pablo Natek	2fde7c37dc	Merge branch 'dev' into 6159-businessAfterInsert	2023-08-25 08:56:26 +00:00
Pablo Natek	c06ee9c5b0	refs #6159 fixUserNoActiveOnNewBusiness	2023-08-25 10:55:10 +02:00
Vicent Llopis	b304210e8f	Merge branch 'dev' into 5244-component_workerAutocomplete	2023-08-25 08:47:12 +00:00
Vicent Llopis	c4cf5f3a4f	Merge branch 'dev' into 5918-worker.time-control_resend	2023-08-25 08:04:42 +00:00
Vicent Llopis	9da5c4c1db	refs #5918 refacotr: cambiado nombre variable	2023-08-25 10:04:27 +02:00
Javi Gallego	1d300237f2	Merge branch 'dev' into 6146-route-sugestedTicket-error	2023-08-25 09:59:18 +02:00
Javi Gallego	351096bd11	Merge pull request 'refs #6143 refactor: ibanValidation with countryCode param' (!1713) from 6143-refactor-iban-con-country into dev ... Reviewed-on: #1713 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-25 07:56:05 +00:00
Alex Moreno	1f06cc2072	Merge pull request 'refs #5941 feat(sendToSupport): don't show the button if it doesn't have token' (!1720) from 5941-warmFix_sendToSupport_mandatoryToken into test ... Reviewed-on: #1720 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-08-25 07:55:15 +00:00
Javi Gallego	f54a239229	fixes #6143 fixes: this.bankEntityFk no existe	2023-08-25 09:46:53 +02:00
Jorge Penadés	083f19fd41	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd	2023-08-25 08:11:44 +02:00
Alex Moreno	7e0865e4b7	refs #5941 feat(sendToSupport): don't show the button if it doesn't have token	2023-08-25 08:01:11 +02:00
Pablo Natek	4ae06d4b6b	refs #6159 fixBusinessAfterInsert	2023-08-25 07:36:52 +02:00
Javi Gallego	a3d301f12e	Merge branch 'dev' into 6143-refactor-iban-con-country	2023-08-25 07:23:08 +02:00
Pablo Natek	671e34da9a	Merge pull request 'refs #5881 createRolAndGrantAcl' (!1715) from 5881-createRolClaim into dev ... Reviewed-on: #1715 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-24 11:49:43 +00:00
Jorge Penadés	386de69bce	refs #5216 fix error handling	2023-08-24 12:47:10 +02:00
Alex Moreno	4c1d9cd767	hotFix(priceDifference): import UserError	2023-08-24 11:32:20 +02:00
Pablo Natek	c5006b6be6	refs #5881 insertAcl	2023-08-24 11:31:13 +02:00
Jorge Penadés	3d4a99b07e	refs 5914 transferInvoice created	2023-08-24 10:51:34 +02:00
Alex Moreno	c997ad6ccb	Merge branch 'dev' into 5881-createRolClaim	2023-08-24 08:46:52 +00:00
Javi Gallego	b5b7770f3f	refs #6146 fixes: muestra la agencia de la ruta	2023-08-24 10:41:28 +02:00
Vicent Llopis	6e6e4d40d0	Merge pull request '6013-sendMail_fix' (!1694) from 6013-sendMail_fix into dev ... Reviewed-on: #1694 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-24 08:35:03 +00:00
Pablo Natek	3694fcbbfb	refs #5881 fixCreateRol	2023-08-24 10:04:33 +02:00
Jorge Penadés	bda3937417	refs #5216 path replaced and test created	2023-08-24 10:01:07 +02:00
Vicent Llopis	9a12169ba4	Merge branch 'dev' into 6013-sendMail_fix	2023-08-24 07:33:07 +00:00
Vicent Llopis	beeebbdf9c	refs #6013 refactor: siempre se crea una tranacción para cada dia	2023-08-24 09:33:58 +02:00
Vicent Llopis	1f63648697	refs #5918 fix: muestra los botones en una línea y no carga todos los datos de workerTimeControlMail de la semana	2023-08-24 09:10:04 +02:00
Pablo Natek	fb9b249c7b	Merge branch 'dev' into 5881-createRolClaim	2023-08-24 06:21:58 +00:00
Pablo Natek	470f511b30	refs #5881 createRolAndGrantAcl	2023-08-24 08:05:27 +02:00
Jorge Penadés	0f3b633de4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd	2023-08-24 08:03:01 +02:00
Vicent Llopis	f8fd2bbd17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-08-24 07:50:24 +02:00
Vicent Llopis	3cffdca0c7	Merge branch 'dev' into 5244-component_workerAutocomplete	2023-08-24 05:39:48 +00:00
Vicent Llopis	dad792cb76	refs #5244 move changes sql	2023-08-24 07:40:37 +02:00
Alex Moreno	3eacb4dbd9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-23 12:05:04 +02:00
Alex Moreno	508a4b2d34	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-08-23 12:04:27 +02:00
Alex Moreno	8454d208e1	hotFix(route_tickets): orderBy nickname	2023-08-23 12:02:52 +02:00
Jorge Penadés	82d08261e5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd	2023-08-23 10:25:48 +02:00
Alex Moreno	7349d4496f	refs #5351 hotFix(worker_sip): use worker.id not worker.userFk	2023-08-23 07:34:01 +02:00
Javi Gallego	4657bf4e43	refs #6143 refactor: ibanValidation with countryCode param	2023-08-22 14:58:26 +02:00
Alex Moreno	59888dfdb8	Merge branch 'dev' into 5244-component_workerAutocomplete	2023-08-22 11:54:44 +00:00
Alex Moreno	5690d9bd72	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-22 13:51:50 +02:00
Alex Moreno	5a5e3ebddb	refs #5712 hotFix(catalog): undo last fix search_panel	2023-08-22 13:39:57 +02:00
Vicent Llopis	dd1dbcbd4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-08-22 13:39:09 +02:00
Alex Moreno	cb8ed437d9	refs #6140 fix: el valor de ttl ya no es undefined	2023-08-22 13:21:17 +02:00