7289 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	ed8c124bc7	fix: refs #8113 load map logic	2024-11-22 18:16:11 +01:00
Jorge Penadés	4d285499b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8113-preventDuplicateRecords	2024-11-22 15:59:57 +01:00
Alex Moreno	6276843613	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-22 12:40:27 +01:00
Alex Moreno	14d2ddfa83	fix: merge errors	2024-11-22 12:40:07 +01:00
Alex Moreno	ef426dc579	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-22 12:10:34 +01:00
Alex Moreno	4913cf2c29	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-22 12:10:04 +01:00
Javier Segarra	651b67e98f	Merge pull request 'fix: orderCatalogFilter and fix useArrayData' (!989) from hotFix_orderCatalogFilter_refactor_fix into master ... Reviewed-on: #989 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-22 10:24:18 +00:00
Alex Moreno	94361f18fa	Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix	2024-11-22 10:23:10 +00:00
Alex Moreno	142302193e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-22 11:21:33 +01:00
Alex Moreno	9d7f2b95e8	revert: VnVisibleColumn try catch	2024-11-22 11:21:08 +01:00
Alex Moreno	2db0369b74	fix: resetCategory	2024-11-22 11:05:48 +01:00
Alex Moreno	1709795cf9	Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix	2024-11-22 09:56:04 +00:00
Alex Moreno	26c1394321	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-22 10:52:51 +01:00
Alex Moreno	367f660508	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-22 10:52:30 +01:00
Alex Moreno	9019d4ff90	Merge pull request 'fix: remove all try catch(err) (error) console.error' (!988) from hotFix_tryCatch_badPractice into master ... Reviewed-on: #988 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-22 09:47:32 +00:00
Alex Moreno	522f32aa9a	fix: orderCatalogFilter and fix useArrayData	2024-11-22 10:40:49 +01:00
Jorge Penadés	55f9023201	Merge pull request '#7229 download file' (!833) from 7229-fixDownloadFile into dev ... Reviewed-on: #833 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-22 09:34:31 +00:00
Jorge Penadés	d1055ad572	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7229-fixDownloadFile	2024-11-22 10:24:52 +01:00
Jorge Penadés	683940cc24	fix: refs #8113 improve logic wip	2024-11-22 10:13:50 +01:00
Jorge Penadés	1df23b1b10	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8113-preventDuplicateRecords	2024-11-22 10:10:52 +01:00
Alex Moreno	bf29be1c5f	fix: remove all try catch(err) (error) console.error	2024-11-22 08:39:46 +01:00
Alex Moreno	8cbf40f465	fix(TicketSummary): observationTypes use .description	2024-11-22 07:45:49 +01:00
Alex Moreno	3b03f0dfee	fix(TicketNotes): observationTypes use .description	2024-11-22 07:43:59 +01: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
Carlos Satorres	69498cccf9	Merge pull request 'hotfix-clientAddress' (!983) from hotfix-clientAddress into master ... Reviewed-on: #983 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 09:28:38 +00:00
Carlos Satorres	518ed40c91	Merge branch 'master' into hotfix-clientAddress	2024-11-21 09:26:45 +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
Carlos Satorres	8a972507a4	fix: remove s	2024-11-21 10:20:42 +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
Carlos Satorres	837f42d21f	fix: provinceName	2024-11-21 10:18:25 +01: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