3860 Commits

Author	SHA1	Message	Date
William Buezas	72aef18c49	Add tooltip	2024-07-01 09:51:42 -03:00
Javier Segarra	527c565ca9	Merge branch 'dev' into feature/TicketTracking	2024-07-01 14:50:23 +02:00
William Buezas	c3a064eeda	Change dms import form ubication	2024-07-01 09:48:27 -03:00
Javier Segarra	9bb75b8305	Merge branch 'dev' into feature/TicketVolume	2024-07-01 14:48:12 +02:00
Jorge Penadés	269fe18a9a	refactor: refs #7652 Update ClaimDescriptor and ParkingDescriptor	2024-07-01 14:47:04 +02:00
Jorge Penadés	150c446d70	fix: refs #7652 update url	2024-07-01 14:46:28 +02:00
Javier Segarra	e34904ea70	Merge branch 'dev' into feature/TicketNotes	2024-07-01 12:44:38 +00:00
Javier Segarra	ae71321339	fix: map selected	2024-07-01 14:43:39 +02:00
Javier Segarra	79d986b9ec	perf: remove warnings	2024-07-01 14:33:07 +02:00
Javier Segarra	814056d920	feat: showLabelerDialog	2024-07-01 14:20:31 +02:00
Javier Segarra	d2292601de	feat: use VnTable	2024-07-01 14:05:52 +02:00
William Buezas	e951894ac3	Fixes	2024-07-01 08:43:15 -03: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	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
Javier Segarra	f23b7837b7	perf: Dms buttons tooltip	2024-07-01 09:58:05 +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
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
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
William Buezas	fe67f21206	Ticket expedition	2024-06-28 08:27:21 -03: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
Javier Segarra	2d2fff1bf3	perf: Dms buttons tooltip	2024-06-28 13:22:39 +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
William Buezas	053059997a	WIP	2024-06-27 08:37:48 -03: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	0e8106af17	Resolve conflicts	2024-06-26 17:21:31 -03:00
William Buezas	826e8ed068	changes	2024-06-26 17:19:07 -03: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
Javier Segarra	a5a3945582	feat: remove button from panel	2024-06-26 12:26:05 +00:00
Javier Segarra	defd26fe91	feat: define Sticky Button	2024-06-26 12:25:01 +00: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
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	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	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
Jon Elias	f596a9b5f7	fix: refs #7014 fix wagon module	2024-06-26 07:26:35 +02:00
Jon Elias	42df3894ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-06-26 07:16:42 +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
Jon Elias	e0cc9f0249	Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-06-25 10:28:49 +02:00
Jon Elias	e8111502c0	refactor: refs #7014 deleted main files and changed route files	2024-06-25 10:28:48 +02:00
Javier Segarra	5a66af341f	fix: state translations	2024-06-25 10:07:36 +02:00
Jon Elias	1332ef8d0b	Merge branch 'dev' into 7014-RefactorQDrawer	2024-06-25 07:51:47 +00:00
Javier Segarra	ea7ee97867	proposals	2024-06-25 09:35:21 +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	c500dd6346	Add allow import feature in VnDmsList	2024-06-24 16:58:26 -03:00
William Buezas	4effba1580	Ticket dms	2024-06-24 16:38:41 -03:00
Jorge Penadés	cdf3a588af	fix: refs #7623 updating skip param	2024-06-24 16:55:09 +02:00
Jorge Penadés	9956561e4c	chore: refs #7300 wip: create reset function	2024-06-24 16:17:21 +02: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	0765166423	fix: refs #7623 disable router update	2024-06-24 13:56:50 +02:00
Jon Elias	9207b37419	refactor: refs #7014 refactor <module>Main.vue	2024-06-24 13:46:06 +02:00
Jorge Penadés	9169b793a9	fix: refs #7623 update add updateRoute prop in VnPaginate	2024-06-24 12:51:44 +02:00
Jon Elias	50d135f282	refactor: refs #6977 fix VnImg props	2024-06-24 09:20:47 +02:00
Jon Elias	da20abf34c	Merge branch '6977-ClonedURL' of https://gitea.verdnatura.es/verdnatura/salix-front into 6977-ClonedURL	2024-06-24 08:30:07 +02:00
Jon Elias	82cc844ddd	refactor: refs #6977 refactor VnImg	2024-06-24 08:30:06 +02:00
William Buezas	3d0cbcfd12	remove form model expose	2024-06-21 16:57:51 -03:00
William Buezas	3d9d41afcb	Add deep true	2024-06-21 16:55:33 -03:00
William Buezas	dfb67f6f2b	refactor	2024-06-21 16:51:29 -03:00
Javier Segarra	01816613f2	Merge branch 'dev' into 7323_department_descriptor_routerLink	2024-06-21 12:50:14 +00:00
William Buezas	5cf183607d	WIP	2024-06-21 09:20:03 -03:00
Jorge Penadés	44d762694a	fix: refs 6238 replace style	2024-06-21 13:53:35 +02:00
Jorge Penadés	606c629d77	feat: refs #6238 function name	2024-06-21 13:47:42 +02:00
Jorge Penadés	bebb20c76f	fix: refs 6238 drop locale	2024-06-21 13:07:43 +02:00
Jorge Penadés	891c0d2347	feat: refs 6238 show notes & create vnPopup	2024-06-21 13:05:28 +02:00
Javier Segarra	63b8ca46a3	Merge branch 'dev' into feature/TicketLog	2024-06-21 11:33:29 +02:00
Javier Segarra	febc7f1f46	fix: notify icon style	2024-06-21 11:33:14 +02:00
Javier Segarra	9ce49bf108	fix: TravelLog	2024-06-21 11:31:09 +02:00
Alex Moreno	961c8140af	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-21 10:53:57 +02:00
Carlos Satorres	0f2f688f16	Merge branch 'dev' into 6504-fixCardClaim	2024-06-21 08:49:15 +00:00
Jorge Penadés	6aa920b70e	fix: refs #6243 show rightPanel	2024-06-21 10:47:09 +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	0107c21789	refs #7409 fix trad	2024-06-21 09:57:01 +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	d23dbca7bf	fix(EntryBuys): fix VnSubtoolbar	2024-06-21 08:12:03 +02:00
Jon Elias	ff75808a28	Merge branch 'dev' into 6977-ClonedURL	2024-06-21 05:25:56 +00:00
Jon Elias	f41161a28e	refactor: refs #6977 use VnImg	2024-06-21 07:24:23 +02:00
Javier Segarra	159b386d2c	fix: comment 4	2024-06-21 00:07:26 +02:00
Javier Segarra	0faa663169	fix: comments	2024-06-21 00:03:26 +02:00
William Buezas	633b13b076	Basic data form	2024-06-20 16:51:07 -03:00
William Buezas	47768faea4	Change model	2024-06-20 09:42:32 -03:00
William Buezas	9f1dd4d74d	WIP	2024-06-20 09:41:53 -03:00
Alex Moreno	1b3828ceba	Merge branch 'dev' into 6825-vnTable	2024-06-20 12:35:35 +00:00
Alex Moreno	09545cb2c0	fix: WorkerNotificationsManager test	2024-06-20 14:25:45 +02:00
William Buezas	00ebbbfc78	Ticket log	2024-06-20 08:40:05 -03:00
William Buezas	0ba415c0ea	small changes	2024-06-20 07:57:39 -03:00
Alex Moreno	e8296d0edd	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-20 12:33:05 +02:00
Alex Moreno	2352b6aac4	fix: invoiceDueDay test	2024-06-20 12:33:04 +02:00
Alex Moreno	28b241bb77	Merge branch 'dev' into 6825-vnTable	2024-06-20 10:26:05 +00:00
Jon Elias	f372fb1c65	Merge branch 'dev' into 5447-travelExtraCommunity	2024-06-20 10:16:25 +00:00
Jon Elias	304c7677bc	Merge branch 'dev' into 6896-EndOrderMigration	2024-06-20 10:12:24 +00:00
Alex Moreno	03be4bc0e6	refactors	2024-06-20 10:55:29 +02:00
Pablo Natek	f48c5deba1	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-20 08:49:38 +00:00
Alex Moreno	11a82f3ae5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-20 10:47:41 +02:00
Jon Elias	a61196b04d	Merge branch 'dev' into 6896-EndOrderMigration	2024-06-20 08:39:32 +00:00
Carlos Satorres	6d5973f4b7	refs #6504 fix formModel claimFilter claimCard	2024-06-20 10:26:22 +02:00
Jon Elias	a84c20f2ce	refactor: refs #6896 changes requested in PR	2024-06-20 08:33:29 +02:00
Carlos Satorres	35c4b423a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration	2024-06-20 05:52:14 +02:00
William Buezas	6cd8a478fa	Clean selectedTickets after moving tickets	2024-06-19 20:58:31 -03:00
William Buezas	b6ec10994a	Change header titles style	2024-06-19 20:45:08 -03:00
William Buezas	79c606fc70	Add checkbox	2024-06-19 20:43:21 -03:00
William Buezas	4e7c09fa44	Add tooltip to button	2024-06-19 20:40:27 -03:00
William Buezas	22bf0b4598	Search bar changes	2024-06-19 20:38:23 -03:00
William Buezas	45cf4498d3	Cancel button change	2024-06-19 19:46:27 -03:00
William Buezas	d63d3a9c77	small change	2024-06-19 10:24:56 -03:00
William Buezas	0afd7f4ae1	Ticket tracking	2024-06-19 10:22:20 -03:00
Alex Moreno	702b031650	feat(VnFilter): merge objects	2024-06-19 15:18:38 +02:00
Alex Moreno	02f8288b22	feat(customerList): add searchbar	2024-06-19 15:02:26 +02:00
Javier Segarra	3fdad15f21	fix: comments	2024-06-19 13:43:32 +02:00
William Buezas	b3a4dd3f79	Ticket purchase request	2024-06-19 08:16:20 -03:00
Carlos Satorres	a803250cb9	refs #6898 fix create	2024-06-19 13:01:31 +02:00
Carlos Satorres	789dffe2e2	refs #6898 vntable, traductions	2024-06-19 12:05:21 +02:00
Guillermo Bonet	42807d6785	Merge branch 'dev' into 7545-hasIncoterms	2024-06-19 09:31:21 +00:00
Alex Moreno	9f3a266239	Merge branch 'test' into 7596-devToTest_2426	2024-06-19 08:46:41 +00:00
Pablo Natek	825762d70e	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-19 08:20:14 +00:00
Pablo Natek	cbeebc8c9c	Merge branch '7129-finishRouteMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishRouteMigration	2024-06-19 10:19:20 +02:00
Pablo Natek	2ea87ea920	fix: refs #7129 remove consoleLog	2024-06-19 10:19:12 +02:00
Alex Moreno	819d1230c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-19 09:57:31 +02:00
Alex Moreno	b5bf4bab54	feat(CustomerFIlter): use correct table	2024-06-19 09:55:30 +02:00
Javier Segarra	d5bd8c4432	fix: #7566 remove v-if	2024-06-19 09:54:24 +02:00
Jon Elias	a80caa7c93	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-19 07:07:05 +00:00
Jon Elias	ec6b54cf13	refactor: refs #7030 shelving translation	2024-06-19 08:55:03 +02:00
Jon Elias	42c58296ac	refafctor: changed titles errors	2024-06-19 08:44:40 +02:00
Carlos Satorres	ac28a6728a	refs #7409 change icon	2024-06-19 08:41:36 +02:00
William Buezas	de0ef06d92	remove console.log	2024-06-18 19:28:05 -03:00
William Buezas	d488a2d523	small change	2024-06-18 11:50:15 -03: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
Jon Elias	db67fd1e43	Merge branch 'dev' into 6896-EndOrderMigration	2024-06-18 11:32:13 +00:00
Jon Elias	fa425a4329	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-18 11:31:48 +00:00
Jon Elias	3023280108	refactor: refs #6896 refactor VnImg	2024-06-18 13:31:25 +02:00
Jon Elias	e0b4d86cab	Merge branch '7566-FixCustomerSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7566-FixCustomerSummary	2024-06-18 13:29:18 +02:00
Jon Elias	546b43ffcf	refactor: refs #7566 fix customer summary	2024-06-18 13:29:17 +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
Alex Moreno	ae75908e46	refactor: simplify code	2024-06-18 10:53:21 +02:00
Javier Segarra	cd8e99e1df	perf: remove CLI warnings	2024-06-18 10:52:55 +02:00
Javier Segarra	dc0a938c4c	Merge branch 'dev' into feature/AccountList	2024-06-18 10:50:50 +02:00
Javier Segarra	f004ab3645	Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList	2024-06-18 10:48:44 +02:00
Jon Elias	a5f4f85c80	refactor: refs #6896 requested changes	2024-06-18 10:46:13 +02:00
Jorge Penadés	4ff0901950	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7600-fix-vnLocation	2024-06-18 10:44:58 +02:00
Jorge Penadés	cbbcddfd50	fix: refs #7600 test vnLocation	2024-06-18 10:37:49 +02:00
Jorge Penadés	3f2779600a	fix: refs #6238 drop old fix	2024-06-18 10:13:43 +02:00
Jorge Penadés	1b4bd2e7f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-18 10:12:48 +02:00
Alex Moreno	741e6f27b1	Merge branch 'dev' into 7598-fix-formModel	2024-06-18 07:58:12 +00:00
Alex Moreno	e369ea68d4	fix(VnTable): Qtable v-bind	2024-06-18 09:56:03 +02:00
Jorge Penadés	34069f4841	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-18 09:54:33 +02:00
Jorge Penadés	b1b0f4efed	Merge branch 'dev' into 6243-fixColumnWidth	2024-06-18 07:49:46 +00:00
Jorge Penadés	024687e2d3	fix: refs #7598 fix evt & .value	2024-06-18 09:46:58 +02:00
Jorge Penadés	9725874d5d	fix: refs #7598 fix evt & .value	2024-06-18 09:44:50 +02:00
Jorge Penadés	37af8ba8f5	fix: refs #7598 fix evt & .value	2024-06-18 09:43:44 +02:00
Javier Segarra	dfbc7df54d	perf: Remove div.col	2024-06-18 09:20:45 +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	1cf630378b	Merge branch 'dev' into 6897-EntryMigration	2024-06-18 06:15:12 +00: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	c798874a9e	Ticket future	2024-06-17 17:27:06 -03:00
William Buezas	c289c247c4	undo change in sms dialog	2024-06-17 12:22:22 -03:00
William Buezas	6b7c76dde3	mini change	2024-06-17 12:19:44 -03: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
Carlos Satorres	25ab5a1b9f	refs #7409 front section	2024-06-17 13:55:16 +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
Alex Moreno	3394eb10b0	fix(VnFilterPanel): remove key	2024-06-17 12:58:58 +02:00
Alex Moreno	fb1bd5ca72	fix: bug replace	2024-06-17 11:29:36 +02:00
Jorge Penadés	f64f42f473	fix: refs #6243 load warehouses & iron out column width	2024-06-17 10:46:51 +02:00
Jorge Penadés	94f4e154b0	refactor: refs #6238 use variable & link class	2024-06-17 10:39:36 +02:00
Alex Moreno	a479637ee6	feat: customerList is customerExtendedList	2024-06-17 10:14:11 +02:00
Jon Elias	fe47215bf7	Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration	2024-06-17 09:58:21 +02:00
Jon Elias	7c64df6600	refactor: refs #6896 fixed styles	2024-06-17 09:58:20 +02:00
Jon Elias	9c1e79ebee	Merge branch 'dev' into 6896-EndOrderMigration	2024-06-17 07:57:16 +00:00
Jon Elias	42008ef74b	feat: refs #6896 created VnImg and added to order module	2024-06-17 09:56:16 +02:00
Alex Moreno	bc31985a4d	remove console.log	2024-06-17 09:54:19 +02:00
Alex Moreno	1c6fab0158	fix(VnTable): duplicate fetch	2024-06-17 09:53:36 +02:00
Pablo Natek	ef6a7001e8	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-17 07:21:40 +00:00
Carlos Satorres	f4b7d34a7f	refs #7366 fix redirect	2024-06-17 08:39:39 +02:00
Alex Moreno	6120c98580	fix(VnTable): warns	2024-06-17 08:19:07 +02:00
Alex Moreno	0ad6b260da	fix(VnTable): create scss	2024-06-17 07:32:43 +02:00
William Buezas	c31e865faa	Fix card searchbar routing	2024-06-15 12:04:31 -03:00
William Buezas	acc899b851	Transfer	2024-06-15 11:28:49 -03:00
William Buezas	0666aeb166	Btn dropdown more actions	2024-06-14 15:04:02 -03:00
Alex Moreno	d9d54a351f	fix(VnTable): showLabel	2024-06-14 14:54:52 +02:00
Jorge Penadés	bd6e45d260	refactor: refs #6238 get percentage from back	2024-06-14 14:52:39 +02:00
Pablo Natek	05d7a61468	fix: refs #7129 remove fix from claim lines	2024-06-14 14:40:40 +02:00
Alex Moreno	79a34db700	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-14 13:25:33 +02:00
Pablo Natek	ac56d6d9d7	feat: refs #7129 fix some code and add order	2024-06-14 13:12:12 +02:00
Pablo Natek	20e0c84035	fix: refs #7129 fix module routes	2024-06-14 13:10:47 +02:00
Carlos Satorres	8002f0a94b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-14 12:59:16 +02:00
Alex Moreno	f86bc9791b	fix: fix warnings	2024-06-14 11:49:29 +02:00
Jon Elias	8aec5bae81	Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut	2024-06-14 11:44:03 +02:00
Jon Elias	fe69521b0b	fix: refs #6739 changed checkbox field	2024-06-14 11:44:02 +02:00
Alex Moreno	b282ce540e	remove unnecessay	2024-06-14 11:39:05 +02:00
Alex Moreno	6f723af338	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-14 11:35:53 +02:00
Alex Moreno	cb87d2b419	fix(VnFilter): filter with params	2024-06-14 11:35:33 +02:00
Alex Moreno	98b13b23e4	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-14 10:53:26 +02:00
Alex Moreno	bea756d7cb	feat(vnTable): reload data when change url	2024-06-14 10:53:02 +02:00
Alex Moreno	4f36da7598	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-14 09:25:13 +02:00
Jon Elias	f497d97c84	Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases	2024-06-14 09:21:03 +02:00
Jon Elias	20ae555e14	fix: refs #6464 fix error isLoading	2024-06-14 09:21:02 +02:00
Alex Moreno	42042ea3cd	fix: SkeletonTable	2024-06-14 09:19:51 +02:00
Jon Elias	64648c77f6	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-14 07:11:09 +00:00
Jorge Penadés	fc54b44c7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-14 09:05:49 +02:00
Jon Elias	75a478ddc4	Merge branch 'dev' into 5447-travelExtraCommunity	2024-06-14 06:48:24 +00:00
Jon Elias	b16b87fadd	Merge branch '5447-travelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity	2024-06-14 08:47:27 +02:00
Jon Elias	c017493cb8	refactor: refs #5447 fixed filter if continent not selected	2024-06-14 08:47:25 +02:00
William Buezas	8c3262bcdf	Add change state dropdown action	2024-06-13 15:36:30 -03:00
William Buezas	531f4bb8cd	Avoid firing request if quantity does not change	2024-06-13 14:14:46 -03:00
William Buezas	975e8f06c0	WIP	2024-06-13 13:56:19 -03:00
Javier Segarra	7d73cd0e33	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-13 14:56:34 +02:00
Javier Segarra	648546888d	fix: DeleteDepartment VnConfirm	2024-06-13 14:56:19 +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
Carlos Satorres	548fc374c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-13 09:22:45 +02:00
Carlos Satorres	8c5ea42be2	Merge branch 'dev' into 6897-EntryMigration	2024-06-13 06:51:02 +00:00
Jon Elias	2b66148ff5	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-13 05:45:23 +00:00
Jon Elias	fa55e33b54	fix: refs #7566 fixed summary cards and table	2024-06-13 07:43:49 +02:00
Pablo Natek	e10755d8fe	Merge branch 'dev' into 7499-refactorEntrys	2024-06-13 05:39:13 +00:00
Javier Segarra	ffd4109dc7	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-12 20:23:30 +00:00
Jorge Penadés	7393b82008	refactor: refs #6238 update getRate function and color logic	2024-06-12 16:46:14 +02:00
Carlos Satorres	6e4843563c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-12 14:42:06 +02:00
Carlos Satorres	34e92d130a	refs #7366 fix basic-data	2024-06-12 14:31:18 +02:00
Carlos Satorres	e464608a9f	refs #7391 fix url, fix filters	2024-06-12 14:01:10 +02:00
William Buezas	b0e4dc99b0	Fix worker department create modal did not open	2024-06-12 08:47:32 -03:00
Jorge Penadés	2641489d83	fix: refs #6238 use .value prop	2024-06-12 13:45:17 +02:00
Carlos Satorres	f414b8aa0e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7391-defaulterFilter	2024-06-12 13:23:21 +02:00
Jorge Penadés	1052e9eb21	fix: refs #6238 use :deep	2024-06-12 13:14:02 +02:00
Jorge Penadés	a4c21c7673	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-12 12:42:23 +02:00
Jorge Penadés	51d497a1de	feat: refs #6238 add percentage & summary btn	2024-06-12 12:17:52 +02:00
Alex Moreno	c596f68103	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-12 12:13:28 +02: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
Guillermo Bonet	38610870ea	feat: refs #7545 Deleted hasIncoterms client column	2024-06-12 11:49:36 +02:00
Javier Segarra	d55c75089c	Merge branch 'dev' into 7323_department_descriptor_routerLink	2024-06-12 09:28:05 +00:00
Alex Moreno	c4cbd7f156	feat(VnTable): is-editable and use-model. fix: checkbox	2024-06-12 11:01:18 +02:00
Alex Moreno	d7237463ea	feat(WorkerFormation): is-editable and use-model	2024-06-12 11:00:10 +02:00
Javier Segarra	11c0154c48	Merge branch 'dev' into 7323_fix_workerTimeControl	2024-06-12 07:31:51 +00: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
Jon Elias	df364dca4a	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-12 05:04:16 +00:00
William Buezas	89f6873b03	WIP	2024-06-11 22:40:07 -03:00
Javier Segarra	d0759cb654	Merge branch 'dev' into feature/AccountFormsView	2024-06-11 21:12:13 +02:00
Pablo Natek	a65f5dfe44	fix: refs #7499 use current colors	2024-06-11 16:38:12 +02:00
Carlos Satorres	a7b805a4ab	stash departmentFilter	2024-06-11 16:24:07 +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
Alex Moreno	00da1c2808	feat: adapt tu VnTable → CrudModel	2024-06-11 15:00:43 +02:00
Alex Moreno	14e27f193e	feat: adapt tu VnTable → CrudModel	2024-06-11 15:00:03 +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
Pablo Natek	6789f3d1cb	fix: refs #7499 fix style	2024-06-11 14:32:01 +02: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
Javier Segarra	7ac2aed326	fix: default model value depends on route	2024-06-11 14:09:42 +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
Javier Segarra	25f4d1f654	fix: point 3	2024-06-11 11:58:27 +02:00
Javier Segarra	fe2412f6d9	fix: point 1	2024-06-11 11:58:20 +02:00
Javier Segarra	4e2358d722	fix: point 3	2024-06-11 11:58:06 +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
Carlos Satorres	ba0364e799	refs #6897 fix BasicData	2024-06-11 10:30:42 +02:00
Javier Segarra	fac9b6a439	Merge branch 'dev' into feature/AccountConnections	2024-06-11 07:39:41 +00:00
Javier Segarra	adbc9dee2c	Merge branch 'dev' into feature/WorkerDescriptorMenu	2024-06-11 07:37:06 +00:00
Jorge Penadés	11bcfb0d2d	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:34:34 +00:00
Jorge Penadés	205e7d82a6	Merge branch 'dev' into 6598-getUserAcl	2024-06-11 07:31:15 +00:00
Carlos Satorres	31afa22de8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-11 09:20:23 +02:00
Jorge Penadés	c5889b2170	Merge branch 'dev' into 6273-fixRedirect	2024-06-11 07:16:59 +00:00