7990 Commits

Author	SHA1	Message	Date
Javier Segarra	485968037b	Merge branch 'dev' into 6264-renewToken	2023-12-14 06:22:17 +00:00
Sergio De la torre	af83519ee6	Merge branch 'dev' into 6275-silex-to-salix	2023-12-13 15:12:39 +00:00
Javier Segarra	1e89ed6cdc	Merge branch 'dev' into 6264-renewToken	2023-12-13 14:39:10 +00:00
David Domenech	9bcd0a3c98	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 11:29:46 +00:00
David Domenech	ee6ad55e66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-13 09:43:20 +01:00
Pablo Natek	f63b26b71f	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 07:52:36 +00:00
Pablo Natek	69dd34665f	refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit	2023-12-13 08:50:17 +01:00
Sergio De la torre	435819cf3c	refs #6275 feat:Silex_to_Salix test getExpeditionSummary	2023-12-13 07:24:13 +01:00
Javier Segarra	d44cdcbd13	Merge branch 'dev' into 6264-renewToken	2023-12-13 06:14:55 +00:00
Sergio De la torre	e22201c840	Merge branch 'dev' into 6275-silex-to-salix	2023-12-12 14:50:25 +00:00
Sergio De la torre	9937fbed5e	REFS #6275 feat:Silex_to_Salix	2023-12-07 11:59:01 +01:00
Sergio De la torre	67994188ee	Merge branch 'dev' into 6028_routesByWorkerEmail	2023-12-07 10:42:30 +00:00
Sergio De la torre	fa65cc84a9	REFS #6275 feat:Silex_to_Salix	2023-12-07 11:39:22 +01:00
Sergio De la torre	0263d880ca	refs #6028 add:email in ByWorker	2023-12-07 08:00:17 +01:00
Carlos Satorres	3c9c221220	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:59:38 +00:00
Sergio De la torre	c9bcd672c9	refs #6028 add:email in ByWorker	2023-12-07 07:59:21 +01:00
Carlos Satorres	c7d960229d	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:34:32 +00:00
Carlos Satorres	acfa0fd857	Merge branch 'dev' into 6318-negativeQuantity	2023-12-07 06:31:21 +00:00
Javi Gallego	7ff8ec93ff	Merge pull request 'test' (!1879) from test into dev ... Reviewed-on: #1879	2023-12-06 07:54:13 +00:00
Carlos Satorres	f55e85a189	refs #6010 remove pending	2023-12-05 10:35:48 +01:00
Carlos Satorres	af07a531ed	refs #6318 quantity	2023-12-05 08:49:55 +01:00
Sergio De la torre	3692021b12	Merge branch 'dev' into 6275-silex-to-salix	2023-12-05 07:26:22 +00:00
Sergio De la torre	318f7e3c0d	REFS #6275 feat:Silex_to_Salix	2023-12-05 08:20:55 +01:00
Javier Segarra	a8b0a7a5b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-12-04 14:46:21 +01:00
Pablo Natek	bec1ff71ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-01 13:43:27 +01:00
Jorge Penadés	611b45bae0	Merge branch 'dev' into 5835-summaryRate	2023-11-30 15:16:18 +00:00
David Domenech	eb0766bafd	Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk	2023-11-30 14:08:47 +00:00
Pablo Natek	72283005b8	remove(console.log): refs #3271 remove console.log	2023-11-30 14:43:14 +01:00
David Domenech	8ab981907d	refactor(ticketTracking.userFk): refs #6398 workerFk to userFk	2023-11-30 14:25:00 +01:00
Pablo Natek	c457b5c4d2	Merge branch 'test' into 3271-zoneGetFilterdFix	2023-11-30 12:39:26 +00:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Alex Moreno	35e74a7635	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-30 12:48:27 +01:00
Alex Moreno	016e4ae37c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-30 12:20:50 +01:00
Pablo Natek	3f22f48df7	fix(getFiltered): refs #3271 fix to event filter	2023-11-30 12:13:12 +01:00
Jorge Penadés	6121eeaa3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate	2023-11-30 09:44:05 +01:00
Carlos Satorres	9cdb7c3cca	refs #6065 remove workcenter	2023-11-30 09:18:00 +01:00
Javier Segarra	97d7f8356f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-30 07:08:23 +01:00
Javier Segarra	1576ab992d	refs #6434 perf: new field in SignInLog table	2023-11-29 19:36:30 +00:00
Javi Gallego	d246b5f9a8	Merge branch 'dev' into 5652-fixtures-fix	2023-11-29 15:26:51 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00
Jorge Penadés	f2673c3818	refs #5835 rate added	2023-11-28 12:12:42 +01:00
Guillermo Bonet	1a5cc67312	Merge branch 'dev' into 6023-changeRol	2023-11-28 12:07:50 +01:00
Javi Gallego	2fa56cce4b	fix: refs #5652 arreglo fixtures	2023-11-28 09:22:00 +01:00
Alex Moreno	37555cbb63	refs #6335 warmFix(ticketAdvance): correct properties	2023-11-27 15:10:00 +01:00
Juan Ferrer	c7291e3367	Merge pull request 'test' (!1863) from test into dev ... Reviewed-on: #1863	2023-11-27 12:17:11 +00:00
Juan Ferrer	74772472d5	Merge pull request 'master' (!1820) from master into test ... Reviewed-on: #1820 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-27 12:16:42 +00:00
Guillermo Bonet	3bdb002034	Merge branch 'dev' into 3222-expenceToExpense	2023-11-27 09:06:17 +00:00
Guillermo Bonet	aefff68c29	refactor: refs #3222 Requested changes	2023-11-27 09:51:56 +01:00
Javier Segarra	901a44cc62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-27 09:48:31 +01:00
Javier Segarra	72a0932e35	refs #6264 other: rename camel-case variable	2023-11-27 09:46:27 +01:00