261 Commits

Author	SHA1	Message	Date
jcasado	4b3df372cd	refs: #6764 fixConflicts	2024-04-25 08:49:40 +02:00
jcasado	716dd4e28f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6764-rename-VnSelectFilter	2024-04-24 08:02:19 +02:00
jcasado	7f07b9780c	refs: #6764 rename VnSelectFilter	2024-04-23 13:03:32 +02:00
Jon Elias	02637556fb	Merge branch 'dev' into 7239-changeTranslations	2024-04-23 09:45:25 +00:00
Jon Elias	fe600d9318	refactor: refs #7239 requested changes	2024-04-23 10:15:54 +02:00
Alex Moreno	20ec141237	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-23 07:39:15 +02:00
Jon Elias	87ce1f0217	Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations	2024-04-23 07:15:41 +02:00
Jon Elias	4ddcbaeacd	refactor: refs #7239 fixed errors	2024-04-23 07:15:39 +02:00
Jon Elias	2e493258fd	Merge branch 'dev' into 7239-changeTranslations	2024-04-22 11:19:15 +00:00
Jon Elias	dd74c7d507	refactor: refs #7239 changed translations	2024-04-22 13:17:22 +02:00
William Buezas	3a03e42cf9	Resolve conflicts	2024-04-19 10:40:04 -03:00
Alex Moreno	84dfd6d474	hotFix(workerDms): use undefined	2024-04-18 08:12:11 +02:00
Javier Segarra	e1716b9ea4	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-04-15 13:11:21 +02:00
William Buezas	e676933942	Update worker dms remove	2024-04-10 08:59:05 -03:00
William Buezas	e8486099fc	Resolve conflicts	2024-04-10 08:37:52 -03:00
William Buezas	39af4278a6	Add delete model to worker dms	2024-04-10 08:27:30 -03:00
Jorge Penadés	83bf8183f0	fix: refs #6992 warning console & formModel hook	2024-04-09 15:12:54 +02:00
William Buezas	f6e140e369	Apply workerDms changes	2024-04-09 08:28:00 -03:00
Guillermo Bonet	4b9e69625b	Merge branch 'dev' into 6636-pickup	2024-04-09 08:02:30 +00:00
Jon Elias	f988923b4b	Merge branch 'dev' into 6973-UpdateVnLocationLabel	2024-04-09 06:48:06 +00:00
Jon Elias	3bededcd94	refactor: refs #6973 updated label and updated cypress test	2024-04-09 07:47:40 +02:00
Guillermo Bonet	b09ecefad4	feat: refs #6636 Added pickup in claim	2024-04-04 14:12:16 +02:00
William Buezas	94644de4fa	VnSmsDialog adapt style and add tooltip	2024-04-02 10:44:02 -03:00
William Buezas	bafb938e23	VnSmsDialog add default value to template prop as empty string	2024-03-28 17:10:07 -03:00
Jon Elias	2b1fe6fd77	Merge branch '6514-gestDocSupplier' of https://gitea.verdnatura.es/verdnatura/salix-front into 6514-gestDocSupplier	2024-03-28 08:31:57 +01:00
Jon Elias	b2691a35e1	refactor: refs #6514 fixed tranlation	2024-03-28 08:31:56 +01:00
William Buezas	0d6d18b8c8	Apply VnDmsList component and add docuware action	2024-03-27 20:33:35 -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	2c6d95336c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination	2024-03-26 09:35:23 +01:00
Alex Moreno	c335accffb	refs #6905 fix translation and warnings	2024-03-25 12:42:48 +01:00
Javier Segarra	36a6554fb1	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-03-22 06:16:40 +00:00
Jorge Penadés	f86c331afa	feat: refs #5186 use arrayData in descriptor	2024-03-21 16:38:49 +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
Javier Segarra	fedec76b62	refs #6907 feat: merge changes	2024-03-21 13:11:22 +01:00
Javier Segarra	18d4be0ea2	refs #6907 feat: merge changes	2024-03-21 12:33:28 +01:00
Javier Segarra	f5d6c45339	refs #6907 updates	2024-03-21 10:45:30 +01:00
Javier Segarra	85a78d847b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover	2024-03-21 10:30:51 +01:00
Pablo Natek	5580d15606	remove: refs #7001 custom chip	2024-03-20 11:30:43 +01:00
Pablo Natek	2fa5b1303d	remove(vnChip): refs #7001 remove component	2024-03-20 11:28:50 +01:00
Pablo Natek	22eef14bb3	feat(light theme): refs #7001 add light theme	2024-03-19 11:15:54 +01:00
Jon Elias	2321ca6605	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination	2024-03-15 12:54:05 +01:00
Jon Elias	ff5e09d315	refs #6993 fixed QTable behaviour	2024-03-15 12:45:15 +01:00
Javier Segarra	e0e5082e1e	refs #6321 perf: replace QIcon with clearable prop	2024-03-15 06:16:37 +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
Pablo Natek	077fa7e2a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles	2024-03-14 15:10:41 +01:00
Pablo Natek	00a47cd5b2	refactor(style): refs #7001 add style font vnTitle vnChip	2024-03-14 15:06:06 +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
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