13436 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	fc7a39e910	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-11-02 07:33:07 +01:00
Alex Moreno	18341a24dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into changesInCorrectFolder	2022-11-02 07:29:12 +01:00
Alex Moreno	a7b1ee85fe	fix changes folder	2022-11-02 07:27:57 +01:00
Joan Sanchez	ea5c081a73	Merge pull request 'refs #4716 tipos actualizados' (!1115) from 4716-tipos-aceptados into dev ... Reviewed-on: #1115 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 06:26:03 +00:00
Joan Sanchez	67f2c00663	Merge branch 'dev' into 4497-services-intrastat	2022-11-02 06:24:03 +00:00
Alex Moreno	d1ab159323	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-10-31 14:13:21 +00:00
Alex Moreno	ee9aef0085	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-31 15:12:49 +01:00
Alex Moreno	e7047e982f	fix e2e	2022-10-31 15:07:22 +01:00
Vicent Llopis	d9107719fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-10-31 15:04:33 +01:00
Vicent Llopis	3243d35bd7	feat: send email	2022-10-31 14:48:37 +01:00
Pau	ff5e601a1e	Item islaid and test	2022-10-31 14:43:31 +01:00
Alex Moreno	b37c257885	feat(canEdit): use checkAccess	2022-10-31 14:13:06 +01:00
Alex Moreno	36c0cc1a38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-31 14:12:40 +01:00
Vicent Llopis	1f2ea2c4d8	fix: incorrect number of params	2022-10-31 13:30:08 +01:00
Joan Sanchez	ac6fbd07a9	Upgraded node version	2022-10-31 13:24:39 +01:00
Vicent Llopis	273a8cd7c7	refactor code	2022-10-31 13:00:32 +01:00
Joan Sanchez	231575d23e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-31 12:40:07 +01:00
Joan Sanchez	d34936015b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-10-31 12:39:54 +01:00
Joan Sanchez	463d3e6e12	Fixes	2022-10-31 12:39:26 +01:00
Alexandre Riera	b5889d2f40	refs #4497 servicios añadidos	2022-10-31 10:35:43 +01:00
Vicent Llopis	b17fe0d18c	refator code	2022-10-31 09:55:11 +01:00
Vicent Llopis	838402f05a	add fixtures	2022-10-31 09:55:05 +01:00
Pau	0739608de3	Merge branch 'dev' into 4457-hasInvoiceElectronic	2022-10-31 07:57:50 +01:00
Vicent Llopis	786ba0d614	feat: inserta fichadas de los teletrabajadores	2022-10-31 07:34:34 +01:00
Alexandre Riera	57e74fab38	refs #4716 tipos actualizados	2022-10-28 15:53:57 +02:00
Alexandre Riera	1246a65f32	refs #4547 informe y email generados	2022-10-28 14:49:22 +02:00
Alex Moreno	70c97120b3	Merge pull request 'MASTER_4073-user_hasGrant' (!1107) from 4073-user-hasGrant-master into master ... Reviewed-on: #1107 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-10-28 11:15:55 +00:00
Alex Moreno	445c6f1cc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-28 09:32:08 +02:00
Alex Moreno	8aa537c040	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-28 09:24:36 +02:00
Alex Moreno	9170c22d6f	fix send email	2022-10-28 09:21:28 +02:00
Alex Moreno	e9731c4ac0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-28 09:11:40 +02:00
Vicent Llopis	264b56378a	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-28 06:31:12 +00:00
Alex Moreno	9c9db3250e	Merge pull request '4075-ticket_boxing' (!1070) from 4075-ticket_boxing into dev ... Reviewed-on: #1070 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-10-28 06:29:56 +00:00
Alex Moreno	9eb3b09be1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-28 08:26:45 +02:00
Alex Moreno	ad1b429d10	check if user has role from userToUpdate	2022-10-28 08:09:47 +02:00
Alex Moreno	88dda4523f	Merge pull request '4320-notificationQueue' (!1087) from 4320-notificationQueue into dev ... Reviewed-on: #1087 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-10-28 06:06:01 +00:00
Alex Moreno	80617dd578	Merge branch 'dev' into 4320-notificationQueue	2022-10-28 05:33:45 +00:00
Alex Moreno	9225e8f176	fix tests	2022-10-27 15:11:57 +02:00
Pau	ce8463712a	Merge branch 'dev' into 1885-delete-orderConfirmUser.spec.js	2022-10-27 08:13:04 +00:00
Alex Moreno	9d85389691	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-27 09:35:16 +02:00
Alex Moreno	da78b39874	Merge branch 'dev' into 4075-ticket_boxing	2022-10-27 07:29:39 +00:00
Alex Moreno	5c65314162	use findById	2022-10-27 09:27:50 +02:00
Joan Sanchez	1da7ff4f06	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-10-27 07:27:38 +00:00
Joan Sanchez	714fe32552	Fix error	2022-10-27 09:26:02 +02:00
Joan Sanchez	7188b8498b	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-10-27 07:24:09 +00:00
Joan Sanchez	51f95f0261	Fixed error	2022-10-27 09:23:08 +02:00
Joan Sanchez	d610c6dff3	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-10-27 07:19:33 +00:00
Joan Sanchez	6a2bc5b593	Disabled back tests	2022-10-27 09:18:32 +02:00
Pau	736de00e77	deleted the test as requested on #1885	2022-10-27 09:18:00 +02:00
Pau	00061caa65	Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients	2022-10-27 09:05:06 +02:00