767 Commits

Author	SHA1	Message	Date
Javier Segarra	3979a328e9	WIP: 28213bcc minor i18n updates	2024-07-22 17:30:15 +02:00
Guillermo Bonet	580777af65	Deleted repeated labeler i18n	2024-07-22 08:20:08 +02:00
Javier Segarra	28213bcce6	minor i18n updates	2024-07-20 00:37:13 +02:00
Javier Segarra	7c8ddf9c2b	Merge branch 'dev' into 6321_negative_tickets	2024-07-20 00:22:37 +02:00
Guillermo Bonet	c5903e29e8	Merge branch 'master' into test	2024-07-19 13:08:41 +02:00
Javier Segarra	c45ff7009c	Merge branch 'dev' into 6321_negative_tickets	2024-07-18 22:04:30 +02:00
Javier Segarra	7cbdf0d98b	feat: fix bugs and filters	2024-07-18 15:20:44 +02:00
Javier Segarra	5fbbd27273	fat: i18n	2024-07-16 12:21:50 +02:00
Javier Segarra	fb2e3f1f9c	feat: required validation	2024-07-16 11:25:06 +02:00
Javier Segarra	8798598f41	Merge branch 'dev' into 7017_formModel_validations	2024-07-16 09:26:22 +02:00
Javier Segarra	be86b69079	fix: ticket menu order and i18n	2024-07-15 11:53:10 +02:00
Javier Segarra	c56610515c	Merge branch 'dev' into TicketDms	2024-07-15 11:29:27 +02:00
Javier Segarra	ae55983405	Merge branch 'dev' into feature/SaleTracking	2024-07-15 09:23:53 +00:00
Alex Moreno	cc8062785a	Merge branch 'dev' into feature/SaleTracking	2024-07-15 08:17:01 +00:00
Javier Segarra	20403287dd	feat: scopeDays replace by daysOnward	2024-07-12 22:38:38 +02:00
Javier Segarra	c5c96bf51b	Merge branch 'dev' into feature/SaleTracking	2024-07-09 09:41:45 +02:00
Javier Segarra	cededb54e8	Merge branch 'dev' into feature/TicketDms	2024-07-09 09:14:40 +02:00
Alex Moreno	75b8cca2e0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5	2024-07-08 14:25:01 +02:00
Javier Segarra	aabd575854	Merge branch 'dev' into feature/TicketPackages	2024-07-08 10:55:14 +02:00
Javier Segarra	84462fe201	Merge branch 'dev' into feature/TicketComponents	2024-07-08 10:14:13 +02:00
Javier Segarra	f87b806406	Merge branch 'dev' into feature/TicketPhotos	2024-07-08 10:10:24 +02:00
Javier Segarra	a303942f76	Merge branch 'dev' into feature/TicketExpedition	2024-07-08 08:05:33 +00:00
Javier Segarra	9d4cfbd90c	Merge branch 'dev' into feature/TicketPackages	2024-07-05 09:28:31 +02:00
Alex Moreno	12ca0faf21	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5	2024-07-05 07:23:20 +02:00
William Buezas	decf33c0b7	small changes	2024-07-04 09:46:10 -03:00
Javier Segarra	d6cc447989	Merge branch 'dev' into feature/SaleTracking	2024-07-04 10:44:50 +02:00
Javier Segarra	14e26f0285	Merge branch 'dev' into feature/TicketComponents	2024-07-04 09:40:00 +02:00
Javier Segarra	f52ba11f42	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-07-03 23:07:25 +02:00
William Buezas	91eb966586	Ticket photos	2024-07-03 14:44:36 -03:00
Alex Moreno	2340aaba0b	feat: list use vnTable, fix descriptor	2024-07-03 14:39:15 +02:00
Jorge Penadés	076fbad20e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-03 14:11:29 +02:00
Jorge Penadés	b0c5f19f1d	merge dev	2024-07-03 12:31:01 +02:00
Carlos Satorres	92b8104b19	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration	2024-07-03 12:21:03 +02:00
Carlos Satorres	885decc700	Merge branch 'dev' into 6897-entryMigration2	2024-07-03 10:02:28 +00:00
Alex Moreno	1463cc8904	Merge branch 'dev' into 7366-travelMigration2	2024-07-03 08:32:00 +00:00
Carlos Satorres	27876b0bab	Merge branch 'dev' into 7366-travelMigration2	2024-07-03 08:30:56 +00:00
Pablo Natek	29c4b1bcb8	Merge branch '7404-add-e2e-to-route' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route	2024-07-03 10:20:58 +02:00
Pablo Natek	937167ce95	remove: refs #7404 remove traductions	2024-07-03 10:19:47 +02:00
Carlos Satorres	94680a6c2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration	2024-07-03 10:07:34 +02:00
Pablo Natek	f15fc0d6a7	Merge branch 'dev' into 7404-add-e2e-to-route	2024-07-03 08:07:15 +00:00
Carlos Satorres	dff77277ac	refs #6897 fix summary, list, inputs	2024-07-03 10:05:05 +02:00
Jon Elias	f8d263c347	Merge branch 'dev' into 7543-StandarizeDescriptors	2024-07-03 07:52:35 +00:00
Pablo Natek	61bd1eaf04	merge dev	2024-07-03 09:33:04 +02:00
Carlos Satorres	b40e3f2c7c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2	2024-07-03 08:48:33 +02:00
Carlos Satorres	21d5d6b986	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2	2024-07-03 08:46:05 +02:00
Javier Segarra	f46443ee69	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-03 08:33:33 +02:00
Javier Segarra	d15dc7336b	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-03 08:26:27 +02:00
Jon Elias	e13f98dffb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors	2024-07-03 07:12:07 +02:00
William Buezas	5c36ad14f4	Ticket components	2024-07-02 21:33:19 -03:00
Javier Segarra	8a94701422	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-02 20:32:08 +02:00
Javier Segarra	c3d97231d2	Merge branch 'dev' into 6321_negative_tickets	2024-07-02 12:20:58 +02:00
Jon Elias	c0e65ff3b7	fix: refs #7030 solve conflicts	2024-07-02 11:50:07 +02:00
Pablo Natek	2ad9530b1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route	2024-07-02 09:58:46 +02:00
Jorge Penadés	2c9c1bed09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-02 09:56:55 +02:00
Javier Segarra	68298b9ba6	feat: rreplace eti by labeler	2024-07-01 19:03:17 +02:00
Javier Segarra	3f5f918684	Merge branch 'dev' into feature/TicketExpedition	2024-07-01 15:12:40 +02:00
Javier Segarra	7896e3d7f9	Merge branch 'dev' into feature/TicketDms	2024-07-01 14:59:09 +02:00
Javier Segarra	0cbd7c9cae	Merge branch 'dev' into feature/TicketService	2024-07-01 14:53:08 +02:00
Javier Segarra	527c565ca9	Merge branch 'dev' into feature/TicketTracking	2024-07-01 14:50:23 +02:00
Javier Segarra	9bb75b8305	Merge branch 'dev' into feature/TicketVolume	2024-07-01 14:48:12 +02:00
Javier Segarra	0dfdb1edb0	Merge branch '7648_customerEntries' into 7648_dev_customerEntries	2024-07-01 12:27:07 +02:00
Javier Segarra	71900b15a6	feat: newsection and i18n	2024-07-01 12:18:58 +02:00
Jorge Penadés	4ffe0894c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-01 11:55:16 +02:00
Carlos Satorres	9d1e7363ab	refs #6897 fix filters	2024-07-01 10:13:33 +02:00
Pablo Natek	a69235e4d4	fix: refs #7404 add e2e and fix route	2024-07-01 07:39:35 +02:00
William Buezas	768b619904	Sale tracking	2024-06-30 17:43:21 -03:00
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
Jorge Penadés	98bc7cbf0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-06-26 09:46:38 +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
Jorge Penadés	262742fee3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-06-25 09:23:05 +02: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