3591 Commits

Author	SHA1	Message	Date
Jorge Penadés	f2b8217883	fix: refs #7197 rollback	2024-07-01 13:50:29 +02:00
Carlos Satorres	f4a77f5030	refs #6898 fix search datakey	2024-07-01 13:31:24 +02:00
Carlos Satorres	56017645c2	refs #6898 fix search	2024-07-01 13:20:55 +02:00
Javier Segarra	eeab4ed915	updates	2024-07-01 13:18:19 +02:00
Carlos Satorres	95a3043359	refs #6898 fix colmns subtoolbar	2024-07-01 13:16:25 +02:00
Carlos Satorres	ff9e78cd47	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration	2024-07-01 12:56:34 +02:00
Carlos Satorres	31cd266ec7	refs #7366 fix component	2024-07-01 12:44:09 +02:00
Javier Segarra	0dfdb1edb0	Merge branch '7648_customerEntries' into 7648_dev_customerEntries	2024-07-01 12:27:07 +02:00
Carlos Satorres	0c31755fdb	refs #7366 fix summary	2024-07-01 12:21:18 +02:00
Javier Segarra	71900b15a6	feat: newsection and i18n	2024-07-01 12:18:58 +02:00
Carlos Satorres	3965608a18	refs #7366 fix travelList	2024-07-01 12:15:05 +02:00
Carlos Satorres	dc619b5275	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2	2024-07-01 11:58:02 +02:00
Carlos Satorres	58e87a9af6	refs #6897 remove	2024-07-01 11:56:12 +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
Jorge Penadés	9b7ffbf3d2	fix: fix pagination issue & skip url query param	2024-07-01 11:48:27 +02:00
Javier Segarra	379d90d4c9	updates	2024-07-01 11:40:57 +02:00
Carlos Satorres	00321803ab	refs #6897 fix filters, right filters	2024-07-01 10:57:13 +02:00
Carlos Satorres	a6bb9af1a7	refs #6897 fix filters	2024-07-01 10:48:58 +02:00
Carlos Satorres	9d1e7363ab	refs #6897 fix filters	2024-07-01 10:13:33 +02:00
Jon Elias	ff420d2b04	Merge branch 'dev' into 6151-FixOrderModule	2024-07-01 07:47:47 +00:00
Pablo Natek	8cd04bd230	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route	2024-07-01 09:30:43 +02:00
Alex Moreno	938389de2e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime	2024-07-01 09:30:24 +02:00
Jorge Penadés	ad3416cb0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData	2024-07-01 09:17:22 +02:00
Jorge Penadés	84d6785a4c	Merge branch 'dev' into 7436-showQCheckbox	2024-07-01 07:00:51 +00:00
Alex Moreno	f4975d1f15	fix: ticketFilter adapt VnInputDate	2024-07-01 09:00:45 +02:00
Alex Moreno	3b18375cdb	fix(TicketService): pay use selected	2024-07-01 08:13:49 +02:00
Alex Moreno	7b9e26528a	feat(TicketService): use correct format	2024-07-01 08:08:41 +02:00
Alex Moreno	128303939b	fix(ticket router): typo	2024-07-01 07:41:58 +02:00
Pablo Natek	a69235e4d4	fix: refs #7404 add e2e and fix route	2024-07-01 07:39:35 +02:00
Javier Segarra	666cb519c5	feat: #7648 handle EntryBuys	2024-06-29 00:08:35 +02:00
Javier Segarra	4bbf0f29d5	feat: #7648 handle EntryList	2024-06-29 00:07:09 +02:00
Javier Segarra	361024abe2	feat: #7648 handle LeftMenu	2024-06-29 00:07:00 +02:00
Javier Segarra	e418a647be	feat: #7648 handle NavBar	2024-06-29 00:06:49 +02:00
Jorge Penadés	0ac1f53348	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData	2024-06-28 17:51:15 +02:00
Alex Moreno	c399d40daf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime	2024-06-28 17:48:00 +02:00
Alex Moreno	4cf389e00c	fixes: fix vnFilter params and redirect	2024-06-28 17:45:04 +02:00
Alex Moreno	7bc9042c02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime	2024-06-28 16:32:22 +02:00
Jorge Penadés	bf9a731bcc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData	2024-06-28 15:10:52 +02:00
Carlos Satorres	41d6c3f07e	refs #6897 fix columns trad	2024-06-28 15:00:35 +02:00
Jon Elias	9664978733	Merge branch 'dev' into 6826-RolSummary	2024-06-28 12:58:51 +00:00
Carlos Satorres	e62e914e48	refs #6897 change image, fit component	2024-06-28 14:55:44 +02:00
Carlos Satorres	9fe5fd2391	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2	2024-06-28 13:33:02 +02:00
Jon Elias	6ee5fc954b	fix: refs #6826 fix redirect	2024-06-28 13:26:53 +02:00
Javier Segarra	946a2d4823	Merge branch 'dev' into feature/TicketService	2024-06-28 13:24:24 +02:00
Jon Elias	25e4494266	Merge branch 'dev' into 5447-travelExtraCommunity	2024-06-28 11:17:10 +00:00
Jon Elias	a3704ce456	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6826-RolSummary	2024-06-28 13:13:53 +02:00
Jorge Penadés	06420fcbef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData	2024-06-28 12:52:40 +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
Jorge Penadés	ffdcb28522	refactor: refs #6943 initialize totalAmount as undefined	2024-06-28 11:17:42 +02:00
Javier Segarra	68552b8da9	perf: add QBtn in CardDescriptor instead each ModuleDescriptor	2024-06-28 11:07:32 +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
Jorge Penadés	9d03e0e487	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomerGreuges	2024-06-28 10:24:23 +02:00
Jorge Penadés	97c84f7aaa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox	2024-06-28 10:21:47 +02:00
Jon Elias	ec5eeaa308	fix: refs #6151 fixed filters and styles	2024-06-28 10:14:24 +02:00
Carlos Satorres	2e8396d1d4	refs #6897 fix url	2024-06-28 10:08:19 +02:00
Jorge Penadés	ca504ffead	Merge branch 'dev' into 6943-fixCustomerGreuges	2024-06-28 07:55:00 +00:00
Carlos Satorres	8ec51ff8fd	refs #6897 fix columns	2024-06-28 09:01:28 +02:00
William Buezas	db4c3a6799	Changes	2024-06-27 11:46:31 -03:00
Jorge Penadés	bfd8804d0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData	2024-06-27 14:55:46 +02:00
Carlos Satorres	67f89dfde2	refs #6897 fix latestbuys	2024-06-27 14:48:36 +02:00
Carlos Satorres	ed4517183e	refs #6897 fix trad, latestBuys	2024-06-27 14:02:45 +02:00
Alex Moreno	381a9c6d1d	feat: remake vnInputDate and fix: FormModel has changes when error	2024-06-27 13:56:20 +02:00
Jorge Penadés	e7ad147d04	fix: refs #7433 skeleton	2024-06-27 13:16:42 +02:00
Carlos Satorres	9e636c1ded	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2	2024-06-27 13:01:52 +02:00
Carlos Satorres	f93929de6a	refs #6897 vnTable, columns	2024-06-27 13:01:00 +02:00
Jorge Penadés	ed642b299e	feat: refs #7436 show checkbox	2024-06-27 12:27:04 +02:00
Jorge Penadés	d3f119fa04	chore: refs #6943 check if exists	2024-06-27 10:48:55 +02:00
Jorge Penadés	d0038d7e61	fix: refs #6943 removes duplicate toggle menu & fix loading animation	2024-06-27 10:45:37 +02:00
Jon Elias	95f70ba765	Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases	2024-06-27 10:15:18 +02:00
Jon Elias	fd744158ac	fix: refs 6464 deleted useless class in checkbox	2024-06-27 10:15:17 +02:00
Carlos Satorres	4dd1ed3a3d	refs #7366 remove summary	2024-06-27 10:12:04 +02:00
Carlos Satorres	99628d2cf8	refs #7366 remove code	2024-06-27 10:08:17 +02:00
Carlos Satorres	95a9805a84	refs #7366 fix icons actions	2024-06-27 09:53:42 +02:00
Jon Elias	f6e0cb41ce	Merge branch 'dev' into 6464-fixNegativeBases	2024-06-27 07:36:02 +00:00
William Buezas	5b07f3015d	small change	2024-06-26 17:02:21 -03:00
Carlos Satorres	aaee96d6bb	refs #7366 VnTable	2024-06-26 15:09:26 +02:00
Jon Elias	6bf2a8c2f6	Merge branch 'dev' into 7543-StandarizeDescriptors	2024-06-26 12:29:18 +00:00
Jon Elias	452d1000bc	refactor: refs #7543 requested changes	2024-06-26 14:28:21 +02:00
Jorge Penadés	92f9869a36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection	2024-06-26 14:18:57 +02:00
William Buezas	fd03336c7a	Resolve conflicts	2024-06-26 09:12:23 -03:00
William Buezas	ae73dd047f	changes	2024-06-26 08:55:30 -03:00
William Buezas	8ee4fa2e7d	Resolve conflicts	2024-06-26 08:39:56 -03:00
William Buezas	cd01ba8fe1	changes	2024-06-26 08:36:17 -03:00
Jorge Penadés	2cb6d21ade	feat: refs #7197 add correcting filter	2024-06-26 11:47:14 +02: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	efa8791b9d	refs #6898 remove comment	2024-06-26 11:40:59 +02:00
Carlos Satorres	c570f2058b	Merge branch 'dev' into 7409-workerBalance	2024-06-26 09:37:52 +00:00
Carlos Satorres	def8d4222b	refs #6898 fix warnings	2024-06-26 11:33:02 +02: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
Carlos Satorres	6f2573880c	refs #7409 fix balance and formation	2024-06-26 09:59:37 +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
Jorge Penadés	752f3ace58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection	2024-06-26 09:38:37 +02:00
Jon Elias	de2c3cc244	fix: refs #6826 fix roleDescriptor	2024-06-26 08:56:17 +02:00
Jon Elias	677e71d1a7	refactor: refs #7543 standarized descriptors	2024-06-26 08:26:04 +02:00
Javier Segarra	120a119b38	Merge branch 'dev' into feature/TicketTracking	2024-06-25 23:05:11 +02:00
Javier Segarra	151978160b	fix: ticket order	2024-06-25 23:01:26 +02:00
Javier Segarra	ff02e5d160	Merge branch 'dev' into feature/WeeklyTickets	2024-06-25 22:59:16 +02:00
Javier Segarra	d409b9ea86	fix: WorkerSelect option format	2024-06-25 22:51:26 +02:00
Javier Segarra	7a2b334a64	Merge branch 'dev' into feature/TicketTracking	2024-06-25 22:41:15 +02:00
Javier Segarra	56560d4b50	fix: merge dev	2024-06-25 22:35:20 +02:00
Javier Segarra	4e4563d481	fix: merge dev	2024-06-25 22:34:19 +02:00
Javier Segarra	c45c24e983	Merge branch 'dev' into feature/TicketPurchaseRequest	2024-06-25 22:31:52 +02:00
Javier Segarra	5419bc4d52	Merge branch 'feature/TicketBasicData' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TicketBasicData	2024-06-25 22:27:21 +02:00
Javier Segarra	1a2b4739c3	Merge branch 'dev' into feature/TicketBasicData	2024-06-25 22:27:18 +02:00
William Buezas	6e6c6301d2	fix log view not refreshing when changing id param	2024-06-25 15:27:48 -03:00
William Buezas	1529e2dd4f	Add tooltip to add state button	2024-06-25 12:58:49 -03:00
William Buezas	a57df459a6	Add pay button	2024-06-25 12:54:21 -03: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
Jorge Penadés	ca96e4e6e0	fix: refs #7623 bugs & tests	2024-06-25 16:07:26 +02:00
Jorge Penadés	121204fee4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection	2024-06-25 15:37:00 +02:00
Jon Elias	cff9831b88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases	2024-06-25 15:21:44 +02:00
Javier Segarra	0715e86530	Merge branch 'dev' into feature/WeeklyTickets	2024-06-25 12:49:14 +00:00
Javier Segarra	d29bf09535	remove warnings	2024-06-25 14:48:39 +02:00
Javier Segarra	1e080d02ed	Merge branch 'dev' into feature/WeeklyTickets	2024-06-25 14:48:31 +02:00
Jon Elias	31f8ab7c07	refactor: refs #6739 fix redirect transferInvoice	2024-06-25 14:41:11 +02:00
Jon Elias	975c844d65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut	2024-06-25 14:37:50 +02:00
Javier Segarra	3374b84f38	Merge branch 'dev' into feature/TicketsFuture	2024-06-25 12:26:53 +00:00
Alex Moreno	1b544e0ff0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-25 14:24:59 +02:00
Alex Moreno	0776db2e0f	warmFix: correct id	2024-06-25 14:24:58 +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
Javier Segarra	603cbde09f	Merge branch 'dev' into feature/TicketSale	2024-06-25 12:19:17 +00:00
William Buezas	4de347d0e8	Rmove nav navigation and organize buttons	2024-06-25 09:19:12 -03:00
William Buezas	ba8145eabb	Add required rule to VnInputTime and VnInputDate	2024-06-25 08:43:10 -03:00
Jorge Penadés	b0cd40ab2f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection	2024-06-25 13:41:12 +02:00
William Buezas	54e3eb6f0d	Add required rule to VnInputTime and VnInputDate	2024-06-25 08:40:21 -03:00
Javier Segarra	0816105e5f	Merge branch 'feature/TicketBasicData' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TicketBasicData	2024-06-25 13:35:49 +02:00
Javier Segarra	9817ae8c2c	fix: column hidden v-if	2024-06-25 13:35:16 +02:00
William Buezas	266657fab5	Fix total difference	2024-06-25 08:35:11 -03:00
Alex Moreno	10a663b400	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-25 13:33:23 +02:00
Alex Moreno	d7cc983f29	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-25 13:33:19 +02:00
Jorge Penadés	8d921322c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection	2024-06-25 13:32:39 +02:00
Jorge Penadés	239cdd74b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection	2024-06-25 13:27:50 +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	ff33923b7a	feat: refs #7578 add data-key attribute to CardSummary components	2024-06-25 12:49:54 +02:00
Javier Segarra	1eaa0c9ce2	perf: replace ItemPicture in favour of VnImg	2024-06-25 12:39:21 +02:00
Javier Segarra	0c42bba779	perf: remove ItemPicture	2024-06-25 12:39:05 +02:00
Javier Segarra	98510c1d38	Merge remote-tracking branch 'origin/6977-ClonedURL' into feature/TicketSale	2024-06-25 12:38:53 +02:00
Javier Segarra	54d7263d13	Merge remote-tracking branch 'origin/dev' into feature/TicketSale	2024-06-25 12:23:32 +02:00
Carlos Satorres	a705245783	refs #7406 fix pr	2024-06-25 12:18:02 +02:00
Jon Elias	2ab105dda5	feat: refs #6826 added rol summary link	2024-06-25 12:03:41 +02:00
Jorge Penadés	3c810254a4	fix: refs #7623 redirect	2024-06-25 11:40:07 +02:00
Javier Segarra	d10f6b4d6c	replace value sale.itemFk	2024-06-25 10:33:15 +02:00
Javier Segarra	5a66af341f	fix: state translations	2024-06-25 10:07:36 +02:00
Jorge Penadés	9dc9162e8e	fix: refs #7197 amount reactivity	2024-06-25 09:50:44 +02:00
Javier Segarra	ea7ee97867	proposals	2024-06-25 09:35:21 +02: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