143 Commits

Author	SHA1	Message	Date
Carlos Satorres	b6836fc59e	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness	2024-06-19 06:50:20 +02:00
Alex Moreno	8085e1e518	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-18 13:25:44 +02:00
Carlos Satorres	0940872625	Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-18 07:18:47 +02:00
Carlos Satorres	bc30531d42	refs #6897 fix trad	2024-06-18 07:18:44 +02:00
Alex Moreno	e8054467a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-17 13:00:30 +02:00
Alex Moreno	ba57c2fcd9	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness	2024-06-14 11:53:14 +02:00
Pablo Natek	e10755d8fe	Merge branch 'dev' into 7499-refactorEntrys	2024-06-13 05:39:13 +00:00
Guillermo Bonet	9388cb3599	Merge branch 'test' into dev	2024-06-12 12:02:12 +02:00
Guillermo Bonet	135e05b139	hotfix: refs #6636 EN i18n	2024-06-12 12:00:43 +02:00
Pablo Natek	b7a097fd13	Merge branch 'dev' into 7499-refactorEntrys	2024-06-12 06:16:48 +00:00
Alex Moreno	048685277f	Merge branch 'dev' into 6825-vnTable	2024-06-12 05:31:31 +00:00
Alex Moreno	3dfe3226ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-11 15:00:52 +02:00
Jon Elias	4045a3a631	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 12:56:52 +00:00
Javi Gallego	cb0559fee8	Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #432 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:53:42 +00:00
Jon Elias	2d0b33c626	Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor	2024-06-11 14:29:44 +02:00
Jon Elias	de18b670ea	feat: refs #7154 changed label	2024-06-11 14:29:42 +02:00
Pablo Natek	be919f97b1	Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys	2024-06-11 14:28:20 +02:00
Pablo Natek	80adeede81	fix: refs #7499 fix item reference	2024-06-11 14:28:19 +02:00
Jon Elias	989ea3d82c	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 11:49:25 +00:00
Jon Elias	e5a590a9f9	feat: refs #7154 new item descriptor field	2024-06-11 13:48:15 +02:00
Alex Moreno	f753eddc43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-11 11:40:58 +02:00
Javi Gallego	0e0e351805	Merge branch 'dev' into 7548-ticketSummaryCollection	2024-06-10 10:53:33 +02:00
Carlos Satorres	8490f24438	refs #6553 fix reactivateWorker	2024-06-10 09:23:33 +02:00
Jorge Penadés	d35f9c9468	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-06-07 12:03:52 +02:00
Javi Gallego	9ceac32d89	feat: refs #7548 grafana	2024-06-07 11:59:26 +02:00
Javier Segarra	0ea44eb8db	Merge branch 'dev' into feature/AccountAcls	2024-06-07 10:07:15 +02:00
Alex Moreno	395eb6bed7	Merge branch 'dev' into feature/AccountRoles	2024-06-06 07:32:15 +00:00
William Buezas	3efca6242d	Account ACLs	2024-06-04 08:41:41 -03:00
Jorge Penadés	1bc99cbd22	feat: refs #6243 show all cmrs & filter by warehouse	2024-06-03 16:30:59 +02:00
Carlos Satorres	960129f86c	Merge branch 'dev' into 6553-workerBusiness	2024-06-03 13:52:40 +00:00
Carlos Satorres	6e261b7793	refs #6553 fix business summary traductions	2024-06-03 14:38:48 +02:00
Jorge Penadés	f58b072964	feat: refs #6600 Add option to add comment for photo motivation	2024-06-03 09:30:37 +02:00
Javier Segarra	28173ddee2	Merge branch 'dev' into feature/AccountRoles	2024-05-31 10:24:37 +02:00
William Buezas	05b7df9168	Role submodules	2024-05-30 15:34:37 -03:00
William Buezas	5c25c77f19	Mail aliases	2024-05-30 13:09:11 -03:00
Carlos Satorres	330b1c1ec2	Merge branch 'dev' into 6553-workerBusiness	2024-05-30 11:48:56 +00:00
William Buezas	0cf4f41d19	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases	2024-05-30 08:38:23 -03:00
Carlos Satorres	0e691436e9	refs #6553 fix front trad	2024-05-29 14:20:49 +02:00
William Buezas	0659eac652	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles	2024-05-28 18:38:13 -03:00
Carlos Satorres	81e6870f71	refs #6553 front section trad	2024-05-28 16:59:59 +02:00
Alex Moreno	0f1c91d36c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-05-28 07:42:15 +02:00
Jorge Penadés	3b799efa22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-27 08:57:34 +02:00
Carlos Satorres	ba5407310f	refs #7396 fix summary	2024-05-24 13:40:00 +02:00
Javier Segarra	433564507e	Merge branch 'dev' into 7311_boilerplate_users	2024-05-23 08:53:10 +02:00
Javier Segarra	06664cc2d0	feat: newRole	2024-05-23 08:52:57 +02:00
Alex Moreno	bcb800269e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-05-22 14:32:00 +02:00
Jorge Penadés	5bddc6e04d	fix: refs #6942 wip: formModel	2024-05-22 11:22:46 +02:00
Javier Segarra	a2316fb222	feat: change skeleteon different components	2024-05-18 10:35:08 +02:00
Javier Segarra	aa007117a7	Merge branch 'dev' into 7311_boilerplate_users	2024-05-18 10:16:28 +02:00
Carlos Satorres	cd21d7817d	refs #7396 fix summary basicData	2024-05-17 14:16:06 +02:00