12731 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	41d2d14d39	try	2022-10-21 13:46:53 +02:00
Alex Moreno	bcfbeb7032	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-21 12:41:39 +02:00
Joan Sanchez	04be661b68	Merge pull request 'feat(print): 4690 - Puppeteer cluster' (!1094) from 4690-puppeteer_cluster into dev ... Reviewed-on: #1094	2022-10-21 10:38:11 +00:00
Joan Sanchez	ceeab73cf2	Merge pull request '4091-dms_clean_fix2' (!1091) from 4091-dms_clean_fix2 into dev ... Reviewed-on: #1091 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-21 10:36:45 +00:00
Joan Sanchez	cf0b750304	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-21 12:35:01 +02:00
Joan Sanchez	32dcdf8f8d	Merge pull request 'MASTER_hotFix(driver-route): if not have tickets' (!1098) from hotFix-driver-route-pdf into master ... Reviewed-on: #1098	2022-10-20 12:32:34 +00:00
Alex Moreno	c23d58da69	fix if not ticket	2022-10-20 14:21:36 +02:00
Alex Moreno	3564cbe246	Merge pull request 'MASTER_4689-hotFix(route_index): fix driverRoutePdf' (!1095) from hotFix_driverRoutePdf2 into master ... Reviewed-on: #1095 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-20 07:22:07 +00:00
Joan Sanchez	7d502c6f57	Merge pull request 'Send delivery note to refund tickets' (!1086) from 3505-closure_refund into dev ... Reviewed-on: #1086	2022-10-19 13:00:18 +00:00
Alex Moreno	192e61a70d	hotFix(route_index): fix driverRoutePdf	2022-10-19 14:54:13 +02:00
Joan Sanchez	dcd858c7d5	feat(print): 4690 - Puppeteer cluster	2022-10-19 14:30:36 +02:00
Pau	b36acee458	Merge pull request '4153-supplier.fiscal-data' (!1068) from 4153-supplier.fiscal-data into dev ... Reviewed-on: #1068 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-10-18 11:47:13 +00:00
Vicent Llopis	e6481af3a9	delete: transaction	2022-10-17 13:13:14 +02:00
Pau	cf50c4690a	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-17 08:41:39 +00:00
Pau	c212dfed88	removed package-lock	2022-10-17 10:18:43 +02:00
Joan Sanchez	cfdcf91be2	Merge branch 'dev' into 3505-closure_refund	2022-10-17 08:15:16 +00:00
Pau	42583a4a16	Merge pull request 'Added webp to the list of allowed images' (!1080) from 4124-webp-images into dev ... Reviewed-on: #1080 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-10-17 06:59:32 +00:00
Pau	d91814473e	Merge branch 'dev' into 4124-webp-images	2022-10-17 06:45:49 +00:00
Alex Moreno	6bfd54fc71	feat(verify): use user.verify	2022-10-17 07:22:22 +02:00
Alex Moreno	3e746ceb7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-14 14:47:42 +02:00
Joan Sanchez	9a0d98bbe4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-14 09:55:22 +02:00
Joan Sanchez	390ee60e59	Get first element in array	2022-10-14 07:26:34 +02:00
Alex Moreno	e240702884	use user	2022-10-13 14:55:34 +02:00
Joan Sanchez	67097970ed	Incoterms required param	2022-10-13 10:44:20 +02:00
Joan Sanchez	b96af0ad4d	Merge pull request 'MASTER-hotFix(monitor): use left join in ticketState' (#1085) from hotFix-monitor_leftJoin into master ... Reviewed-on: #1085 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-13 07:37:49 +00:00
Joan Sanchez	e81c39d8dc	Send delivery note to refund tickets	2022-10-13 09:30:31 +02:00
Alex Moreno	74383b61e7	hotFix(monitor): use left join in ticketState	2022-10-13 09:22:53 +02:00
Alex Moreno	acc88c8239	use ejs template	2022-10-11 14:56:33 +02:00
Joan Sanchez	b2e98c9d73	Transaction	2022-10-11 14:39:57 +02:00
Joan Sanchez	d06492d367	Transaction error	2022-10-11 14:28:14 +02:00
Alex Moreno	2e36164a98	fix(recover-password): use pint/Email	2022-10-11 10:06:25 +02:00
Alex Moreno	e80197bd6f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-11 07:22:10 +02:00
Alex Moreno	ce2ad32ac9	add email template	2022-10-10 15:16:56 +02:00
Joan Sanchez	e3606c7273	Updated unit test	2022-10-10 14:46:06 +02:00
Joan Sanchez	a4549a9f4e	Merge pull request 'MASTER-test(travel_extraCommunity): fix e2e' (#1083) from hotFix_travel_extraCommunity-e2e into master ... Reviewed-on: #1083 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-10 12:25:30 +00:00
Alex Moreno	5c4daee35e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-10 14:20:22 +02:00
Alex Moreno	e85d6bec8c	fix e2e	2022-10-10 14:03:29 +02:00
Joan Sanchez	38a6e24455	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-10 13:25:55 +02:00
Joan Sanchez	7f023d7456	Set user default warehouse	2022-10-10 12:23:40 +02:00
Joan Sanchez	4d4e446ff6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-10 10:55:09 +02:00
Joan Sanchez	990a1b3c67	250 nodes	2022-10-10 10:33:08 +02:00
Joan Sanchez	31d1b84bb9	Unfold when there's less than 100 nodes to show	2022-10-10 10:25:59 +02:00
Joan Sanchez	d104a048d8	Merge pull request 'MASTER-hotFix_travel_extraCommunity-css2' (#1081) from hotFix_travel_extraCommunity-css2 into master ... Reviewed-on: #1081	2022-10-10 07:47:50 +00:00
Alex Moreno	e497ddd664	fix: add td-editable	2022-10-10 09:21:14 +02:00
Pau	452745b04a	Added webp to the list of allowed images	2022-10-10 09:01:52 +02:00
Alex Moreno	18cd34bccb	fix(travel_extraCommunity): css	2022-10-10 08:57:41 +02:00
Joan Sanchez	e42aae747f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-10 08:10:45 +02:00
Joan Sanchez	bdf156638d	Merge pull request 'MASTER-hotFix(travel_extraCommunity): fix css' (#1078) from hotFix_travel_extraCommunity-css into master ... Reviewed-on: #1078 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-10 05:51:15 +00:00
Joan Sanchez	4ecbb59ac0	Closure hours	2022-10-10 07:49:08 +02:00
Alex Moreno	9befa2531b	Merge branch 'hotFix_travel_extraCommunity-css' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css	2022-10-10 07:29:26 +02:00