287 Commits

Author	SHA1	Message	Date
William Buezas	5551189f2f	resolve conflicts	2024-04-17 08:46:37 -03:00
William Buezas	1dfaef2ffa	Resolve conflicts	2024-04-17 08:26:12 -03:00
William Buezas	a397c6ed30	remove component import	2024-04-16 12:18:36 -03:00
William Buezas	2ab7a45114	resolve conflicts	2024-04-16 08:49:34 -03:00
Robert Ferrús	d70da976c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon	2024-04-16 08:04:23 +02:00
William Buezas	d9d868a6af	Waste breakdown	2024-04-15 09:02:35 -03:00
Robert Ferrús	058ddc8e9a	feat: refs #6500	2024-04-15 13:18:39 +02:00
William Buezas	f2dc50d229	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar	2024-04-12 08:13:58 -03:00
William Buezas	c032c83e7f	Item create view	2024-04-11 08:40:41 -03:00
William Buezas	9dfe5f5e68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList	2024-04-10 09:34:51 -03:00
Javier Segarra	478ebfd0ea	Merge branch 'dev' into 6679-addCreateIcon	2024-04-10 12:22:19 +00:00
William Buezas	c881fe6577	Resolve conflicts	2024-04-10 09:19:54 -03: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
William Buezas	fc4a69b2c6	resolve conflicts in worker routes	2024-04-09 15:28:11 -03:00
William Buezas	c3835dfd7a	resolve conflicts	2024-04-09 15:23:05 -03:00
William Buezas	e51ea9996b	Item list view	2024-04-09 08:18:18 -03:00
Robert Ferrús	cd3024c0a1	feat: refs #6679 add icon	2024-04-09 09:17:49 +02:00
William Buezas	4da540fc9c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList	2024-04-08 08:47:56 -03: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	4ee8c45fdc	resolve conflicts	2024-04-03 11:22:52 -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
Kevin Martinez	0dee7e8cc9	Create worker calendar submodule	2024-03-27 16:51:44 -03: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	09582ab6a8	WIP	2024-03-13 09:05:23 -03: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