7424 Commits

Author	SHA1	Message	Date
Carlos Satorres	7025326e06	Merge branch 'dev' into 6044-fixTickCalendar	2023-09-04 10:31:08 +00:00
Sergio De la torre	3795404789	Merge branch 'dev' into 4815-deviLogModel	2023-09-01 10:15:26 +00:00
Carlos Satorres	9b971abb55	refs #6044 class scss	2023-09-01 11:49:08 +02:00
Sergio De la torre	00201197cc	Merge branch 'dev' into 4815-deviLogModel	2023-09-01 05:24:55 +00:00
Sergio De la torre	7d8828e604	refs #6132 fix: saveSign without route	2023-08-31 13:50:31 +02:00
Javi Gallego	ea5e10faed	Merge pull request 'test' (!1730) from test into dev ... Reviewed-on: #1730	2023-08-31 07:58:48 +00:00
Juan Ferrer	d60e35d817	Merge pull request 'refs #6153 master into test' (!1726) from master into test ... Reviewed-on: #1726	2023-08-29 06:50:27 +00:00
Jorge Penadés	7f1db050ad	Merge branch 'dev' into 5216-expeditionStateAdd	2023-08-25 12:56:53 +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	45c58feb8c	Merge branch 'dev' into 6146-route-sugestedTicket-error	2023-08-25 12:10:52 +00:00
Vicent Llopis	b304210e8f	Merge branch 'dev' into 5244-component_workerAutocomplete	2023-08-25 08:47:12 +00:00
Javi Gallego	1d300237f2	Merge branch 'dev' into 6146-route-sugestedTicket-error	2023-08-25 09:59:18 +02: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
Javi Gallego	a3d301f12e	Merge branch 'dev' into 6143-refactor-iban-con-country	2023-08-25 07:23:08 +02: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
Javi Gallego	b5b7770f3f	refs #6146 fixes: muestra la agencia de la ruta	2023-08-24 10:41:28 +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
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	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	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
Vicent Llopis	c7c17e6e4a	Merge branch 'dev' into 6013-sendMail_fix	2023-08-22 11:18:08 +00:00
Vicent Llopis	2f2611a705	Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-08-22 10:31:17 +00:00
Alex Moreno	a26652045c	refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel	2023-08-22 10:17:46 +02:00
Guillermo Bonet	6d60592fb9	Merge branch 'master' into test	2023-08-21 09:34:32 +02:00
Guillermo Bonet	86def6e212	refs #5995 Changed query getExternalCmrs	2023-08-21 08:47:28 +02:00
Alex Moreno	518d5111e4	refs #6127 hotFix(ticketRefund): get ticketFk front ticketService	2023-08-17 08:42:04 +02:00
Alex Moreno	868fbbfc2e	cau #103812 hotFix(supplier): beforeSave name	2023-08-16 08:04:32 +02:00
Sergio De la torre	8d0b3efa11	refs #4815 feat:DeviceLog Model	2023-08-14 09:39:40 +02:00
Alex Moreno	00fa5b7ce3	Merge branch 'dev' into fix-fixtures_test	2023-08-11 07:38:53 +00:00
Alex Moreno	afc0c98065	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-10 11:05:37 +02:00
Alex Moreno	bdf0138c70	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-08-10 10:40:40 +02:00
Guillermo Bonet	b197109556	refs #5995 Requested changes	2023-08-10 10:14:22 +02:00
Carlos Satorres	a11905ee63	Merge branch 'dev' into fix-fixtures_test	2023-08-10 08:00:07 +00:00
Carlos Satorres	8807b9f87f	fix upper	2023-08-10 09:58:48 +02:00
Alex Moreno	de773bc849	Merge branch 'master' into 5995-liliumExternalCmr	2023-08-10 06:55:56 +00:00
Guillermo Bonet	d6b30271f2	refs #5995 Requested changes	2023-08-10 08:12:52 +02:00
Guillermo Bonet	ed88a5b25f	refs #5995 Minor change	2023-08-10 07:54:49 +02:00