13485 Commits

All Branches

Search

Author	SHA1	Message	Date
Benjamin Esteve	803e62342a	Merge branch 'dev' into 8828-filterVnSelectWarehouses	2025-04-16 06:43:47 +00:00
Javier Segarra	55a0a53915	Merge pull request '#8582 - test: e2e monitorTicket' (!1391) from e2e_monitor into dev ... Reviewed-on: #1391 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-04-15 21:04:47 +00:00
Benjamin Esteve	690bfcb547	Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses	2025-04-15 14:03:00 +02:00
Benjamin Esteve	eb8ffc6e16	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses	2025-04-15 14:02:26 +02:00
Benjamin Esteve	48eb945b36	Merge branch 'dev' into 8828-filterVnSelectWarehouses	2025-04-15 11:56:38 +00:00
Pau Rovira	1a3e717620	Merge pull request 'feat: #8655 added button for scrolling up' (!1523) from 8655-scrollUpButton into dev ... Reviewed-on: #1523 Reviewed-by: Pablo Natek <pablone@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-15 11:26:06 +00:00
Benjamin Esteve	ca5576f0e1	Merge branch 'dev' into 8828-filterVnSelectWarehouses	2025-04-15 11:06:26 +00:00
Pau Rovira	5b3ef29294	Merge branch 'dev' into 8655-scrollUpButton	2025-04-15 09:55:59 +00:00
Guillermo Bonet	04e1f7a1b5	Merge branch 'test' into dev	2025-04-15 11:02:04 +02:00
Guillermo Bonet	a7ccc68ab7	Merge branch 'master' into test	2025-04-15 11:01:53 +02:00
Guillermo Bonet	917a7e8ecc	fix: i18n error	2025-04-15 11:01:40 +02:00
Jon Elias	4f7dcca917	Merge pull request 'fix: fixed dated when clicking an indefinetely/range event and delete when partial exclusion' (!1711) from Hotfix-ZoneExclusionDated into master ... Reviewed-on: #1711 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-15 08:54:42 +00:00
Jon Elias	63e7c55b7d	fix: fixed dated when clicking an indefinetely/range event and delete when partial exclusion	2025-04-15 10:32:12 +02:00
Benjamin Esteve	e32858374e	Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses	2025-04-15 10:31:27 +02:00
Benjamin Esteve	1a35c6e60b	Merge branch 'dev' of https: refs #8828//gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses	2025-04-15 10:31:25 +02:00
Jon Elias	e6e43ccfc4	Merge pull request 'Hotfix[ZoneEventInclusion]: Fixed event inclusion duplicateKey' (!1710) from Hotfix-ZoneInclusionDeleteEvent into master ... Reviewed-on: #1710 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-15 07:12:52 +00:00
Jon Elias	dcf6d3cad4	Merge branch 'master' into Hotfix-ZoneInclusionDeleteEvent	2025-04-15 06:49:23 +00:00
Jon Elias	0f7bb9cfe1	fix: fixed event inclusion duplicateKey because of props assignment in onMounted	2025-04-15 08:46:31 +02:00
Alex Moreno	e03e6b2305	build: init version	2025-04-15 08:30:03 +02:00
Pau Rovira	d171c7dd94	Merge pull request 'hotfix: fixed CustomerSamples table not loading correctly when reloading' (!1709) from hotfix_customerSamples into master ... Reviewed-on: #1709 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-04-15 06:16:35 +00:00
Alex Moreno	12fdf567c4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-04-15 07:25:22 +02:00
Pau Rovira	01ac0f2921	Merge branch 'master' into hotfix_customerSamples	2025-04-15 05:07:40 +00:00
Jon Elias	b524a6d8eb	Merge pull request 'Hotfix[ZoneEvents]: Fixed zone exclusion dated and fixed exclusion and inclusion when there was already an event' (!1708) from Hotfix-ZoneExclusionDatedValue into master ... Reviewed-on: #1708 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-14 14:38:09 +00:00
Jon Elias	9838342e27	Merge branch 'master' into Hotfix-ZoneExclusionDatedValue	2025-04-14 13:56:39 +00:00
Alex Moreno	be7c63150c	Merge pull request 'fix: add unremovableParams to VnFilterPanel for better filtering control' (!1705) from fix_ticketList_fromTo_unremovable into master ... Reviewed-on: #1705 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-04-14 13:16:11 +00:00
Alex Moreno	bbd07e71fa	Merge branch 'master' into fix_ticketList_fromTo_unremovable	2025-04-14 12:55:50 +00:00
Jon Elias	6692b499d2	Merge branch 'Hotfix-ZoneExclusionDatedValue' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneExclusionDatedValue	2025-04-14 14:34:08 +02:00
Jon Elias	78f1756edc	fix: dated name	2025-04-14 14:34:07 +02:00
Pau Rovira	9919352e8c	hotfix: fixed CustomerSamples table not loading correctly when reloading	2025-04-14 12:32:11 +00:00
Jon Elias	690d807ef1	Merge branch 'master' into Hotfix-ZoneExclusionDatedValue	2025-04-14 12:19:19 +00:00
Jon Elias	ff6d2a71bf	fix: fixed zone exclusion dated and fixed exclusion and inclusion when there was already an event	2025-04-14 13:44:53 +02:00
Javier Segarra	d399afcd89	Merge branch 'dev' into e2e_monitor	2025-04-14 10:39:54 +00:00
Jon Elias	7119cbbe89	Merge pull request 'Hotfix[ClientConsumption]: Fixed arrayData key' (!1706) from Hotfix-ClientConsumption into master ... Reviewed-on: #1706 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-04-14 09:19:00 +00:00
Benjamin Esteve	907afc84e4	Merge branch 'dev' into 8828-filterVnSelectWarehouses	2025-04-14 09:16:47 +00:00
Pau Rovira	2e8192ef7b	Merge branch 'dev' into 8655-scrollUpButton	2025-04-14 09:13:39 +00:00
Javier Segarra	dea2ddcd6c	test: skip test	2025-04-14 11:12:13 +02:00
Javier Segarra	b162dd7672	test: remove filter by column	2025-04-14 11:09:21 +02:00
Jon Elias	05311b8ffa	fix: skip failing test	2025-04-14 10:56:28 +02:00
Javier Segarra	d1440c1083	Merge branch 'dev' into e2e_monitor	2025-04-14 10:16:43 +02:00
Jon Elias	180153d8f0	fix: skip failing tests	2025-04-14 10:08:44 +02:00
Benjamin Esteve	220e2dccd6	Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses	2025-04-14 09:07:00 +02:00
Benjamin Esteve	8ea4163f05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses	2025-04-14 09:06:39 +02:00
Jon Elias	535bfa4347	fix: fixed arrayData key	2025-04-14 09:00:18 +02:00
Benjamin Esteve	7a05b8e768	Merge branch 'dev' into 8828-filterVnSelectWarehouses	2025-04-14 06:51:27 +00:00
Alex Moreno	6acd2e9e9f	fix: add unremovableParams to VnFilterPanel for better filtering control	2025-04-14 08:38:16 +02:00
Pau Rovira	3bcafc5734	Merge branch 'dev' of https: refs #8655//gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton	2025-04-14 07:19:15 +02:00
Pau Rovira	199a6c8cce	Merge pull request 'fix: fixed CustomerConsumption errors when changing customer & downloading pdf' (!1666) from fix-CustomerConsumption into dev ... Reviewed-on: #1666 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-04-14 05:17:46 +00:00
Pau Rovira	8309e2cddf	Merge branch 'dev' into fix-CustomerConsumption	2025-04-14 05:13:42 +00:00
Guillermo Bonet	8e45abd041	Merge pull request 'refactor: refs #8289 Delete guessPriority method' (!1704) from 8289-routeGuessPriority into dev ... Reviewed-on: #1704 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-04-14 05:02:24 +00:00
Guillermo Bonet	b50ad72155	refactor: refs #8289 Delete guessPriority method	2025-04-13 09:42:08 +02:00