269 Commits

Author	SHA1	Message	Date
Javier Segarra	478ebfd0ea	Merge branch 'dev' into 6679-addCreateIcon	2024-04-10 12:22:19 +00:00
William Buezas	e8486099fc	Resolve conflicts	2024-04-10 08:37:52 -03:00
Robert Ferrús	933e6b88b1	feat: refs #6679 add icon	2024-04-10 13:24:20 +02:00
Robert Ferrús	cd3024c0a1	feat: refs #6679 add icon	2024-04-09 09:17:49 +02:00
Javier Segarra	f2d513766e	fix_merge_worker_submoduls	2024-04-08 07:03:42 +00:00
William Buezas	4701714aa9	merge with dev	2024-04-05 08:42:13 -03:00
William Buezas	03be831ee5	remove package-lock.json	2024-04-05 08:24:55 -03:00
William Buezas	addbe9345b	Resolve conflicts	2024-04-02 12:40:26 -03:00
Alex Moreno	181bff6c0c	Merge branch 'dev' into 6514-gestDocSupplier	2024-03-28 07:17:28 +00:00
William Buezas	37465ffa4a	resolve conflicts	2024-03-27 11:23:54 -03:00
Jorge Penadés	9c83c4cd6c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-27 08:30:37 +01:00
Jon Elias	1ec54d7664	feat: #6514 create supplierDms lilium	2024-03-26 08:55:01 +01:00
carlosfonseca	627d3bbe85	Se implementan las correcciones a los comentarios	2024-03-25 16:00:47 -05:00
Jorge Penadés	d2efbb204f	feat: refs #5186 use arrayData in summary	2024-03-22 14:57:36 +01:00
carlosfonseca	aa2db28eda	Se crea submodulo mis documentos en worker	2024-03-22 08:30:54 -05:00
Jorge Penadés	4f242b0840	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-21 15:31:15 +01:00
Kevin Martinez	f6e3b3607a	Merge branch 'salix-dev' into feature/worker-log	2024-03-21 08:01:57 -03:00
Carlos Fonseca	142155e14e	Merge branch 'dev' into features/ms_submodulos_worker	2024-03-20 16:55:09 +00:00
Kevin Martinez	cf25476a5d	Create worker log	2024-03-18 21:04:52 -03:00
carlosfonseca	844cd0e12b	Desarrollo de los submodulos basic data, notes y pbx	2024-03-18 08:39:10 -05:00
Jorge Penadés	dd91449818	feat: refs #5186 use global locales	2024-03-14 15:16:50 +01:00
Jorge Penadés	f39595087a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-14 15:00:16 +01:00
William Buezas	22c49d9cf7	resolve conflicts	2024-03-14 09:50:27 -03:00
Kevin Martinez	8587d46943	Merge branch 'salix-dev' into feature/route-module ... # Conflicts: # src/pages/Route/Card/RouteSummary.vue	2024-03-14 08:05:51 -03:00
Jorge Penadés	0c012ed71a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-14 08:54:21 +01:00
Javi Gallego	4bc57d0287	Merge branch 'dev' into CambiosSolicitadosSuppliers	2024-03-13 14:37:06 +00:00
William Buezas	433843ea09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers	2024-03-12 08:16:40 -03:00
William Buezas	319295f2c2	Workers PDA	2024-03-11 16:53:33 -03:00
Jorge Penadés	37f155aa85	fix: refs #5186 css, required files & routes	2024-03-11 10:06:11 +01:00
Jorge Penadés	33ef118dea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-11 09:32:30 +01:00
Jorge Penadés	300e384f75	feat: refs #5186 add e2e	2024-03-08 10:32:41 +01:00
Pablo Natek	e5e0d8f806	Merge branch 'dev' into 6349-removeRma	2024-03-08 07:08:36 +00:00
Jorge Penadés	d8a0adb852	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-07 15:57:54 +01:00
William Buezas	b994d39369	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections	2024-03-07 08:44:30 -03:00
Kevin Martinez	d3a93da849	Merge branch 'salix-dev' into feature/route-module ... # Conflicts: # src/components/ui/VnPaginate.vue	2024-03-06 23:19:47 -03:00
William Buezas	6a105d5d38	resolve conflicts	2024-03-06 08:35:49 -03:00
William Buezas	859c87940d	Several changes	2024-03-06 08:15:50 -03:00
Alex Moreno	4484f431bf	refs #6336 feat: polish claims	2024-03-04 14:42:15 +01:00
Kevin Martinez	31911be3ba	Remove unused route	2024-03-03 23:36:30 -03:00
Jorge Penadés	ebbe38a14e	fix: refs #5186 parking routes	2024-03-01 11:05:34 +01:00
Jorge Penadés	c18e395f6f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-02-29 15:52:43 +01:00
Pablo Natek	b49db55892	Merge branch 'dev' into 6349-removeRma	2024-02-29 06:50:18 +00:00
Kevin Martinez	64490f7e5b	Merge remote-tracking branch 'salix/dev' into feature/route-module ... # Conflicts: # src/i18n/en/index.js # src/i18n/es/index.js	2024-02-28 21:27:01 -03:00
William Buezas	b0d43edbce	Route summary link logic improvement	2024-02-28 12:02:38 -03:00
Pablo Natek	546df84db1	remove(claimRma): refs #6349 remove all references	2024-02-26 19:06:21 +01:00
Kevin Martinez	185de3c931	Add roadmap stops	2024-02-23 00:46:57 -03:00
Alex Moreno	de184e9cf8	refs #5509 feat(DMS): change icon	2024-02-22 10:57:11 +01:00
Jorge Penadés	ddb6bdeb47	fix: refs #5186 parking routes	2024-02-21 11:31:25 +01:00
Jorge Penadés	1af5b270a0	fear: refs #5186 WIP parking section	2024-02-21 10:26:20 +01:00
Kevin Martinez	75733fd530	Fix autonomous route	2024-02-20 20:51:25 -03:00