10906 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	c67ae3e17e	Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" ... This reverts commit 223a1ea449.	2025-02-25 09:53:02 +01:00
Alex Moreno	f2eedce55f	fix: merge test to dev	2025-02-25 08:01:10 +01:00
Alex Moreno	c89178e6a5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-25 07:23:18 +01:00
Javier Segarra	223a1ea449	revert 1015acefb7 ... revert Merge branch 'test' into master	2025-02-24 15:52:21 +00:00
Javier Segarra	1015acefb7	Merge branch 'test' into master	2025-02-24 15:21:32 +00:00
Javier Segarra	3e5180a6c6	Merge pull request 'fix: check type variable' (!1486) from hotfix_mana_showproxy into master ... Reviewed-on: #1486 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-24 15:18:25 +00:00
Javier Segarra	dbcace84f6	Merge branch 'master' into hotfix_mana_showproxy	2025-02-24 16:09:46 +01:00
Javier Segarra	ab5ae580b3	fix: check type variable	2025-02-24 16:08:40 +01:00
Javier Segarra	7096d6fb81	Merge pull request 'HOTFIX: check type variable' (!1485) from hotfix_mana_edit into master ... Reviewed-on: #1485 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-24 14:33:12 +00:00
Javier Segarra	3a9a9bd517	fix: check type variable	2025-02-24 15:30:30 +01:00
Alex Moreno	566e4f0e13	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-24 14:39:07 +01:00
Alex Moreno	04f657bc04	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-24 14:38:41 +01:00
Pablo Natek	6954cd599a	Merge pull request 'feat: enhance item tags with data attributes for improved testing' (!1471) from hotFixItemTags into master ... Reviewed-on: #1471 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-24 13:10:39 +00:00
Pablo Natek	3345c59ca7	Merge branch 'master' into hotFixItemTags	2025-02-24 12:50:38 +00:00
Javi Gallego	edb7d6f7ed	Merge pull request '7937-claimAgile' (!1369) from 7937-claimAgile into dev ... Reviewed-on: #1369 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-24 12:44:19 +00:00
Jorge Penadés	498c351c51	Merge pull request 'refactor: refs #8372 update FormModelPopup to use props for save and continue logic' (!1477) from 8372-warmfix-saveAndContinue into test ... Reviewed-on: #1477 Reviewed-by: Pablo Natek <pablone@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-24 12:37:44 +00:00
Javi Gallego	45def7f953	fix: refs #7937 update claimId in ClaimAction test to reflect correct value	2025-02-24 13:27:55 +01:00
Jorge Penadés	659d87020f	refactor: refs #8372 update FormModelPopup to enhance save and continue logic with state management	2025-02-24 13:20:59 +01:00
Javi Gallego	6ddbce368f	Merge branch 'dev' into 7937-claimAgile	2025-02-24 12:32:11 +01:00
Pablo Natek	f465b8219e	Merge pull request 'test: refs #6897 enable 'Create entry, modify travel and add buys' test case' (!1470) from 6897-fixEntryE2e into dev ... Reviewed-on: #1470 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-24 11:17:21 +00:00
Jorge Penadés	fbce97dd01	chore: refs #8372 rollback	2025-02-24 11:44:00 +01:00
Jorge Penadés	b26db960be	refactor: refs #8372 prueba	2025-02-24 11:43:29 +01:00
Jorge Penadés	f551e1a14a	refactor: refs #8372 simplify cancel btn click	2025-02-24 11:06:20 +01:00
Jorge Penadés	09b613cac1	refactor: refs #8372 update FormModelPopup to use props for save and continue logic	2025-02-24 11:03:14 +01:00
Jorge Penadés	30532c9eab	Merge pull request 'fix: refs #6919 update customer data retrieval to use useArrayData for improved reactivity' (!1474) from 6919-warmfix-getCustomer into test ... Reviewed-on: #1474 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-24 09:15:13 +00:00
Jorge Penadés	5e8ad9df11	feat: refs #6919 add useArrayData import to CustomerSamplesCreate for improved data handling	2025-02-24 10:13:09 +01:00
Jorge Penadés	1e9e5e647d	fix: refs #6919 update customer data retrieval to use useArrayData for improved reactivity	2025-02-24 10:05:13 +01:00
Carlos Satorres	98bde3bbbb	Merge pull request 'fix: hotfix filters' (!1472) from hotfix-CutomerListFilter into master ... Reviewed-on: #1472 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-24 07:30:50 +00:00
Carlos Satorres	3b5c4731f0	fix: hotfix filters	2025-02-24 08:20:04 +01:00
Pablo Natek	24b4d0071a	feat: enhance item tags with data attributes for improved testing	2025-02-23 12:57:57 +01:00
Pablo Natek	92e663497b	refactor: refs #6897 clean up Cypress configuration and improve entry list filtering	2025-02-23 11:33:50 +01:00
Pablo Natek	fe695af9ab	test: refs #6897 enable 'Create entry, modify travel and add buys' test case	2025-02-23 07:04:02 +01:00
Javi Gallego	039a7ff421	Merge branch '7937-claimAgile' of https://gitea.verdnatura.es/verdnatura/salix-front into 7937-claimAgile	2025-02-21 14:59:37 +01:00
Javi Gallego	a7b202527f	Merge branch 'dev' into 7937-claimAgile	2025-02-21 14:59:32 +01:00
Javier Segarra	c7b753a4ef	Merge pull request 'Add mapper fn beforeSave' (!1368) from formModel_mapper into dev ... Reviewed-on: #1368 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-21 13:35:01 +00:00
Alex Moreno	f494021dc8	Merge branch 'dev' into formModel_mapper	2025-02-21 13:18:52 +00:00
Alex Moreno	7de471a666	Merge branch 'dev' into 7937-claimAgile	2025-02-21 13:16:57 +00:00
Alex Moreno	3e2d7fad61	Merge pull request '6695-docker_push_3' (!1423) from 6695-docker_push_3 into dev ... Reviewed-on: #1423 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-21 12:41:36 +00:00
Alex Moreno	f71a83d587	Merge branch '6695-docker_push_3' of https://gitea.verdnatura.es/verdnatura/salix-front into 6695-docker_push_3	2025-02-21 13:23:32 +01:00
Alex Moreno	4da25bb564	ci: refs #6695 skip intermitent e2e	2025-02-21 13:23:31 +01:00
Alex Moreno	e0362801db	Merge branch 'dev' into 6695-docker_push_3	2025-02-21 12:09:49 +00:00
Alex Moreno	1a14440850	ci: refs #6695 skip intermitent e2e	2025-02-21 13:09:31 +01:00
Javi Gallego	dafd30f480	Merge branch 'dev' into 7937-claimAgile	2025-02-21 12:58:36 +01:00
Alex Moreno	ade49b2bb0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-21 12:57:43 +01:00
Alex Moreno	deaeee07e0	Merge branch 'dev' into 6695-docker_push_3	2025-02-21 11:46:35 +00:00
Jon Elias	15a1098506	Merge pull request '#8599: Modified tests to be more complete and added new ones' (!1409) from 8599-ModifyAndCreateInvoiceOutTests into dev ... Reviewed-on: #1409 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-21 11:36:47 +00:00
Juan Ferrer	088fd0b710	ci: refs #6695 cypress junit file renamed, e2e focus removed	2025-02-21 12:20:05 +01:00
Juan Ferrer	de9f3f32fd	ci: refs #6695 vitest junit file fix	2025-02-21 12:17:05 +01:00
Juan Ferrer	1a137f5f3d	ci: refs #6695 CI env var moved to test stage	2025-02-21 12:12:18 +01:00
Javier Segarra	8c69e5c937	Merge pull request 'HOTFIX: shipped columnFilter' (!1463) from hotfix_ticket_shipped into master ... Reviewed-on: #1463 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-02-21 11:02:43 +00:00