560 Commits

Author	SHA1	Message	Date
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
Pablo Natek	663c093a00	feat: refs #4988 agency e2e	2024-04-22 18:17:01 +02:00
William Buezas	78561c5f42	Item types	2024-04-22 08:34:38 -03:00
Javier Segarra	5a588ead87	Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia	2024-04-22 07:38:07 +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
Javier Segarra	fb26219354	refs #7190 feat: useTokenConfig	2024-04-19 12:09:04 +02:00
Alex Moreno	6db5c56f5a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3	2024-04-19 09:36:10 +02:00
William Buezas	6c4901076f	Apply ItemsFilterPanel to EntryLatestBuys	2024-04-18 13:14:23 -03:00
William Buezas	5f01e5c705	change es translations	2024-04-18 09:09:22 -03:00
William Buezas	5addd0056d	Add filter panel	2024-04-17 17:18:38 -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	da06e7bc87	WIP	2024-04-17 08:13:34 -03:00
Alex Moreno	c4c317ef41	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3	2024-04-17 10:53:18 +02: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
Alex Moreno	4f286cd032	Merge branch 'dev' into 6425-fixDevTranslations	2024-04-16 12:32:46 +00:00
William Buezas	2ab7a45114	resolve conflicts	2024-04-16 08:49:34 -03:00
William Buezas	5664ec1313	WIP	2024-04-16 08:21:44 -03:00
Jon Elias	b216112d2a	refactor: refs #6425 fix failed tests	2024-04-16 11:42:43 +02:00
Jon Elias	73c5a5b7d2	fix: refs #6425 fixed dev translations	2024-04-16 11:00:38 +02:00
Robert Ferrús	87ae6870a9	feat: refs #6679 add icon	2024-04-16 09:33:56 +02:00
Robert Ferrús	d178d7dc6a	feat: refs #6679 add icon	2024-04-16 08:04:57 +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
William Buezas	c50741b4bf	Remove single quotes	2024-04-15 08:51:48 -03:00
Alex Moreno	f176312163	feat(VnNotes): refs #6336 better design	2024-04-15 12:28:43 +02:00
William Buezas	9c7c98d64d	Merge with dev	2024-04-12 16:55:51 -03:00
William Buezas	92429295cd	more translations	2024-04-12 10:44:25 -03:00
William Buezas	4d418c9cb7	Pull new traduction yml files and add translations	2024-04-12 10:32:19 -03:00
William Buezas	beaffbf685	delete old i18n files and adapt branch to the new ones	2024-04-12 10:20:05 -03:00
William Buezas	d38c85a0ef	resolve conflicts	2024-04-12 09:39:34 -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
Jon Elias	f83de74f01	refs #6425 fix conflicts	2024-04-12 11:44:56 +02:00
William Buezas	73703dc778	Add translations	2024-04-11 18:07:02 -03: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
Javier Casado	6002800000	Merge branch 'dev' into 7179-changesClaimSummary	2024-04-11 11:37:11 +00: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
William Buezas	c881fe6577	Resolve conflicts	2024-04-10 09:19:54 -03:00
William Buezas	eceb60f6e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList	2024-04-10 08:46:00 -03:00
William Buezas	9ae79a5631	Add translation again	2024-04-10 08:43:57 -03:00
William Buezas	e8486099fc	Resolve conflicts	2024-04-10 08:37:52 -03:00
William Buezas	c3835dfd7a	resolve conflicts	2024-04-09 15:23:05 -03:00
William Buezas	0144aab7a5	Mini fix	2024-04-09 08:51:00 -03:00
jcasado	97ad1c7579	refs #7179 changes customer proxy and client Id	2024-04-09 13:32:01 +02:00
William Buezas	f6e140e369	Apply workerDms changes	2024-04-09 08:28:00 -03:00
William Buezas	e51ea9996b	Item list view	2024-04-09 08:18:18 -03:00
Guillermo Bonet	4b9e69625b	Merge branch 'dev' into 6636-pickup	2024-04-09 08:02:30 +00: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
William Buezas	f12ec3c0c9	Add redirection to summary and open summary action	2024-04-08 08:47:29 -03:00
Guillermo Bonet	b2ef381f1d	Merge branch 'dev' into 6636-pickup	2024-04-08 05:18:34 +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	970d1a48e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker	2024-04-05 08:25:28 -03:00
Javier Casado	5d7fed3b32	Merge branch 'dev' into 6816-removeMicroSip	2024-04-05 07:57:21 +00:00
Guillermo Bonet	b09ecefad4	feat: refs #6636 Added pickup in claim	2024-04-04 14:12:16 +02:00
Javier Segarra	0ad722381e	#6425 fix quotes in yml file	2024-04-04 13:38:25 +02:00
jcasado	d00ec3c41c	refs #6816 remove microsip tag	2024-04-04 09:38:47 +02:00
William Buezas	4ee8c45fdc	resolve conflicts	2024-04-03 11:22:52 -03:00
Jon Elias	94b177c9a2	fix: refs #6425 fix yml format	2024-04-03 14:33:47 +02:00
Jon Elias	3e423867e3	fix: refs #6425 fix yml format	2024-04-03 13:12:00 +02:00
William Buezas	bfee37b631	WIP	2024-04-03 08:08:54 -03:00
Jon Elias	9a160d9248	refactor: refs #6425 merged changes	2024-04-03 12:57:23 +02:00
William Buezas	fc87bb8293	Add page title name	2024-04-02 13:04:28 -03:00
William Buezas	addbe9345b	Resolve conflicts	2024-04-02 12:40:26 -03:00
Jon Elias	33c54042df	refactor: refs #6425 translation files in .yml format and minor changes	2024-04-02 14:12:01 +02: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
William Buezas	b546b63352	resolve conflicts	2024-03-27 10:11:20 -03:00
Jon Elias	d555f7e09e	Merge branch 'dev' into 6988-SummaryRefactor	2024-03-27 10:02:18 +00: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
William Buezas	0a74b2a96e	QCalendar implementation WIP	2024-03-26 15:38:06 -03:00
Jon Elias	1ec54d7664	feat: #6514 create supplierDms lilium	2024-03-26 08:55:01 +01:00
Alex Moreno	a4a96a106f	Merge branch 'dev' into 6988-SummaryRefactor	2024-03-26 06:41:39 +00:00
Kevin Martinez	5e089e616e	Merge branch 'dev' into feature/worker-log	2024-03-25 12:00:06 +00:00
Alex Moreno	c335accffb	refs #6905 fix translation and warnings	2024-03-25 12:42:48 +01:00
Jon Elias	3e0f151570	refactor: refs #6988 fixed error	2024-03-25 12:36:50 +01:00
Jon Elias	84a25acf22	refactor: refs #6988 used global translations	2024-03-25 11:42:29 +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
Carlos Satorres	95d943e6f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig	2024-03-22 10:17:36 +01: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
William Buezas	fc5d858bf1	WIP	2024-03-21 08:37:11 -03:00
Jon Elias	7658573ec6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal	2024-03-21 12:23:45 +01:00
Jon Elias	63c6b523fb	refactor: refs #6425 new translation proposal	2024-03-21 12:14:54 +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
Carlos Satorres	798ffa7de3	refs #6905 fix	2024-03-20 10:20:05 +01:00
Carlos Satorres	0946a34422	Merge branch '6905-userPanelConfig' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig	2024-03-20 09:38:14 +01:00
Carlos Satorres	89fc147ad8	refs #6905 fix traduction	2024-03-20 09:38:11 +01: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
Carlos Fonseca	f25e46cf08	Merge branch 'dev' into PR-CUSTOMER	2024-03-15 03:12:46 +00: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
William Buezas	6baaebf6bd	WIP	2024-03-14 09:48:04 -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
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
William Buezas	f26d14e875	resolve conflicts	2024-03-13 12:57:41 -03:00
William Buezas	4925bed845	resolve conflicts	2024-03-13 11:31:55 -03:00
Jorge Penadés	e793b3dd93	feat: refs #5186 use global locales	2024-03-13 15:06:02 +01:00
William Buezas	09582ab6a8	WIP	2024-03-13 09:05:23 -03:00
carlosfonseca	38d3d49ecb	Solucion a comentarios 34	2024-03-12 16:24:27 -05:00
William Buezas	bd5eb1a1c3	remove assignPDA translation	2024-03-12 11:34:38 -03:00
William Buezas	632049c13b	Assign button change	2024-03-12 11:31:32 -03:00
William Buezas	dad2711311	fix translation	2024-03-12 08:13:27 -03:00
William Buezas	029fc043de	Change title translation	2024-03-12 08:08:20 -03:00
William Buezas	319295f2c2	Workers PDA	2024-03-11 16:53:33 -03: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
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	7e769164d7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-refactor-claimSummary	2024-03-06 09:48:34 +01:00
William Buezas	992ada0984	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections	2024-03-05 18:21:00 -03:00
Alex Moreno	4484f431bf	refs #6336 feat: polish claims	2024-03-04 14:42:15 +01:00
Carlos Satorres	adc290da6d	refs #6935 restyle card	2024-03-04 12:26:14 +01:00
Jorge Penadés	b5edc98732	fix: refs #5186 add all fields basic data & summary	2024-03-01 12:12:44 +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
Alex Moreno	284eefa8f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms	2024-02-27 08:23:02 +01:00
Alex Moreno	c8a4854df9	refs #5509 fix(vnDms): fix issues	2024-02-27 08:22:38 +01:00
Pablo Natek	546df84db1	remove(claimRma): refs #6349 remove all references	2024-02-26 19:06:21 +01:00
Alex Moreno	4988df882c	refs #5509 fix: transaltions	2024-02-26 15:06:49 +01:00
Jorge Penadés	b6d84a5fc6	fix: refs #6904 VnLv icon, customer summary & extendedList	2024-02-26 14:17:02 +01:00
Kevin Martinez	185de3c931	Add roadmap stops	2024-02-23 00:46:57 -03:00
William Buezas	1b67b7ab36	Customer description corrections and creation of tickets create view	2024-02-22 10:38:15 -03:00
Alex Moreno	9abac4a8fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms	2024-02-22 09:11:36 +01:00
Jorge Penadés	1af5b270a0	fear: refs #5186 WIP parking section	2024-02-21 10:26:20 +01:00
carlosfonseca	01d68734b6	Correccion de conflictos	2024-02-20 12:15:27 -05:00
Kevin Martinez	616d8519fa	Fix translations	2024-02-20 08:14:31 -03: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	e846582606	Create route autonomous	2024-02-19 10:13:00 -03:00
Kevin Martinez	988362ab69	Fix route ticket sms event	2024-02-19 10:02:48 -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	bb10714824	Solucion a comentarios 13	2024-02-19 05:24:26 -05:00
carlosfonseca	d0cf13d0af	Solucion a comentarios 12	2024-02-16 13:29:36 -05:00
carlosfonseca	ebd1ee07f4	Solucion a comentarios 11	2024-02-16 13:12:57 -05:00
William Buezas	2f08b64215	merge with dev	2024-02-15 09:20:28 -03:00