661 Commits

Author	SHA1	Message	Date
Javier Segarra	99ef7fad76	feat #7311: subsections	2024-05-09 08:28:58 +02:00
Javier Segarra	01bedb94d0	feat #7311: enable leftmenu option	2024-05-09 07:54:16 +02:00
William Buezas	a3ce81d66d	Zone list	2024-05-08 15:23:52 -03:00
William Buezas	712d7e13ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors	2024-05-08 10:45:05 -03:00
William Buezas	5bdbbf426a	Tables development	2024-05-08 10:43:18 -03:00
Javier Segarra	61519595a9	Merge branch 'dev' into 6321_negative_tickets	2024-05-08 12:30:01 +02:00
Jorge Penadés	a1f785ccbe	feat: refs #5919 WIP workerlocker	2024-05-08 11:02:40 +02:00
Alex Moreno	d69b362407	Merge branch 'dev' into feature/ItemTags	2024-05-08 08:02:55 +00:00
Alex Moreno	a139c11a22	Merge branch 'test' into fix_Customer_1	2024-05-07 07:05:25 +00:00
William Buezas	dbc9e9dd71	Sales monitor base	2024-05-05 19:13:36 -03:00
William Buezas	99adc9aa05	WIP	2024-05-03 08:53:50 -03:00
Jorge Penadés	0e7e804475	feat: refs #6598 create useAcl composable	2024-05-03 13:18:46 +02:00
William Buezas	d2e178a41b	resolve conflicts	2024-05-02 12:02:44 -03:00
Javier Segarra	9fa03beda1	Merge branch 'dev' into 6887-endClaimMigration	2024-05-02 12:44:02 +00:00
Javier Segarra	03759d2746	Merge branch 'dev' into feature/ItemLastEntries	2024-05-02 14:34:54 +02:00
Javier Segarra	1675919801	fix: minor build bugs	2024-05-02 14:33:24 +02:00
Jon Elias	c1a464d9ae	fix: refs #6887 fix conflicts	2024-05-02 13:02:59 +02:00
Javier Segarra	1907301852	Merge branch 'dev' into 6321_negative_tickets	2024-05-02 12:48:45 +02:00
Javier Segarra	494f0be44a	Merge branch 'dev' into feature/ItemDiary	2024-05-02 08:13:41 +00:00
Javier Segarra	94fc856bea	Merge branch 'dev' into feature/ItemDiary	2024-05-02 08:05:17 +00:00
Javier Segarra	b530101cda	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-05-02 07:44:20 +00:00
Javier Segarra	4ef7b0e17c	fix: item routes order	2024-05-01 13:31:32 +02:00
Javier Segarra	d2531efdd6	fix: Botanical icon	2024-05-01 13:27:40 +02:00
William Buezas	ac219bfbb7	Item shelvings	2024-04-30 16:15:48 -03:00
Jon Elias	d5762f65b3	refactor: refs #6887 fixed errors	2024-04-30 10:34:48 +02:00
Jon Elias	5b15558dbf	refactor: refs #6887 fixed errors	2024-04-30 10:32:32 +02:00
William Buezas	ac9063e166	Item Last entries	2024-04-29 17:01:26 -03:00
Javier Segarra	5425902918	Merge branch 'dev' into 6321_negative_tickets	2024-04-29 11:55:56 +02:00
Javier Segarra	761bc7724f	fix: redirect	2024-04-29 11:46:40 +02:00
Javier Segarra	19fcacebc9	perf: VnSearchbar	2024-04-29 10:12:19 +02:00
William Buezas	322ad816b9	item diary	2024-04-28 19:37:44 -03:00
Javier Segarra	2deeada1f5	Merge remote-tracking branch 'origin/dev' into fix_Customer_1	2024-04-26 12:50:46 +02:00
Javier Segarra	93bbd0c222	fix: icons	2024-04-26 10:48:25 +02:00
Javier Segarra	33f3024246	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-26 07:47:24 +00:00
Javier Segarra	98846bbd1a	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 09:28:40 +02:00
Pablo Natek	cb22eaee4d	Merge branch 'dev' into 4988-agencySection	2024-04-26 06:58:53 +00:00
Javier Segarra	22d9d369c8	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 08:52:05 +02:00
Javier Segarra	aa87d54f57	Merge remote-tracking branch 'origin/dev' into feature/ItemLog	2024-04-26 08:34:05 +02:00
Pablo Natek	f29f7a55a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-25 16:28:30 +02:00
William Buezas	823351f76d	Item botanical	2024-04-25 10:55:48 -03:00
Pablo Natek	e184f70be5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-25 09:59:17 +02:00
William Buezas	726699bbc5	Item log	2024-04-24 10:38:00 -03:00
William Buezas	934db32973	WIP	2024-04-24 10:31:33 -03:00
Javier Segarra	dcb06918dd	Merge remote-tracking branch 'mindshore/feature/ItemRequests' into feature/ItemFamily	2024-04-24 14:35:20 +02:00
Javier Segarra	e6c9a692f5	feat moduleName	2024-04-24 14:33:10 +02:00
Javier Segarra	e65ffb63c9	Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests	2024-04-24 14:26:12 +02:00
Javier Segarra	299838bfa5	Merge branch 'dev' into feature/ItemsSummary	2024-04-24 14:23:49 +02:00
Javier Segarra	1c3660050b	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-24 12:15:34 +02:00
Javier Segarra	de91364ee8	Merge remote-tracking branch 'origin/dev' into feature/FixedPrices	2024-04-24 09:33:34 +02:00
Javier Segarra	bf08ca7655	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-24 06:25:14 +00:00
Javier Segarra	861e4385bb	Merge branch 'dev' into feature/ItemsSummary	2024-04-24 07:34:49 +02:00
Javier Segarra	5dc41f8236	Merge branch 'dev' into feature/ItemFamily	2024-04-24 07:01:46 +02:00
William Buezas	42fe189e9f	Add module name in Item router file	2024-04-23 16:45:28 -03:00
Javier Segarra	9a78b8ac3b	Merge branch 'dev' into feature/ItemRequests	2024-04-23 13:55:43 +02:00
Javier Segarra	bfb7dfb472	Merge branch 'dev' into feature/WorkerTimeControl	2024-04-23 13:31:41 +02:00
Javier Segarra	4049fa5c4a	feat: #6321 replace dialog into layout	2024-04-23 12:50:34 +02:00
Javier Segarra	cc241c6a4e	feat: #6321 new route	2024-04-22 14:24:23 +02:00
William Buezas	78561c5f42	Item types	2024-04-22 08:34:38 -03:00
Javier Segarra	91c5d7092d	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-04-22 13:34:00 +02:00
Pablo Natek	43aadd4fc6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-22 12:22:04 +02:00
Pablo Natek	6b4cb4ed12	feat: refs #4988 add agency section	2024-04-22 12:19:22 +02:00
Javier Segarra	5a588ead87	Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia	2024-04-22 07:38:07 +02:00
Javier Segarra	2b24e18f75	FEAT: SETiNTERVAL WITH RENEWpERIOD	2024-04-22 07:37:35 +02:00
William Buezas	9212e53905	resolve conflicts	2024-04-19 12:48:07 -03:00
William Buezas	3a03e42cf9	Resolve conflicts	2024-04-19 10:40:04 -03:00
William Buezas	5f01e5c705	change es translations	2024-04-18 09:09:22 -03:00
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	ba2499db9d	resolve conflicts	2024-04-16 12:11:57 -03:00
William Buezas	e36949ad07	resolve conflicts	2024-04-16 10:11:03 -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
Pablo Natek	c65c09c39c	feat(agency): refs #4988 add agency router and sections	2024-04-16 07:45:33 +02:00
William Buezas	00dfa171b0	WIP	2024-04-15 15:37:41 -03: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	4d418c9cb7	Pull new traduction yml files and add translations	2024-04-12 10:32:19 -03: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
Pablo Natek	af9fd6ed73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-12 07:52:37 +02:00
William Buezas	98f273cb93	WIP	2024-04-11 18:04:11 -03:00
William Buezas	c032c83e7f	Item create view	2024-04-11 08:40:41 -03:00
William Buezas	4a0ae8aa45	Item summary	2024-04-10 17:18:57 -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	6c2c3b8f60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets	2024-04-08 09:22:52 +02:00
Javier Segarra	f2d513766e	fix_merge_worker_submoduls	2024-04-08 07:03:42 +00:00
William Buezas	7584857c87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl	2024-04-05 09:11:23 -03: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
Pablo Natek	fb6a2c8097	feat: refs #4988 add agencyList and searchBar	2024-04-03 14:59:51 +02:00
Javier Segarra	5a497289da	refs #6321 perf: i18n	2024-04-03 08:41:20 +02:00
Pablo Natek	6c39c7da97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-03 08:40:15 +02:00
Pablo Natek	f404243d63	feat(route): refs # agency add agencyList	2024-04-03 08:38:26 +02:00
Javier Segarra	75e02bf328	change icon	2024-04-03 08:33:14 +02:00
William Buezas	addbe9345b	Resolve conflicts	2024-04-02 12:40:26 -03:00
Javier Segarra	967fb4592b	Merge branch 'dev' into 6321_negative_tickets	2024-03-29 00:56:23 +01: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
William Buezas	b546b63352	resolve conflicts	2024-03-27 10:11:20 -03:00
Javier Segarra	41cf7d242b	Merge branch 'dev' into 6321_negative_tickets	2024-03-27 09:53:14 +01: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	4216839d96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-03-25 14:58:11 +01: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
William Buezas	65da9a3e69	resolve conflicts	2024-03-21 08:53:42 -03:00
Kevin Martinez	f6e3b3607a	Merge branch 'salix-dev' into feature/worker-log	2024-03-21 08:01:57 -03:00
Javier Segarra	527c845356	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets	2024-03-21 07:48:07 +01: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
Javier Segarra	e264a13234	warnings	2024-03-15 09:36:15 +01:00
Jorge Penadés	15efff6855	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-03-15 09:31:55 +01:00
Carlos Fonseca	f25e46cf08	Merge branch 'dev' into PR-CUSTOMER	2024-03-15 03:12:46 +00:00
Jorge Penadés	dd91449818	feat: refs #5186 use global locales	2024-03-14 15:16:50 +01:00
Javier Segarra	79e2bddeea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets	2024-03-14 15:01:58 +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
Javier Segarra	2436db1c28	refs #6321 perf: update	2024-03-14 14:21:02 +01:00
William Buezas	22c49d9cf7	resolve conflicts	2024-03-14 09:50:27 -03:00
William Buezas	6baaebf6bd	WIP	2024-03-14 09:48:04 -03:00
Javier Segarra	bffc496965	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets	2024-03-14 13:04:05 +01: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
Carlos Fonseca	a3097a9223	Merge branch 'dev' into PR-CUSTOMER	2024-03-14 10:55:02 +00: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	4925bed845	resolve conflicts	2024-03-13 11:31:55 -03: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	058b21669f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-03-11 08:23:56 +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
Javier Segarra	d10c04d4f2	refs #6321 feat: change dialog header	2024-03-06 20:46:13 +01:00
Javier Segarra	51b8667938	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets	2024-03-06 13:51:59 +01:00
William Buezas	6a105d5d38	resolve conflicts	2024-03-06 08:35:49 -03:00
Jorge Penadés	3d5674128f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-03-06 12:31:33 +01:00
William Buezas	859c87940d	Several changes	2024-03-06 08:15:50 -03:00
Jorge Penadés	0fd83cf435	fix: refs #6942 changes and new features	2024-03-05 08:59:06 +01:00
Javier Segarra	3a7e092efe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets	2024-03-05 08:06:05 +01: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	a0f9c811ff	resolve conflicts	2024-02-28 12:56:13 -03:00
William Buezas	b0d43edbce	Route summary link logic improvement	2024-02-28 12:02:38 -03:00
carlosfonseca	0a33b8d92a	Solucion a comentarios 24	2024-02-27 11:38:58 -05: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
carlosfonseca	9ae0874ccf	Solucion a comentarios	2024-02-22 10:44:29 -05:00
William Buezas	f69b25716d	Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER	2024-02-22 10:38:30 -03:00
William Buezas	1b67b7ab36	Customer description corrections and creation of tickets create view	2024-02-22 10:38:15 -03:00
carlosfonseca	3bcd4984f5	Solucion a comentarios 17	2024-02-22 05:11:02 -05: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
carlosfonseca	01d68734b6	Correccion de conflictos	2024-02-20 12:15:27 -05:00
Kevin Martinez	0a03ef69ea	Create roadmap basic data page	2024-02-20 08:00:17 -03:00
Kevin Martinez	343269fc02	Create roadmap summary page	2024-02-20 08:00:12 -03:00
Kevin Martinez	45d7b021a6	Create roadmap create page	2024-02-20 07:58:14 -03:00
Kevin Martinez	8ffa3b7626	Create roadmap list page	2024-02-20 07:57:59 -03:00
Kevin Martinez	046ac0406b	Create invoice in autonomous page	2024-02-19 10:13:17 -03:00
Kevin Martinez	e846582606	Create route autonomous	2024-02-19 10:13:00 -03:00
Kevin Martinez	76dd84fd87	Create route logs	2024-02-19 09:58:33 -03:00
Kevin Martinez	67f862ebe3	Create route tickets	2024-02-19 09:57:49 -03:00
carlosfonseca	ab20ec1738	Solucion a comentarios 8	2024-02-14 12:21:00 -05:00
Alex Moreno	1d4179cfa1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms	2024-02-13 08:09:25 +01:00
William Buezas	cd2eb71efd	Fix view icon	2024-02-12 08:14:10 -03:00
Alex Moreno	cb6ba483d0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms	2024-02-09 14:43:50 +01:00
William Buezas	399f47b17c	merge with salix-front dev branch and resolve conflicts	2024-02-09 08:59:46 -03:00
Alex Moreno	34e907eb32	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms	2024-02-09 09:41:21 +01:00
Alex Moreno	2fb1688af4	Merge branch 'dev' into 4666-invoiceInCorrection	2024-02-08 17:30:47 +00:00
Alex Moreno	76680dd715	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms	2024-02-08 07:26:27 +01:00
Kevin Martinez	15f7f85734	Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 ... # Conflicts: # src/components/ui/VnSearchbar.vue # src/pages/Route/RouteList.vue	2024-02-07 22:38:57 -03:00
William Buezas	f59c2409f1	travels corrections and improvements	2024-02-07 15:01:51 -03:00
Jorge Penadés	c162f34ee5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection	2024-02-07 10:22:23 +01:00
William Buezas	0ff70a378d	Travel termographs and general improvements	2024-02-06 14:08:44 -03:00
William Buezas	7b542dc3bb	WIP	2024-02-06 14:06:24 -03:00
William Buezas	71e2cdebe4	WIP	2024-02-06 14:05:57 -03:00
Carlos Fonseca	f2a877557f	Merge branch 'dev' into features/ms_164_file_management_card	2024-02-06 16:06:14 +00:00
carlosfonseca	01ffe3adb7	Se termina desarrollo de las tarjetas gestion documental e impagado	2024-02-05 15:51:09 -05:00
Alex Moreno	7b68f15781	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms	2024-02-05 12:54:58 +01:00
William Buezas	a88b1137dc	Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev	2024-02-02 14:11:36 -03:00
William Buezas	dc554f03d0	merge with salix-front dev	2024-02-02 14:11:12 -03:00
William Buezas	59c8ada077	merge with salix-front branch dev	2024-02-02 13:26:34 -03:00
Jorge Penadés	fed382d1fd	fix: refs #4466 conficts	2024-02-02 15:28:10 +01:00
carlosfonseca	b06e5b9252	Correcciones comentarios pr	2024-02-02 08:21:23 -05:00
Jorge Penadés	814c8dc0e2	fix: refs #4466 conficts	2024-02-02 14:07:33 +01:00
Jorge Penadés	3d6f9f9dd2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection	2024-02-02 14:06:34 +01:00
carlosfonseca	7b3ff319d4	Desarrollo de tarjetas varias en el modulo de clientes en el summary	2024-01-31 07:32:34 -05:00
Alex Moreno	5b6a526932	refs #5509 feat: VnDms feat: EntryDms	2024-01-29 15:12:30 +01:00
William Buezas	7d9b34d4c5	Latest buys WIP	2024-01-29 08:39:46 -03:00
William Buezas	8cc92f127c	merge with dev	2024-01-27 16:10:15 -03:00
William Buezas	9757fdf70a	Travel termographs and general improvements	2024-01-27 16:08:02 -03:00
William Buezas	e9fe4a3cb9	improvement	2024-01-27 12:14:50 -03:00
William Buezas	a01b80703e	Create child submodules feature	2024-01-27 12:08:56 -03:00
William Buezas	4fae8e633b	Create items module base structure, item descriptor and add it to supplier consumption	2024-01-26 16:36:27 -03:00
William Buezas	0c385d9a6f	WIP	2024-01-22 11:22:22 -03:00
Javier Segarra	c95b738e0c	refs #6321 feat: create new section for ticket module	2024-01-20 12:23:51 +01:00
carlosfonseca	b06234441c	Se crean las tarjetas de greuges, recobros y acceso web	2024-01-19 10:08:26 -05:00
William Buezas	d4a89895b4	WIP	2024-01-18 11:19:23 -03:00
William Buezas	f66af0e663	Merge pull request 'Create Route module' (#73) from feature/routes into dev ... Reviewed-on: hyervoni/salix-front-mindshore#73	2024-01-18 13:22:20 +00:00
Kevin Martinez	661e9d4368	Create route summary	2024-01-18 08:45:41 -04:00
carlosfonseca	91e36e6404	Se crea la tarjeta de creditos, listado y creacion	2024-01-17 13:45:01 -05:00
Carlos Fonseca	4838549748	Merge branch 'dev' into features/ms_118_update_customs_agent	2024-01-17 16:53:08 +00:00
Kevin Martinez	a68f53d9f7	Add route form	2024-01-17 09:04:10 -04:00
William Buezas	a41fd4c487	Merge pull request 'feature/EntrySubmodules' (#71) from feature/EntrySubmodules into dev ... Reviewed-on: hyervoni/salix-front-mindshore#71	2024-01-17 11:39:18 +00:00
carlosfonseca	27f9d5a7b2	Se crea tarjeta de notas, lectura y creacion	2024-01-16 22:25:17 -05:00
William Buezas	64a4a800f7	Entry buys import	2024-01-16 16:11:23 -03:00
William Buezas	596904c4f8	Entry submodules: Log, Basic data, Buys (WIP)	2024-01-16 13:26:12 -03:00
carlosfonseca	29418d22bb	Se crea formulario de actualización de un agente de aduanas y observaciones	2024-01-16 09:48:30 -05:00
carlosfonseca	c471a4febc	Se crea el formulario para la creacion de un agente de aduanas	2024-01-15 09:16:50 -05:00
William Buezas	129cacb88b	Merge pull request 'feature/ms-115-EntryListView' (#68) from feature/ms-115-EntryListView into dev ... Reviewed-on: hyervoni/salix-front-mindshore#68	2024-01-14 23:57:12 +00:00
William Buezas	f64ac5c70d	Entry summary	2024-01-12 17:02:52 -03:00
Carlos Fonseca	7432f754f5	Merge branch 'dev' into features/ms_118_consignees_cart	2024-01-12 15:42:33 +00:00
Kevin Martinez	3d98bf578e	Create route list	2024-01-12 10:03:18 -04:00
William Buezas	2b6faf8186	merge with dev	2024-01-11 14:59:18 -03:00
carlosfonseca	d2ee8a98eb	Se crea la tarjeta que muestra el listado de consignatarios existentes y la tarjeta de creacion	2024-01-11 08:25:59 -05:00
William Buezas	5511e365aa	WIP	2024-01-09 10:46:27 -03:00
Alex Moreno	bc8b9501c0	Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-branch-PR-2	2024-01-09 07:43:29 +01:00
William Buezas	865a13aafa	Submodulos de suppliers: Accounts, Contacts y Addresses	2024-01-08 16:16:42 -03:00
carlosfonseca	ead8bb4992	Se definen los iconos de las tarjetas en summary y se organiza cabeceras de tablas	2024-01-03 14:53:01 -05:00
Alex Moreno	5994b4e08e	Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-branch-PR-2	2024-01-03 14:16:26 +01:00
Kevin Martinez	733baa1310	Merge branch 'dev' into feature/order ... # Conflicts: # src/i18n/en/index.js	2024-01-03 06:51:38 -04:00
Jorge Penadés	a1b6698819	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection	2024-01-03 11:34:07 +01:00
carlosfonseca	677660f5cc	Se hacen maquetado general de menu izquierdo en summary de clientes	2024-01-02 06:54:15 -05:00
carlosfonseca	31467a2bef	Correccion de conflicto	2024-01-02 03:17:23 -05:00
William Buezas	113df44705	create entries basic structure and add create entry and clone travel with entries feature to travel list and travel summary	2023-12-29 16:54:35 -03:00
William Buezas	c4c344f07a	Add descriptor and submodules to supplier card left menu	2023-12-29 14:00:32 -03:00
Jorge Penadés	d374709d4a	logs added: refs #6605	2023-12-29 08:58:32 +01:00
carlosfonseca	eebefca919	Correccion de conflictos	2023-12-28 10:31:15 -05:00
carlosfonseca	5729204a3b	Se crea tabla y filtros de morosos en clientes	2023-12-28 10:25:23 -05:00
William Buezas	59e2e20827	Merge pull request 'feature/ms-68-WorkersDepartments' (#45) from feature/ms-68-WorkersDepartments into dev ... Reviewed-on: hyervoni/salix-front-mindshore#45	2023-12-28 15:07:33 +00:00
Jorge Penadés	232827ef48	WIP: corrective section created: refs #4466	2023-12-28 16:02:04 +01:00
Kevin Martinez	b22fcddcd3	Create order lines	2023-12-26 17:45:54 -04:00
Carlos Fonseca	5e1e49e253	Merge pull request 'Se crea tabla de notificaciones, tarjeta por identificador y filtros' (#44) from features/ms_93_customer_notifications_2 into dev ... Reviewed-on: hyervoni/salix-front-mindshore#44	2023-12-26 13:56:09 +00:00
William Buezas	2e09fbd968	Department tree and summary view	2023-12-25 20:38:13 -03:00
carlosfonseca	899b9536b6	Se crea tabla de notificaciones, tarjeta por identificador y filtros	2023-12-22 08:29:21 -05:00
William Buezas	37d1239af1	Workers WIP	2023-12-22 08:28:08 -03:00
Kevin Martinez	36344d112b	Create order volume	2023-12-22 00:34:18 -04:00
Kevin Martinez	bcfb34475b	Merge branch 'dev' into feature/order	2023-12-20 13:58:51 -04:00
Carlos Fonseca	19ab09ee08	Merge pull request 'Se crea tabla y filtros de extended list' (#37) from features/ms_64_extended_list into dev ... Reviewed-on: hyervoni/salix-front-mindshore#37	2023-12-20 17:16:16 +00:00
Kevin Martinez	a65db2f4cf	Create order catalog section	2023-12-19 09:15:54 -04:00
Kevin Martinez	42c8e8c80f	Merge branch 'dev' into feature/order	2023-12-19 00:59:53 -04:00
William Buezas	d309f04a8f	Merge with dev	2023-12-18 12:00:26 -03:00
carlosfonseca	b34a5f1d89	Se crea tabla y filtros de extended list	2023-12-18 09:41:10 -05:00
Carlos Fonseca	4c55896dfb	Merge pull request 'Se crea formulario de creacion de cliente' (#34) from features/ms_63_client_create into dev ... Reviewed-on: hyervoni/salix-front-mindshore#34	2023-12-14 16:43:16 +00:00
carlosfonseca	0a41ce6aa9	Se crea formulario de creacion de cliente	2023-12-14 06:49:40 -05:00
William Buezas	0b80e8cacc	Add left menu to travel card	2023-12-14 08:42:52 -03:00
Kevin Martinez	c0f6906119	Merge branch 'dev' into feature/order ... # Conflicts: # src/i18n/en/index.js # src/router/modules/index.js	2023-12-14 07:08:58 -04:00
Alex Moreno	7557096af6	refs #6062 fix: migration errors	2023-12-13 14:19:42 +01:00
William Buezas	cded128c4c	WIP	2023-12-12 08:45:08 -03:00
Kevin Martinez	9a477c2c25	Create order page	2023-12-11 10:47:16 -04:00
William Buezas	bc6ef24cd8	use vn-dark css variable	2023-12-11 08:56:27 -03:00
Kevin Martinez	4fd2b05137	Fix shelving pages	2023-12-07 13:33:11 -04:00
Jorge Penadés	2f63a7f1fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn	2023-12-07 15:49:53 +01:00
Jorge Penadés	a3d6275b2f	refs #6545 counters created	2023-12-04 10:38:35 +01:00
William Buezas	9b6ec56011	Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-23-ExtraCommunity	2023-12-01 09:42:47 -03:00
Kevin Martinez	8855880306	Change shelving directory	2023-11-30 15:58:25 -03:00
Kevin Martinez	524e89319e	Implement shelving logs	2023-11-30 15:57:54 -03:00
Kevin Martinez	01517c638b	Update Shelving page	2023-11-29 15:55:31 -03:00
William Buezas	62a806b813	WIP	2023-11-29 09:07:44 -03:00
Kevin Martinez	008dfd1be8	Fix merge conflicts	2023-11-28 11:58:42 -03:00
Kevin Martinez	d65f331d1f	Merge branch 'dev' into feature/ms-18-shelving-list	2023-11-28 00:16:37 -03:00
William Buezas	4eb57ab90e	resolve conflicts when pulling dev	2023-11-25 20:04:20 -03:00
William Buezas	e8b1d0fe7e	travel WIP	2023-11-25 19:02:26 -03:00
Jorge Penadés	bc2256a021	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn	2023-11-24 09:25:29 +01:00
Kevin Martinez	bffe6b0664	Add create shelving page	2023-11-23 20:27:06 -03:00
Kevin Martinez	8e0ee45901	Create Shelving list module ... Adds shelving list, preview and update	2023-11-23 01:17:23 -03:00
William Buezas	d0cb96ce23	merge with dev	2023-11-22 15:26:59 -03:00
William Buezas	14788b7f7c	Suppliers list and suppliers create view	2023-11-22 15:05:12 -03:00
Joel Crespo	5246427e8d	The negative bases view was created for issued invoices.	2023-11-22 07:15:07 -03:00
Jorge Penadés	bc8f6b643d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn	2023-11-21 08:33:59 +01:00
Joel Crespo	97f732d3cf	wip	2023-11-20 13:06:14 -03:00
William Buezas	505052d84d	[WIP] global invoices	2023-11-16 16:44:35 -03:00
Carlos Satorres	9b11ca05a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim	2023-11-16 13:16:57 +01:00
Alex Moreno	9993344d70	Merge branch 'dev' into 4797-workerNotificationManager	2023-11-09 10:04:47 +00:00
Alex Moreno	0b3a957944	refs #4797 fix: remove clientCreate	2023-11-08 12:20:00 +01:00
Carlos Satorres	b89f5aadf1	Merge branch 'dev' into 6157-actionClaim	2023-11-07 11:43:57 +00:00
Alex Moreno	cc13e3935e	refs #4797 feat(workerNotificationManager): use crudModel	2023-11-03 15:24:48 +01:00