680 Commits

Author	SHA1	Message	Date
Javier Segarra	9f68c380da	Merge branch 'dev' into feature/TicketExpedition	2024-06-29 00:32:33 +02:00
Carlos Satorres	41d6c3f07e	refs #6897 fix columns trad	2024-06-28 15:00:35 +02:00
Carlos Satorres	e62e914e48	refs #6897 change image, fit component	2024-06-28 14:55:44 +02:00
Javier Segarra	946a2d4823	Merge branch 'dev' into feature/TicketService	2024-06-28 13:24:24 +02:00
Jon Elias	93c109b70d	refactor: new translations	2024-06-28 11:25:38 +02:00
Carlos Satorres	b05528ae14	refs #6897 fix latestbuys trad	2024-06-28 11:23:29 +02:00
Jon Elias	8e9b238eaa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7030-FixTranslations	2024-06-28 10:58:57 +02:00
Jon Elias	369cb9dc75	refactor: refs #7030 added translations	2024-06-28 10:56:09 +02:00
William Buezas	db4c3a6799	Changes	2024-06-27 11:46:31 -03:00
Carlos Satorres	ed4517183e	refs #6897 fix trad, latestBuys	2024-06-27 14:02:45 +02:00
William Buezas	0e8106af17	Resolve conflicts	2024-06-26 17:21:31 -03:00
Carlos Satorres	aaee96d6bb	refs #7366 VnTable	2024-06-26 15:09:26 +02:00
Jon Elias	452d1000bc	refactor: refs #7543 requested changes	2024-06-26 14:28:21 +02:00
William Buezas	fd03336c7a	Resolve conflicts	2024-06-26 09:12:23 -03:00
William Buezas	8ee4fa2e7d	Resolve conflicts	2024-06-26 08:39:56 -03:00
William Buezas	ad950f33c6	WIP	2024-06-26 08:27:36 -03:00
Carlos Satorres	44ba965feb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration	2024-06-26 11:42:38 +02:00
Carlos Satorres	c570f2058b	Merge branch 'dev' into 7409-workerBalance	2024-06-26 09:37:52 +00:00
Carlos Satorres	1f41f8e564	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration	2024-06-26 10:10:00 +02:00
Javier Segarra	120a119b38	Merge branch 'dev' into feature/TicketTracking	2024-06-25 23:05:11 +02:00
Javier Segarra	ff02e5d160	Merge branch 'dev' into feature/WeeklyTickets	2024-06-25 22:59:16 +02:00
Javier Segarra	7a2b334a64	Merge branch 'dev' into feature/TicketTracking	2024-06-25 22:41:15 +02:00
Javier Segarra	c45c24e983	Merge branch 'dev' into feature/TicketPurchaseRequest	2024-06-25 22:31:52 +02:00
Carlos Satorres	6e33a2930b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance	2024-06-25 17:04:47 +02:00
Javier Segarra	1e080d02ed	Merge branch 'dev' into feature/WeeklyTickets	2024-06-25 14:48:31 +02:00
Javier Segarra	049174232a	Merge branch 'dev' into feature/TicketsFuture	2024-06-25 14:24:38 +02:00
Javier Segarra	5685d99cd6	Merge branch 'dev' into feature/TicketsAdvance	2024-06-25 14:22:00 +02:00
William Buezas	8e538fb463	WIP	2024-06-25 08:27:25 -03:00
Carlos Satorres	49b86672f5	Merge branch 'dev' into 7406-workerFormation	2024-06-25 11:18:05 +00:00
Alex Moreno	d421cefeb1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-25 07:32:17 +02:00
William Buezas	fb12d4ddc0	WIP	2024-06-24 17:24:36 -03:00
William Buezas	4effba1580	Ticket dms	2024-06-24 16:38:41 -03:00
William Buezas	91df35fcae	Ticket volume	2024-06-24 11:12:49 -03:00
William Buezas	17e9d95702	Ticket notes	2024-06-24 09:02:29 -03:00
Jorge Penadés	891c0d2347	feat: refs 6238 show notes & create vnPopup	2024-06-21 13:05:28 +02:00
Carlos Satorres	f88fffa89c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration	2024-06-21 10:32:44 +02:00
Carlos Satorres	87a9ee5ccb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance	2024-06-21 09:50:38 +02:00
Carlos Satorres	fdedf7bf57	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-21 08:42:57 +02:00
Alex Moreno	28b241bb77	Merge branch 'dev' into 6825-vnTable	2024-06-20 10:26:05 +00:00
William Buezas	0afd7f4ae1	Ticket tracking	2024-06-19 10:22:20 -03:00
William Buezas	b3a4dd3f79	Ticket purchase request	2024-06-19 08:16:20 -03:00
Carlos Satorres	789dffe2e2	refs #6898 vntable, traductions	2024-06-19 12:05:21 +02:00
Pablo Natek	825762d70e	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-19 08:20:14 +00:00
Jon Elias	42c58296ac	refafctor: changed titles errors	2024-06-19 08:44:40 +02:00
William Buezas	bb208040bb	Last changes	2024-06-18 11:47:35 -03:00
Jon Elias	a33ce5699e	feat: refs #7030 translation proposal	2024-06-18 15:26:48 +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	84378187be	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance	2024-06-18 08:56:23 +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
William Buezas	06e8e819f4	WIP	2024-06-17 12:11:23 -03:00
Carlos Satorres	0ccfd9ae75	refs #7409 columns trad	2024-06-17 15:50:33 +02:00
William Buezas	c807b5feb2	Weekly tickets	2024-06-17 08:21:43 -03: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
Pablo Natek	20e0c84035	fix: refs #7129 fix module routes	2024-06-14 13:10:47 +02:00
Pablo Natek	d6f085dc3d	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-13 13:48:44 +02:00
Pablo Natek	f2dddb5e30	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-13 10:45:37 +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	c3409a9d5c	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-12 07:50:41 +02:00
Alex Moreno	048685277f	Merge branch 'dev' into 6825-vnTable	2024-06-12 05:31:31 +00:00
Pablo Natek	a65f5dfe44	fix: refs #7499 use current colors	2024-06-11 16:38:12 +02: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	59e72dcd50	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-11 12:53:50 +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
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
Pablo Natek	68e49e2ffa	fix: refs #7129 fix some issues on load and tools	2024-06-07 07:52:50 +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
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	4bd78922af	remove unnecesary files	2024-05-30 15:43:26 -03: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
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
Alex Moreno	2b6612317c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-05-29 14:05:42 +02:00
Alex Moreno	5965e70740	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-05-29 07:50:15 +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
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
Carlos Satorres	d8512e2033	refs #7406 fix trad	2024-05-27 18:23:33 +02:00
Carlos Satorres	ef52c9b0c0	refs #7406 routes trad	2024-05-27 10:42:47 +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