1248 Commits

Author	SHA1	Message	Date
Sergio De la torre	13415b1ef0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-12 09:49:18 +02:00
Pablo Natek	726b1ddc07	Merge branch 'dev' into 6005-backupLabeler	2024-04-12 05:14:29 +00:00
Sergio De la torre	3a8dcbfd29	refs #6861 feat:reserve previos	2024-04-11 13:45:43 +02:00
Sergio De la torre	9a98c872d4	Merge branch '5890-itemShelving_asignado' into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-11 12:34:49 +02:00
Sergio De la torre	68fa64a937	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-11 12:24:00 +02:00
Carlos Andrés	5967bd545c	feat: previas con reserva refs #6861	2024-04-11 12:16:00 +02:00
Sergio De la torre	d998b650da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-11 07:06:40 +02:00
Pablo Natek	c581deef66	refactor: refs #6005 refactor spec	2024-04-10 13:09:31 +02:00
Pablo Natek	ed517399dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 15:04:04 +02:00
Ivan Mas	f02c4354ba	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-09 14:45:29 +02:00
Pablo Natek	aff73a179e	remove: refs #6005 remove delay from notification model	2024-04-09 13:36:50 +02:00
Pablo Natek	da037c5235	refactor: refs #6005 delay on productionConfig	2024-04-09 13:34:33 +02:00
Guillermo Bonet	0e2e68488d	Merge branch 'test' into dev	2024-04-09 13:08:54 +02:00
Guillermo Bonet	743dc2144e	hotfix: refs #6276 Fix send chat msg getSales	2024-04-09 13:05:01 +02:00
Pablo Natek	7cb40f5d89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 09:42:39 +02:00
Alex Moreno	9134216332	refactor(workerDms): adapat to lilium	2024-04-08 14:46:35 +02:00
Sergio De la torre	2770919db9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-08 07:09:47 +02:00
Pablo Natek	4b4aaa9e10	feat: refs #6005 move logic from report to hook	2024-04-05 08:04:53 +02:00
Alex Moreno	dd9c7283c3	hotFix: handle mail error	2024-04-04 13:32:39 +02:00
Sergio De la torre	b742f8a13c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-04 12:26:01 +02:00
Guillermo Bonet	c685000b47	hotfix: refs #6930 Rollback tokenMultimedia	2024-04-04 10:13:56 +02:00
Sergio De la torre	9698c049fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-28 07:35:37 +01:00
Alex Moreno	2212899400	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:35:38 +01:00
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:18:47 +01:00
Sergio De la torre	2a1204a00a	refs #6276 hotFix: setUserError and return	2024-03-25 13:27:52 +01:00
Sergio De la torre	386bc1c934	refs #6276 hotFix: setUserError and return	2024-03-25 13:00:55 +01:00
Jon Elias	c49b8bf954	refactor: refs #6556 minor changes	2024-03-22 09:35:09 +01:00
Jon Elias	eadd8f750d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages	2024-03-22 08:22:49 +01:00
Sergio De la torre	f18d61d17d	refs #5890 fix: dev	2024-03-21 17:28:08 +01:00
Sergio De la torre	d7d47da3e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-21 11:19:16 +01:00
Ivan Mas	db71e69317	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-03-21 09:21:32 +00:00
Sergio De la torre	9eee26cbe9	refs #6276 feat:newWarehouse	2024-03-21 10:18:54 +01:00
Guillermo Bonet	8a96327d97	Merge branch 'dev' into 6232-refactorConfigTables	2024-03-20 06:17:06 +00:00
Jon Elias	6d4f07adc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages	2024-03-15 14:13:24 +01:00
Guillermo Bonet	5b546079b0	Merge branch '6232-refactorConfigTables' of https://gitea.verdnatura.es/verdnatura/salix into 6232-refactorConfigTables	2024-03-15 12:38:34 +01:00
Guillermo Bonet	0867211573	refs #6403 Fix model mrwConfig	2024-03-15 12:38:33 +01:00
Javier Segarra	bfdbbc0fdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-15 12:22:57 +01:00
Jon Elias	67c572f187	fixed dropped test	2024-03-15 10:48:24 +01:00
Javier Segarra	6989299593	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-15 08:26:45 +00:00
Jon Elias	c6f7a8bdb0	refactor: #6556 drop useless test	2024-03-14 15:49:36 +01:00
Pablo Natek	e3b7c7bb60	Merge branch 'dev' into 6005-backupLabeler	2024-03-14 09:39:13 +00:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Sergio De la torre	bfcfd2245b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-14 07:40:30 +01:00
Javier Segarra	c84e86270c	refs #6930 perf: remove logoutMultimedia method	2024-03-12 13:30:32 +01:00
Javier Segarra	486b51bcfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia	2024-03-12 12:46:46 +01:00
Sergio De la torre	375b690063	Merge branch 'dev' into 6078_workerActivty	2024-03-12 09:12:45 +00:00
Pablo Natek	421ca8654d	fix(changes): refs #6005 remove changes files	2024-03-11 13:39:03 +01:00
Pablo Natek	8815f07850	feat(spec): refs #6005 add spec to backup Notify	2024-03-11 12:18:03 +01:00
Sergio De la torre	61de81254a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-11 08:11:00 +01:00
Javier Segarra	18773f34de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-09 11:27:57 +01:00