13314 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	9d00668acb	Merge pull request 'hotFix_vnJsonValue_showHours' (!1689) from hotFix_vnJsonValue_showHours into master ... Reviewed-on: #1689 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-04-08 13:00:58 +00:00
Javier Segarra	7e56cb96ef	Merge pull request '#8725 - submit_form_onClick' (!1564) from 8725_submit_form_onClick into dev ... Reviewed-on: #1564 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-08 12:58:50 +00:00
Javier Segarra	87925d3fad	Merge branch 'dev' into vitest_ui	2025-04-08 12:57:32 +00:00
Javier Segarra	36ff68900f	Merge pull request 'test: #7356 Ticket e2e' (!1531) from 7356_e2e into dev ... Reviewed-on: #1531 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-08 12:31:23 +00:00
Alex Moreno	e081543d39	Merge branch 'master' into hotFix_vnJsonValue_showHours	2025-04-08 12:19:43 +00:00
Javier Segarra	77e01ed55c	Merge branch 'dev' into vitest_ui	2025-04-08 12:14:30 +00:00
Alex Moreno	a2f8a61c20	fix(WorkerPDA): fetching available PDA data when add and remove pda	2025-04-08 14:11:43 +02:00
Javier Segarra	a24bc6cc4b	Merge branch 'dev' into 7356_e2e	2025-04-08 12:09:48 +00:00
Alex Moreno	9d2c0bf211	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-04-08 13:34:01 +02:00
Alex Moreno	123ec41f32	fix(WorkerCalendarFilter): fix style year and contract filter	2025-04-08 13:32:31 +02:00
Javier Segarra	d6362d042d	Merge branch 'dev' into 8725_submit_form_onClick	2025-04-08 11:31:00 +00:00
Javier Segarra	1b695be63f	feat: add vitest ui devDependency	2025-04-08 13:30:22 +02:00
Alex Moreno	d3b413fc25	Merge branch 'dev' into 7356_e2e	2025-04-08 11:19:33 +00:00
Javier Segarra	1e1096a108	Merge pull request 'fix: FilterPanel when is multiline and VnTable vh on n toolbar' (!1657) from fix_itemFilter_multiLine into dev ... Reviewed-on: #1657 Reviewed-by: Pablo Natek <pablone@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-08 10:17:23 +00:00
Javier Segarra	9d31a75dfe	Merge branch 'dev' into fix_itemFilter_multiLine	2025-04-08 10:00:52 +00:00
Javier Segarra	af0c30f798	test: refs #8725 add save action to form model popup	2025-04-08 11:57:21 +02:00
Javier Segarra	9cadb4a02b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8725_submit_form_onClick	2025-04-08 11:12:22 +02:00
Benjamin Esteve	b4611aad4c	Merge branch 'dev' into 8824-showCreditGrade	2025-04-08 09:08:41 +00:00
Javi Gallego	5bd2859e5d	fix: refs #6696 update login role in tests and add data attributes for component options	2025-04-08 10:33:11 +02:00
Javier Segarra	3c6bed6d7e	Merge pull request '#8446 - update_vitest_version to 2.0.0' (!1127) from update_vitest_version into dev ... Reviewed-on: #1127 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-08 08:09:34 +00:00
Javier Segarra	af4a398a90	Merge branch 'dev' into fix_itemFilter_multiLine	2025-04-08 07:50:56 +00:00
Javier Segarra	d91d5351c3	Merge branch 'dev' into update_vitest_version	2025-04-08 07:48:18 +00:00
Benjamin Esteve	0e3406a502	fix(CustomerSummary): refs #8824 include insurance grade in secured credit display	2025-04-08 09:23:58 +02:00
Javi Gallego	4e40156c38	Merge branch 'dev' into 6696-manaAfterDepartment	2025-04-08 09:01:48 +02:00
Alex Moreno	c9957371df	Merge branch 'master' into hotFix_vnJsonValue_showHours	2025-04-08 06:58:44 +00:00
Alex Moreno	15cbbab043	fix(WorkerPDA): fix translations	2025-04-08 08:35:27 +02:00
Alex Moreno	2a3e8f293a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-04-08 08:28:17 +02:00
Alex Moreno	ffd83e7e0f	fix(WorkerPDA): use observation field	2025-04-08 08:27:51 +02:00
Alex Moreno	72d9f9345c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-04-08 07:24:04 +02:00
Alex Moreno	e0ba8ab742	refactor: rollback	2025-04-08 07:22:12 +02:00
Javier Segarra	2cb151e181	fix: update pnpm-lock.yaml	2025-04-07 17:43:06 +02:00
Javier Segarra	5e9fe20f08	Merge branch 'update_vitest_version' of https://gitea.verdnatura.es/verdnatura/salix-front into update_vitest_version	2025-04-07 15:35:19 +02:00
Javier Segarra	dc93d1d394	Merge branch 'dev' into update_vitest_version	2025-04-07 15:35:14 +02:00
Javier Segarra	1fc9dc1ca6	Merge branch 'dev' into fix_itemFilter_multiLine	2025-04-07 13:27:30 +00:00
Alex Moreno	2d129dde01	fix: enable Jenkins find changes	2025-04-07 14:14:22 +02:00
Alex Moreno	d142797b1f	fix: update Jenkinsfile to remove unused module retrieval and modify cypressParallel.sh invocation	2025-04-07 14:03:43 +02:00
Alex Moreno	2b5802a7fb	fix: update cypressParallel.sh invocation to use an empty string for modules	2025-04-07 14:01:51 +02:00
Alex Moreno	3549f172d6	fix: pass modules as argument to cypressParallel.sh in Jenkinsfile	2025-04-07 14:01:37 +02:00
Jon Elias	b782da7a8d	Merge branch 'dev' into 8363-RefactorItemFixedPrice	2025-04-07 11:47:04 +00:00
Alex Moreno	d6363e4b45	fix: temporal fix	2025-04-07 13:36:43 +02:00
Alex Moreno	22f1373c84	fix: handle empty changes in getChangedModules function	2025-04-07 13:31:52 +02:00
Jon Elias	7cc06adeef	Merge branch 'dev' into 8363-RefactorItemFixedPrice	2025-04-07 11:23:45 +00:00
Jon Elias	11994b80b0	refactor: refs #8363 requested changes	2025-04-07 13:20:00 +02:00
Alex Moreno	488d48e9e9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-04-07 13:13:58 +02:00
Alex Moreno	642589d054	Merge pull request 'ci: refs #8698 Jenkins changeset' (!1525) from 8698_jenkins_e2e_onlyChanges into dev ... Reviewed-on: #1525 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-04-07 11:13:38 +00:00
Alex Moreno	3fd3fef647	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-04-07 13:12:54 +02:00
Alex Moreno	582c7c8d40	Merge branch 'dev' into 8698_jenkins_e2e_onlyChanges	2025-04-07 10:47:24 +00:00
Alex Moreno	5edf3f7efe	fix: skip invoice transfer test in InvoiceOut summary	2025-04-07 12:34:48 +02:00
Javier Segarra	d55ec1c738	Merge branch 'dev' into fix_itemFilter_multiLine	2025-04-07 10:28:05 +00:00
Javier Segarra	e8a3dc05dd	fix: customer insurance grade	2025-04-07 12:25:16 +02:00