9854 Commits

Author	SHA1	Message	Date
Alex Moreno	afbf084535	Merge branch 'test' into 8032-devToTest_2440	2024-09-24 09:29:38 +00:00
Sergio De la torre	ea06afb361	Merge pull request 'fix: hotFix backLimit refs #6964' (!3003) from 6964-ListItemNewer into master ... Reviewed-on: #3003 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 05:17:02 +00:00
Robert Ferrús	31d5a7a635	feat: refs #8000 add column	2024-09-23 11:53:27 +02:00
Sergio De la torre	c6d5e2f292	fix: hotFix backLimit refs #6964	2024-09-23 08:09:24 +02:00
Ivan Mas	06f8f8e95e	refactor: refs #7725 deprecate worker.isF11Allowed	2024-09-22 08:39:19 +02:00
Carlos Satorres	eb3ea010a1	Merge branch 'master' into 6898-fixSupplier2	2024-09-20 07:31:15 +00:00
Carlos Satorres	889b86644b	fix: refs #6898 filter fix	2024-09-20 09:14:38 +02:00
Ivan Mas	24b9dfb9a9	Merge branch 'dev' into 7343-ModifyDiverRouteEmail	2024-09-19 10:50:44 +00:00
Ivan Mas	c82c9395a4	feat: refs #7343 Requested changes	2024-09-19 12:49:45 +02:00
Alex Moreno	ccb60eee87	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-19 12:42:12 +02:00
Ivan Mas	c30ecd3760	feat: refs #7343 Modify driverRouteEmail.js	2024-09-19 12:26:06 +02:00
Jorge Penadés	22af34c0cb	feat: refs #7323 use scopes	2024-09-19 09:27:05 +02:00
Javi Gallego	da0e735fb2	fix: hotFix limit 5	2024-09-18 23:41:01 +02:00
Alex Moreno	79d79f0c9b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7792-twoFactorFk	2024-09-18 12:03:52 +02:00
Alex Moreno	829ecba2ef	refactor: refs #7792 revert TwoFactorType	2024-09-18 08:30:05 +02:00
Javier Segarra	96159224a4	Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf	2024-09-17 16:48:09 +02:00
Javi Gallego	06d06d7b1a	Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev ... Reviewed-on: #2970 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 13:09:18 +00:00
Javier Segarra	7f6bd55eaa	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-17 13:07:25 +00:00
Jorge Penadés	529be86d84	fix: refs #7524 too records error	2024-09-17 11:44:09 +02:00
Jorge Penadés	4332fccfcc	chore: refs #7524 rollback	2024-09-17 11:43:34 +02:00
Javier Segarra	3e5442c40b	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-17 11:42:04 +02:00
Jorge Penadés	3f321e8ee8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-getAmountPaid	2024-09-17 11:40:52 +02:00
Pablo Natek	d308f185bc	Merge branch 'dev' into 7404-stockBuyed	2024-09-17 08:11:17 +00:00
Javi Gallego	e5e14878b8	feat: refs #3505 remove return	2024-09-17 07:57:00 +02:00
Javi Gallego	06efa8be94	Merge branch 'dev' into 3505-closureTests	2024-09-17 07:12:01 +02:00
Jorge Penadés	8fedfbd090	fix: refs #7524 getAmountPaid wip	2024-09-16 13:32:14 +02:00
Javi Gallego	f43fa32d36	feat: refs #3505 fdescribe	2024-09-16 13:26:53 +02:00
Javi Gallego	e4a74ba0e9	feat: refs #3505 testBack closure	2024-09-16 13:24:33 +02:00
Guillermo Bonet	0d7953a869	Merge branch 'dev' into 7912-wasteChanges	2024-09-16 10:33:23 +00:00
Guillermo Bonet	5c7a537275	feat: refs #7912 Added new waste types	2024-09-16 12:32:52 +02:00
Jorge Penadés	0a0701f7c2	Merge branch 'dev' into 7828-makeCorrectCalls	2024-09-16 10:24:36 +00:00
Pablo Natek	1f1da689d4	fix: refs #7404 remove console log	2024-09-16 12:17:51 +02:00
Pablo Natek	138640f991	fix: refs #7404 update test to match new fixtures for travel by continent	2024-09-16 12:05:36 +02:00
Pablo Natek	8f4f2d2d15	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-16 09:06:04 +02:00
Pablo Natek	cc1cd0563f	feat: refs #7404 fixtures and translates	2024-09-16 09:00:46 +02:00
Guillermo Bonet	5489a5edbc	Merge branch 'test' into dev	2024-09-16 07:16:33 +02:00
Guillermo Bonet	2e34f1bbe6	Merge branch 'master' into test	2024-09-16 07:16:13 +02:00
Guillermo Bonet	635eb405a2	fix: refs #7644 Update in print method	2024-09-13 14:53:44 +02:00
Guillermo Bonet	6f1d962db2	fix: refs #7644 Update in print method	2024-09-13 14:39:47 +02:00
Sergio De la torre	11193bebe6	Merge pull request '6868_createLogin' (!2598) from 6868_createLogin into dev ... Reviewed-on: #2598 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-13 09:43:31 +00:00
Javier Segarra	6f18b8a719	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-13 07:28:45 +00:00
Jorge Penadés	2dc55a706c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls	2024-09-13 09:20:57 +02:00
Jon Elias	99bd20bc05	Merge branch 'dev' into 6346-FixWagonModule	2024-09-13 06:13:26 +00:00
Sergio De la torre	e80fe1d0dc	feat: refs #6868 refs# 6868 handleUser	2024-09-13 07:10:47 +02:00
Sergio De la torre	2d4e667009	feat: refs #6868 refs# 6868 handleUser	2024-09-13 07:02:30 +02:00
Sergio De la torre	05b6c75a19	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin	2024-09-13 07:02:15 +02:00
Sergio De la torre	93e7163858	feat: refs #6868 refs# 6868 handleUser	2024-09-12 17:09:27 +02:00
Alex Moreno	1abf6a14f9	fix: workerDms filter workerFk	2024-09-12 13:26:09 +02:00
Jorge Penadés	edccd95fa1	fix: refs #7828 rollback	2024-09-12 10:29:03 +02:00
Jorge Penadés	b2bc095caa	fix: refs #7828 rollback	2024-09-12 10:28:29 +02:00