1926 Commits

Author	SHA1	Message	Date
William Buezas	d38c85a0ef	resolve conflicts	2024-04-12 09:39:34 -03:00
William Buezas	b4d92d4f97	Fix Options item labels	2024-04-12 09:35:57 -03:00
Jon Elias	5cd32ec2fe	Merge branch 'dev' into 6425-translationProposal	2024-04-12 12:21:41 +00:00
Jorge Penadés	a27bdc37d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6946-refactorEntryNotes	2024-04-12 13:27:14 +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	3d9d444bb4	remove filter field	2024-04-12 08:11:58 -03:00
William Buezas	c12fd77218	Remove businessFk from FetchData	2024-04-12 08:10:14 -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	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
Alex Moreno	3f8d97e2a3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-11 12:32:51 +02:00
Alex Moreno	d99d934dab	fix: refs #7199 e2e	2024-04-11 12:29:30 +02:00
Robert Ferrús	de18b56cb2	feat: refs #6679 add icon	2024-04-10 14:47:20 +02:00
Robert Ferrús	f59ecbf94e	Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon	2024-04-10 14:42:48 +02:00
Robert Ferrús	7f2d8ee1e5	feat: refs #6679 add icon	2024-04-10 14:42:43 +02: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	99c576b16e	Add actions again	2024-04-10 09:32:15 -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	e676933942	Update worker dms remove	2024-04-10 08:59:05 -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	e4a8c45053	Change workweeks colod and capitalize	2024-04-10 08:32:04 -03:00
Robert Ferrús	a350de9119	Merge branch 'dev' into 6679-addCreateIcon	2024-04-10 11:30:21 +00:00
William Buezas	39af4278a6	Add delete model to worker dms	2024-04-10 08:27:30 -03:00
Robert Ferrús	933e6b88b1	feat: refs #6679 add icon	2024-04-10 13:24:20 +02:00
Jon Elias	6a203f593f	Merge branch '6425-translationProposal' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal	2024-04-10 12:53:45 +02:00
Jon Elias	eb91c0b1c2	Merge branch 'dev' into 6425-translationProposal	2024-04-10 12:53:44 +02:00
Jon Elias	e3e6c74afa	Merge branch 'dev' into 7186-tabIndexVATExpenses	2024-04-10 07:36:17 +00:00
jcasado	c640ba1298	fix set	2024-04-10 09:31:38 +02:00
jcasado	70c9f1dea4	refs #7179 changes pr	2024-04-10 09:29:26 +02:00
Jon Elias	09ceefb7c5	style: refs #7186 fixed style	2024-04-10 08:49:54 +02:00
Jon Elias	f9de26933a	refactor: refs #7186 fill-icon change	2024-04-10 08:00:36 +02:00
William Buezas	e88194eb88	Update worker dms model prop	2024-04-09 16:00:12 -03: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	9bffc9bb25	classes and size improvements	2024-04-09 15:20:29 -03:00
William Buezas	faa8d05313	Change saturday and sunday days color	2024-04-09 14:48:51 -03:00
William Buezas	c573019038	Sizes and spacings	2024-04-09 14:13:40 -03:00
William Buezas	9ea0a62046	Add border and change background color	2024-04-09 14:03:18 -03:00
William Buezas	dfcf6e35d5	Change WorkerEventLabels separations	2024-04-09 11:06:07 -03:00
William Buezas	3e5a5dfe1c	remove import	2024-04-09 10:53:07 -03:00
William Buezas	9c3407846b	Fix translation	2024-04-09 10:30:40 -03:00
Jorge Penadés	83bf8183f0	fix: refs #6992 warning console & formModel hook	2024-04-09 15:12:54 +02:00
Jorge Penadés	6349a3e790	feat: refs #6992 comments	2024-04-09 15:08:54 +02:00
jcasado	d8ef199b14	refs #7179 remove code	2024-04-09 14:55:27 +02:00
William Buezas	881c6e2f7f	Improve translations	2024-04-09 09:54:23 -03:00
William Buezas	fb4f35a378	Rename WorkerDateLabel and change colors	2024-04-09 09:21:35 -03:00
William Buezas	0941d74d52	Move default value assignment	2024-04-09 09:14:41 -03:00
William Buezas	196679b9e9	Change v-if variable	2024-04-09 09:07:46 -03:00
William Buezas	e4166c85fa	Move add absences text to a i18n variable	2024-04-09 09:05:15 -03:00
William Buezas	b05c28f571	Add chaining to holiday detail and holiday type	2024-04-09 08:57:39 -03:00
William Buezas	0144aab7a5	Mini fix	2024-04-09 08:51:00 -03:00
Jon Elias	15d4b54dda	refactor: refs #7186 fixed changes	2024-04-09 13:34:45 +02: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
Jon Elias	65626446fd	refactor: refs #7186 fixed style and tab	2024-04-09 13:01:29 +02:00
Jorge Penadés	50bce40613	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl	2024-04-09 10:09:41 +02:00
Guillermo Bonet	4b9e69625b	Merge branch 'dev' into 6636-pickup	2024-04-09 08:02:30 +00:00
Jorge Penadés	fdfa99c718	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl	2024-04-09 09:55:44 +02:00
Robert Ferrús	cd3024c0a1	feat: refs #6679 add icon	2024-04-09 09:17:49 +02:00
Jon Elias	f988923b4b	Merge branch 'dev' into 6973-UpdateVnLocationLabel	2024-04-09 06:48:06 +00:00
Jon Elias	b7788512bc	refactor: refs #6973 fix requested changes	2024-04-09 08:41:44 +02:00
Jon Elias	3bededcd94	refactor: refs #6973 updated label and updated cypress test	2024-04-09 07:47:40 +02:00
William Buezas	64ff5e4446	Add pagination and table actions	2024-04-08 11:40:44 -03:00
Jorge Penadés	16548dadef	feat: refs #6992 add test	2024-04-08 16:38:36 +02:00
Jorge Penadés	8de3ea16a6	fix: refs #6992 add queryParams	2024-04-08 15:15:18 +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
William Buezas	f12ec3c0c9	Add redirection to summary and open summary action	2024-04-08 08:47:29 -03:00
Javier Segarra	f2d513766e	fix_merge_worker_submoduls	2024-04-08 07:03:42 +00:00
Guillermo Bonet	b2ef381f1d	Merge branch 'dev' into 6636-pickup	2024-04-08 05:18:34 +00:00
William Buezas	4b6038d1d2	Last changes	2024-04-06 14:10:08 -03:00
William Buezas	4701714aa9	merge with dev	2024-04-05 08:42:13 -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
William Buezas	03be831ee5	remove package-lock.json	2024-04-05 08:24:55 -03:00
William Buezas	dae08c322d	visual adjustments	2024-04-05 08:04:34 -03:00
Guillermo Bonet	1a15ccec2c	fix: refs #6636 Call getEnumValues method	2024-04-05 11:01:48 +02:00
Javier Casado	5d7fed3b32	Merge branch 'dev' into 6816-removeMicroSip	2024-04-05 07:57:21 +00:00
Alex Moreno	e14993c114	minor changes	2024-04-05 09:12:49 +02:00
Guillermo Bonet	9310d863aa	fix: refs #6636 Icon save and reset	2024-04-05 07:39:05 +02:00
Guillermo Bonet	58b9eb1c78	feat: refs #6636 Requested changes	2024-04-05 07:29:25 +02:00
Guillermo Bonet	8d7670cc85	Merge branch 'dev' into 6636-pickup	2024-04-05 05:24:31 +00:00
William Buezas	cb55115cd2	Remove unused component	2024-04-04 12:02:43 -03:00
William Buezas	78dc3c1c9a	Move data fetching to main component	2024-04-04 11:20:30 -03:00
Jon Elias	59a631b19e	Merge branch 'dev' into 6894-invoiceInChangeFilters	2024-04-04 12:32:40 +00:00
William Buezas	fd5ea8f6f5	WIP	2024-04-04 09:27:17 -03:00
Jon Elias	97b7c2469a	refactor: refs #6894 changed filter fields and checked functionality	2024-04-04 14:13:34 +02:00
Guillermo Bonet	b09ecefad4	feat: refs #6636 Added pickup in claim	2024-04-04 14:12:16 +02:00
William Buezas	503efb79c9	WIP	2024-04-04 08:39:52 -03:00
Javier Segarra	0ad722381e	#6425 fix quotes in yml file	2024-04-04 13:38:25 +02:00
Guillermo Bonet	b21c54f20d	Merge branch 'test' into dev	2024-04-04 11:31:20 +02:00
Guillermo Bonet	d98e5d78ff	hotfix: refs #6930 Rollback tokenMultimedia	2024-04-04 10:17:13 +02:00
jcasado	d00ec3c41c	refs #6816 remove microsip tag	2024-04-04 09:38:47 +02:00
William Buezas	0f6c6cde91	Improve visually WorkerDateLabel	2024-04-03 17:32:22 -03:00
Pablo Natek	be42593368	Merge branch 'dev' into 7128-copyStyles	2024-04-03 19:10:38 +00:00
William Buezas	60b146196f	add calendar short-weekday-label	2024-04-03 13:48:41 -03:00
Alex Moreno	dec71dbf62	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-04-03 16:29:40 +02:00