14255 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	c15d40b237	Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true	2022-11-10 08:45:15 +00:00
Pau	2704017486	check default true	2022-11-10 09:43:19 +01:00
Joan Sanchez	b8add5b0bc	Report template	2022-11-10 08:57:42 +01:00
Joan Sanchez	5a56fb4b6a	Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev ... Reviewed-on: #1079 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-10 07:50:10 +00:00
Joan Sanchez	abe816bbe5	Merge pull request '4550-printServer' (!1131) from 4550-printServer into dev ... Reviewed-on: #1131 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-10 07:44:32 +00:00
Pau	772ea00777	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-11-10 07:43:25 +00:00
Alexandre Riera	817f231a29	Merge pull request 'refs #2596 drag and drop implementado' (!1119) from 2596-arrastrar-ficheros into dev ... Reviewed-on: #1119 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-11-10 07:41:58 +00:00
Pau	c4044ff70d	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-11-10 07:40:14 +00:00
Alexandre Riera	897a7d079d	Merge branch 'dev' into 2596-arrastrar-ficheros	2022-11-10 07:40:10 +00:00
Pau	8b06243041	Fix link being the whole column	2022-11-10 08:36:26 +01:00
Pau	8dd6012b1f	Added worker descriptor popover	2022-11-10 08:27:47 +01:00
Pau	c53e309071	Fix typo	2022-11-10 08:19:54 +01:00
Pau	1327f0ae9d	Added requested changes, refs #4507 @1:20h	2022-11-10 08:18:05 +01:00
Joan Sanchez	89e49c3843	Template component	2022-11-10 07:48:24 +01:00
Pau	eab9289408	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-10 06:26:05 +00:00
Pau	b1a068ea48	Merge branch '4157-send-sms-to-routes' of https://gitea.verdnatura.es/verdnatura/salix into 4157-send-sms-to-routes	2022-11-10 07:23:10 +01:00
Pau	891cd6b474	Added requestes changes refs #4157	2022-11-10 07:23:08 +01:00
Pau	747404521a	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-10 06:22:24 +00:00
Pau	da8ebf1509	Merge branch '4492-item.create-same-as-item.isLaid' of https://gitea.verdnatura.es/verdnatura/salix into 4492-item.create-same-as-item.isLaid	2022-11-10 07:17:57 +01:00
Pau	638fd62aae	added requested changes, refs #4492 @40m	2022-11-10 07:17:54 +01:00
Pau	dd10ec3154	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-10 06:15:00 +00:00
Guillermo Bonet	6804c1a756	Merge branch 'dev' into 4550-printServer	2022-11-09 16:55:29 +01:00
Alex Moreno	617e2d804f	typo	2022-11-09 14:52:25 +01:00
Alex Moreno	5339bc1143	feat(recoverPassword): use loopback	2022-11-09 14:51:30 +01:00
Alex Moreno	cace29f75c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-09 14:20:17 +01:00
Alexandre Riera	175e7b128a	Merge pull request 'refs #4547 informe y email generados' (!1114) from 4547-informe-compensacion into dev ... Reviewed-on: #1114 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-11-09 12:34:33 +00:00
Alexandre Riera	ff2ee4401e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion	2022-11-09 13:26:54 +01:00
Vicent Llopis	0bd09ae366	fix: delete unnecessary column	2022-11-09 12:06:51 +01:00
Vicent Llopis	1ea5ffa6d3	fix: backTest	2022-11-09 12:04:19 +01:00
Vicent Llopis	be46f30dd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-09 10:32:24 +01:00
Joan Sanchez	f9eee431b4	fix(driver-route): routes with empty lines	2022-11-09 10:27:00 +01:00
Vicent Llopis	574f2757f4	refactor code	2022-11-09 10:19:27 +01:00
Vicent Llopis	79e9edcee9	delete: old code	2022-11-09 09:26:28 +01:00
Juan Ferrer	993ae11277	refs #3302	2022-11-09 09:19:56 +01:00
Vicent Llopis	2ab475791c	refactor code	2022-11-09 09:16:58 +01:00
Vicent Llopis	dbd0e77e12	feat: send mail with the invoice pdf	2022-11-09 09:14:32 +01:00
Vicent Llopis	9bcfebcae6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-09 07:26:56 +01:00
Alex Moreno	8c137b57f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-09 07:10:35 +01:00
Alexandre Riera	ff00066138	refs #4700 tests front y fixtures	2022-11-08 15:56:58 +01:00
Guillermo Bonet	6744b3f797	added collection-label	2022-11-08 14:40:38 +01:00
Pau	2fc12dff52	#4457 @1h notifications working, need refactor ACL	2022-11-08 13:59:00 +01:00
Joan Sanchez	8607ab7ccc	Merge pull request 'MASTER_hotfix_deleteTrashFiles2' (!1130) from MASTER_hotfix_deleteTrashFiles2 into master ... Reviewed-on: #1130	2022-11-08 12:52:06 +00:00
Vicent Llopis	9890db820b	feat: borra los dms sin file y elimina registros aunq no se pueda eliminar la carpeta	2022-11-08 12:48:09 +01:00
Pau	e85505ee8e	#4457 implement notification system, @1h 30m	2022-11-08 12:26:01 +01:00
Pau	f21907855f	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-08 10:04:47 +01:00
Pau	5dafdd5daa	Merge pull request '4490-transfer-tickets-between-clients' (!1104) from 4490-transfer-tickets-between-clients into dev ... Reviewed-on: #1104 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-08 08:52:11 +00:00
Pau	f45eaa07f9	refs #4511 fixed test, changed drop to rename @1h	2022-11-08 09:45:56 +01:00
Pau	d1be14605b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4511-kkear-expedition.itemFk	2022-11-08 09:32:09 +01:00
Pau	78e6c8da15	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-08 09:08:06 +01:00
Pau	f1e832ee66	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-11-08 08:06:30 +00:00