652 Commits

Author	SHA1	Message	Date
Alex Moreno	ffee9fb27c	Merge branch 'dev' into fix_itemType-redirection	2024-10-28 09:14:21 +00:00
Alex Moreno	cca255507a	fix: itemType redirection and fix filters	2024-10-28 09:57:25 +01:00
Jorge Penadés	1da86900e6	fix: refs #7524 e2e & worker module	2024-10-27 13:43:38 +01:00
Guillermo Bonet	57a3504a7f	Merge branch 'dev' into 7006-itemTypeLog	2024-10-25 11:06:49 +00:00
Carlos Satorres	56ef811584	fix: refs #7283 order translation	2024-10-24 07:47:26 +02:00
Carlos Satorres	dfceb9403c	fix: refs #7986 fix front	2024-10-15 07:54:52 +02:00
Carlos Satorres	1a2c5c96fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto	2024-10-14 13:52:31 +02:00
Guillermo Bonet	787ce2fc48	feat: refs #7006 itemTypeLog added	2024-10-14 09:33:00 +02:00
Carlos Satorres	855032e4a6	refs #7986 fix front	2024-10-08 15:36:57 +02:00
Guillermo Bonet	f98739f0ed	Merge branch 'dev' into 7893-wasteRecalc	2024-10-07 08:03:26 +00:00
Guillermo Bonet	4f3e7e2630	feat: refs #7893 Added waste recalc section	2024-10-07 10:03:05 +02:00
Javier Segarra	696c9ca9b3	fix: solve conflicts with stockBought	2024-10-01 11:40:29 +02:00
Javier Segarra	778e6299ce	fix: solve conflicts from test to dev	2024-10-01 08:57:04 +02:00
Pablo Natek	7fa0a5b28c	fix: refs #7404 path name	2024-09-30 10:47:02 +02:00
Jorge Penadés	14b7654db3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-26 15:16:32 +02:00
Jorge Penadés	478d4695b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-26 09:16:59 +02:00
Pablo Natek	1ee3691cc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues	2024-09-25 08:26:27 +02:00
Pablo Natek	8124a341a0	feat: refs #7129 route extended list and simplify route list	2024-09-24 07:25:17 +02:00
Jon Elias	44d98865fe	fix: refs #7553 requested changes	2024-09-20 09:04:31 +02:00
Jorge Penadés	41c43fde76	feat: refs #7323 hide log section	2024-09-17 16:08:48 +02:00
Pablo Natek	cead2c2b5e	Merge branch 'dev' into 7404-stockBought	2024-09-17 11:40:42 +00:00
Pablo Natek	c59c8127cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-16 08:59:46 +02:00
Javier Segarra	025436b4b8	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-13 09:27:38 +02:00
Jon Elias	ed5987630f	Merge branch 'dev' into 6346-fixWagonModule	2024-09-13 06:14:05 +00:00
Pablo Natek	e2dbe0fd38	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-12 09:09:21 +02:00
Jorge Penadés	f7975069d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-10 08:59:01 +02:00
Jon Elias	b4fb9ceb2e	Merge branch 'dev' into 6346-fixWagonModule	2024-09-10 06:29:51 +00:00
Alex Moreno	3164209bef	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-10 08:13:56 +02:00
Jon Elias	6790067a89	Merge branch 'dev' into 6346-fixWagonModule	2024-09-10 06:02:18 +00:00
Jorge Penadés	381b236a18	refactor: refs #4074 use acl & drop useless roles	2024-09-09 12:56:37 +02:00
Jorge Penadés	803ce3b909	refactor: refs #4074 rollback	2024-09-09 11:53:59 +02:00
Jorge Penadés	c978cca8c5	refactor: refs #4074 useAcl in navigationStore & router	2024-09-09 11:35:49 +02:00
Jon Elias	f78ca3f357	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-09-09 10:04:44 +02:00
Pablo Natek	e083d6a802	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-08 07:54:26 +02:00
Jorge Penadés	d0131dd552	fix: refs #4074 drop wrong acl	2024-09-06 15:52:06 +02:00
Jorge Penadés	34a9b4d4d0	Merge branch 'dev' of https: refs #4074//gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-06 13:23:02 +02:00
Jon Elias	ef98f60486	refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu	2024-09-06 10:30:32 +02:00
Jon Elias	5d78f564dd	refactor: refs #7889 deleted subtitle attr and use keyBinding instead	2024-09-06 10:00:07 +02:00
Jon Elias	585919a4d9	feat: refs #7889 added shortcuts to modules	2024-09-06 09:19:38 +02:00
Jorge Penadés	763cf2e345	refactor: refs #6900 create setRectificative composable	2024-09-04 10:30:14 +02:00
Carlos Satorres	3a703141c6	Merge branch 'dev' into 7407-MedicalWorker2	2024-09-04 07:49:14 +00:00
Jorge Penadés	a5887114ef	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning	2024-09-03 12:50:35 +02:00
Pablo Natek	2fb974af0f	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-03 08:01:19 +02:00
Jon Elias	a2eb298733	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-03 04:36:22 +00:00
Carlos Satorres	7bd3c0802e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7407-MedicalWorker2	2024-09-02 15:05:51 +02:00
Javier Segarra	5d511c7b1b	Merge branch 'dev' into 7889_main_shortcuts	2024-09-02 13:02:07 +00:00
Carlos Satorres	0475083a2b	refs #7407 Medical Section	2024-09-02 14:57:01 +02:00
Javier Segarra	c51af96ca7	fix: module icon	2024-09-02 12:56:44 +00:00
Jorge Penadés	f24daa4ebd	feat: refs #6900 hide menu item	2024-09-02 13:15:06 +02:00
Jon Elias	1af4a559fc	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-02 10:50:22 +00:00