12806 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	2df195764d	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-11-08 08:05:13 +01:00
Joan Sanchez	ac6fbd07a9	Upgraded node version	2022-10-31 13:24:39 +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
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	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	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	714fe32552	Fix error	2022-10-27 09:26:02 +02:00
Joan Sanchez	51f95f0261	Fixed error	2022-10-27 09:23:08 +02:00
Joan Sanchez	6a2bc5b593	Disabled back tests	2022-10-27 09:18:32 +02:00
Alex Moreno	3ffc098b56	feat(privileges): check if user has role from userToUpdate	2022-10-27 09:01:09 +02:00
Alex Moreno	99fca9834f	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-27 06:10:14 +00:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Alex Moreno	607e9010e6	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 12:36:35 +00:00
Joan Sanchez	4334907d91	fix(database): updated sql files	2022-10-25 14:09:21 +02:00
Joan Sanchez	418ba65c2e	Merge pull request '2612-create-supplier' (!1089) from 2612-create-supplier into dev ... Reviewed-on: #1089 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-25 10:42:05 +00:00
Pau	e72d57150a	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-25 10:40:57 +00:00
Alex Moreno	ac8c4b8ef0	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 10:39:50 +00:00
Pau	296a743d8a	Fix test, remove console log	2022-10-25 12:25:56 +02:00
Pau	7b04464848	Merge branch 'dev' into 2612-create-supplier	2022-10-25 10:00:13 +00:00
Joan Sanchez	1196125350	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-25 11:58:47 +02:00
Alex Moreno	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Pau	2cc9f0d9f7	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-25 09:47:10 +00:00
Pau	76d248131c	Merge branch 'dev' into 2612-create-supplier	2022-10-25 09:45:25 +00:00
Joan Sanchez	330af56d2f	Intl polyfill	2022-10-25 11:42:28 +02:00
Pau	39b70ed75f	Merge pull request '4153-supplier.fiscal-data' (!1096) from 4153-supplier.fiscal-data into dev ... Reviewed-on: #1096 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-25 09:38:14 +00:00
Pau	d60f6769b4	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-25 08:53:01 +00:00
Pau	9089ba7346	requested changes	2022-10-25 10:42:16 +02:00
Joan Sanchez	8f0b566935	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-25 07:25:07 +00:00
Joan Sanchez	5811a0f56e	Merge pull request 'MASTER_hotfix: check if email exists' (!1103) from 4708-client.basic-data into master ... Reviewed-on: #1103 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-25 06:21:36 +00:00
Joan Sanchez	4520443734	fix: Intl polyfill for spanish locale	2022-10-25 08:16:56 +02:00
Vicent Llopis	931a891f71	fix: check client.email exists	2022-10-25 08:09:23 +02:00
Joan Sanchez	e80754f280	Added new SQL version	2022-10-24 18:37:38 +02:00
Joan Sanchez	fe95c45c42	Merge pull request 'MASTER_hotFix(receipt): add receiptPdf' (!1100) from hotFix_receiptPdf into master ... Reviewed-on: #1100 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-24 10:23:05 +00:00
Alex Moreno	a66c5e6798	acl	2022-10-24 11:30:17 +02:00
Alex Moreno	6a17a634d4	hotFix(receipt): add receiptPdf	2022-10-24 09:49:51 +02:00
Pau	25e934a591	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-24 06:02:20 +00: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
Pau	aa13034ee6	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-20 07:10:21 +00:00