7257 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	c6d0dbc318	Merge branch 'dev' into 8001-expeditionGrafana	2024-11-22 05:38:52 +00:00
Carlos Andrés	6c866e48a0	Merge branch 'test' into dev	2024-11-21 16:02:41 +01:00
Carlos Andrés	e04d77f55e	Merge pull request 'feat: refs#8087 Redadas en travel' (!984) from travelisRaidTest into test ... Reviewed-on: #984 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-21 14:56:09 +00:00
Carlos Andrés	5268140d8b	feat: refs#8087 Redadas en travel	2024-11-21 15:51:27 +01:00
Carlos Andrés	977512cae0	Merge pull request 'feat: refs #8087 refs#8087 Redadas en travel' (!908) from 8087-nuevosCamposTravel into dev ... Reviewed-on: #908 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 11:51:51 +00:00
Carlos Andrés	242bf6f318	Merge branch 'dev' into 8087-nuevosCamposTravel	2024-11-21 11:45:20 +00:00
Alex Moreno	fdc71a13ff	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-21 10:26:38 +01:00
Alex Moreno	bf0bda0e27	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-21 10:26:29 +01:00
Javier Segarra	3bc5c9bd6a	Merge pull request '#8162 - E2E Tickets' (!951) from wbuezas/salix-front-mindshore-fork2:8162-E2ETickets into dev ... Reviewed-on: #951 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-21 09:19:54 +00:00
Jon Elias	0cefe391cb	Merge pull request 'Hotfix: Show only the correct path of the search' (!954) from Hotfix-ZoneLocationsTree into master ... Reviewed-on: #954 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 09:15:45 +00:00
Jon Elias	747bc4af76	Merge branch 'master' into Hotfix-ZoneLocationsTree	2024-11-21 09:13:42 +00:00
Jon Elias	5ff95c2b93	fix: locations tree	2024-11-21 10:10:44 +01:00
Alex Moreno	0c3581f3dc	Merge pull request 'hotFix(orderCatalogFilter): fix searchByTag' (!961) from hotFix_orderCatalogFilter_values into master ... Reviewed-on: #961 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-21 09:09:51 +00:00
Javier Segarra	f36363dbd2	Merge pull request 'warmfix: ItemLastEntries to date' (!981) from warmfix_itemLastEntriesFilter into test ... Reviewed-on: #981 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-21 09:09:50 +00:00
Javier Segarra	e5434e7436	warmfix: ItemLastEntries to date	2024-11-21 09:08:52 +00:00
Javier Segarra	0434332ec4	Merge branch 'master' into hotFix_orderCatalogFilter_values	2024-11-21 08:27:13 +00:00
Javier Segarra	81d7b9f04f	Merge branch 'dev' into 8162-E2ETickets	2024-11-21 08:20:29 +00:00
Javier Segarra	6f324b44b8	Merge pull request 'WARMFIX: e2e jsegarra' (!973) from fix_js_e2e into test ... Reviewed-on: #973 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 08:20:21 +00:00
Javier Segarra	5a90434425	Merge branch 'test' into fix_js_e2e	2024-11-21 08:19:21 +00:00
Jon Elias	e943838dbe	Merge pull request '#8038 added new functionality in VnSelect and refactored styles' (!871) from 8038-ImproveAndCorrectVnTable into dev ... Reviewed-on: #871 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 07:08:13 +00:00
Jon Elias	4d8d56eb6e	Merge branch 'dev' into 8038-ImproveAndCorrectVnTable	2024-11-21 07:05:59 +00:00
Alex Moreno	9e41459da4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-21 07:59:53 +01:00
Alex Moreno	6b8470d6e1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-21 07:59:42 +01:00
Javier Segarra	350c28eef0	Merge pull request 'HOTfix: use id instead description to open InvoiceOutDescriptor' (!980) from hotFix_customer_balance_email into master ... Reviewed-on: #980	2024-11-21 06:52:01 +00:00
Alex Moreno	44f2ecca28	chore: requested changes	2024-11-21 07:49:10 +01:00
Alex Moreno	c5acde22a3	chore: requested changes	2024-11-21 07:42:00 +01:00
Alex Moreno	c1e06325d3	Merge pull request '#7874 show name' (!978) from 7874-warmfix-useName into test ... Reviewed-on: #978 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 06:04:47 +00:00
William Buezas	8e411125bf	test: refs #8162 more tests and change data-testid for data-cy	2024-11-20 18:58:08 -03:00
Javier Segarra	3b5d385d22	fix: use id instead description to open InvoiceOutDescriptor	2024-11-20 22:43:04 +01:00
Carlos Andrés	087ec5f39f	Merge branch 'dev' into 8087-nuevosCamposTravel	2024-11-20 18:06:04 +00:00
Jorge Penadés	7039b68bba	fix: refs #7874 show name	2024-11-20 17:23:40 +01:00
Javi Gallego	bc173d9f6a	fix: removed selectedClient	2024-11-20 15:35:37 +01:00
Carlos Andrés	c21785b1f6	Merge branch '8087-nuevosCamposTravel' of https://gitea.verdnatura.es/verdnatura/salix-front into 8087-nuevosCamposTravel	2024-11-20 14:29:56 +01:00
Carlos Andrés	16133faca7	feat: refs #8087 refs#8087 Redadas en travel	2024-11-20 14:29:53 +01:00
Alex Moreno	42d24359cd	Merge branch 'master' into hotFix_orderCatalogFilter_values	2024-11-20 12:40:39 +00:00
Alex Moreno	abd79283ff	fix(CatalogFilterValueDialog): from dev and fix	2024-11-20 13:38:22 +01:00
Javi Gallego	2a1cc49499	fix: ticketDescriptor	2024-11-20 13:15:40 +01:00
Carlos Andrés	317e9ad034	Merge branch 'dev' into 8087-nuevosCamposTravel	2024-11-20 12:14:50 +00:00
Javier Segarra	d6aedad38e	perf: use const in VnLocation	2024-11-20 10:07:03 +01:00
Javier Segarra	deb6467af8	feat: remove comments	2024-11-20 10:05:10 +01:00
Javier Segarra	9da0488184	feat: remove comments	2024-11-20 10:03:23 +01:00
Carlos Satorres	093e6cb0e8	Merge pull request 'fix: fix create bankEntity' (!976) from hotfix-createBankEntity into master ... Reviewed-on: #976 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-20 09:02:01 +00:00
Carlos Satorres	131cd2de8c	fix: options	2024-11-20 09:53:52 +01:00
Carlos Satorres	2d5d1c549b	Merge branch 'hotfix-createBankEntity' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-createBankEntity	2024-11-20 09:52:14 +01:00
Carlos Satorres	c59baf9cf5	fix: fix code	2024-11-20 09:52:11 +01:00
Javier Segarra	226f604f9d	test: #8162 fix vnLocation spec	2024-11-20 09:37:47 +01:00
Alex Moreno	51beef3cbe	Merge branch 'master' into hotfix-createBankEntity	2024-11-20 08:27:58 +00:00
Javier Segarra	e10ee5e6c7	test: #8162 fix vnLocation spec	2024-11-20 09:26:40 +01:00
Alex Moreno	32fdc836f9	fix(OrderCatalogFilter): fix field value	2024-11-20 09:26:38 +01:00
Javier Segarra	1fb927488a	test: #8162 fix clientList spec	2024-11-20 09:26:33 +01:00