14227 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alexandre Riera	95967a29db	refs #4928 email template added and proc modified	2022-12-13 11:50:17 +01:00
Vicent Llopis	b852ab8e1f	delete change	2022-12-13 10:03:23 +01:00
Vicent Llopis	91f955ccf5	refactor: move sql changes	2022-12-13 09:56:05 +01:00
Vicent Llopis	e4dbeb0b33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-13 09:54:56 +01:00
Alex Moreno	8900656b14	Merge branch 'dev' into 4859-export_db	2022-12-13 08:29:32 +00:00
Alexandre Riera	1f0f5adcd8	Merge pull request 'fixes #4893 Comprobar formato del correo al insertar' (!1196) from 4893-formato-correo into dev ... Reviewed-on: #1196 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-13 08:13:40 +00:00
Alexandre Riera	86a58a26ea	Merge branch 'dev' into 4893-formato-correo	2022-12-13 08:07:48 +00:00
Alex Moreno	7c992746f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2	2022-12-13 08:32:23 +01:00
Alex Moreno	f9200dd178	Merge branch '4658-createWorker' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-13 08:31:40 +01:00
Alex Moreno	e7100c3e5a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-12-13 08:15:41 +01:00
Guillermo Bonet	6ca8b646c2	refs #4898 Added userFk in QR	2022-12-12 19:36:11 +01: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
Joan Sanchez	dc777ea69f	Added version after merging to test	2022-12-12 14:23:40 +01:00
Joan Sanchez	e000103ca4	Deleted version	2022-12-12 14:22:32 +01:00
Vicent Llopis	3d47ee1cd9	feat: inseet in notificationSubscription	2022-12-12 13:53:21 +01:00
Alex Moreno	7822a6cac8	change folder	2022-12-12 13:48:20 +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	158a71a326	restrictions	2022-12-12 13:37:14 +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
Carlos Andrés	16d096d8ef	Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket	2022-12-12 10:45:33 +00:00
Joan Sanchez	f93398c783	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-12 10:27:28 +01:00
Carlos Andrés	41b7b6ab06	Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket	2022-12-12 08:24:11 +00:00
Alexandre Riera	4bafcc905a	refs #4866 fix css	2022-12-09 11:41:08 +01:00
Alexandre Riera	0da90fdb4e	refs #4866 fdescribe removed	2022-12-07 13:56:24 +01:00
Alexandre Riera	704cb71b61	refs #4866 instance log added and e2e done	2022-12-07 13:53:59 +01:00
Alexandre Riera	569a0e8cc9	refs #3302 log modified and fixed e2e tests	2022-12-05 15:30:41 +01:00
Alexandre Riera	36a78fac7f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-05 08:06:25 +01:00
Vicent Llopis	f7178f4e32	Merge pull request 'MASTER_hotfix_invoiceOut' (!1197) from MASTER_hotfix_invoiceOut into master ... Reviewed-on: #1197	2022-12-02 12:25:33 +00: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	af9d52a367	Merge branch 'master' into MASTER_hotfix_invoiceOut	2022-12-02 12:04:11 +00:00
Joan Sanchez	8a07e8810d	Merge pull request 'MASTER_hotfix_deleteTrashFiles3' (!1194) from MASTER_hotfix_deleteTrashFiles3 into master ... Reviewed-on: #1194	2022-12-02 11:57:50 +00:00
Joan Sanchez	ac447d4981	Updated SQL version nomenclature	2022-12-02 12:48:12 +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	5235ed5499	Merge branch 'dev' into 4732-previa-label	2022-12-02 08:05:04 +00:00
Joan Sanchez	12cfa05696	fix(invoicePdf): invoice correction	2022-12-02 08:33:56 +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
Vicent Llopis	e7173fe156	fix: backTest	2022-12-01 11:59:30 +01:00
Vicent Llopis	ede721a37b	Merge branch 'master' into MASTER_hotfix_deleteTrashFiles3	2022-12-01 10:57:44 +00:00
Joan Sanchez	e815292d6b	fix(componentUpdate): updated filter where sintax	2022-12-01 09:24:56 +01:00
Vicent Llopis	2bb6c1c1da	fix: borra registros aunq no tengan file adjunto	2022-12-01 07:54:32 +01:00