7289 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	85aeda337f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7229-fixDownloadFile	2024-11-19 15:49:45 +01:00
Jorge Penadés	8e9e8a8c78	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8166-fixAdvanceTickets	2024-11-19 15:46:05 +01:00
Jorge Penadés	73b7fa7704	feat: refs #8166 show notification	2024-11-19 15:43:55 +01:00
Jorge Penadés	e54eb50265	fix: refs #8166 show zone error	2024-11-19 15:35:57 +01:00
Javier Segarra	e6f8b87890	Merge branch 'test' into fix_test_jsegarra	2024-11-19 15:05:39 +01:00
Alex Moreno	a498e1178f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-19 14:50:14 +01:00
Alex Moreno	fdafeee39d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-19 14:49:22 +01:00
Javier Segarra	8fb843a180	Merge pull request 'feat: add /reports in gitignore' (!970) from warmFix_reports_in_gitignore into test ... Reviewed-on: #970 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-19 13:42:47 +00:00
Alex Moreno	7b243a470c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-19 14:41:47 +01:00
Alex Moreno	5f7fd91272	feat: add /reports in gitignore	2024-11-19 14:41:07 +01:00
Alex Moreno	38c2f89fba	Merge pull request 'fix(VnSelect): setOptions when applyFilter' (!969) from warmFix_vnSelect into test ... Reviewed-on: #969 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-19 13:40:21 +00:00
Alex Moreno	14e6b870ac	Merge branch 'test' into warmFix_vnSelect	2024-11-19 13:29:15 +00:00
Alex Moreno	8714980595	fix(VnSelect): setOptions when applyFilter	2024-11-19 14:28:43 +01:00
Jon Elias	bdae26ba08	Merge pull request 'Warmfix: worker test e2e' (!968) from Fix-WorkerCreateE2E into test ... Reviewed-on: #968 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-19 13:19:20 +00:00
Jon Elias	1b68d3c5ea	Merge branch 'test' into Fix-WorkerCreateE2E	2024-11-19 13:16:41 +00:00
Jon Elias	f43e974bbc	fix: worker test e2e	2024-11-19 14:14:50 +01:00
Carlos Andrés	5da6e9b2ca	Merge branch 'dev' of https: refs #8087//gitea.verdnatura.es/verdnatura/salix-front into 8087-nuevosCamposTravel	2024-11-19 14:04:13 +01:00
Pablo Natek	fb5e38dc0b	Merge branch 'dev' into 8138-add-component-ticketProblems	2024-11-19 12:54:49 +00:00
Pablo Natek	479c428edf	Merge branch '8138-add-component-ticketProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into 8138-add-component-ticketProblems	2024-11-19 13:51:23 +01:00
Pablo Natek	3824f5d124	fix: refs #8138 move component from ui folder	2024-11-19 13:51:19 +01:00
Javier Segarra	65100fcf25	test: fix e2e	2024-11-19 13:45:44 +01:00
Jorge Penadés	794036b880	Merge pull request '#7323 warmfix-addRemainingFields' (!965) from 7323-warfix-addRemainingFields into test ... Reviewed-on: #965 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-19 12:37:28 +00:00
Javier Segarra	5515f55bf6	test: fix e2e	2024-11-19 12:51:05 +01:00
Jon Elias	98017df57d	fix: refs #8038 solve conflicts	2024-11-19 12:25:15 +01:00
Jon Elias	7cef1d11be	Merge branch '8038-ImproveAndCorrectVnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 8038-ImproveAndCorrectVnTable	2024-11-19 12:22:17 +01:00
Jon Elias	cf6695f7ff	Merge branch 'dev' of https: refs #8038//gitea.verdnatura.es/verdnatura/salix-front into 8038-ImproveAndCorrectVnTable	2024-11-19 12:22:15 +01:00
Robert Ferrús	ff272ab6c3	Merge pull request 'fix(Supplier): change isSerious to isReal' (!966) from hotFix_supplier_isReal into master ... Reviewed-on: #966 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-19 11:07:15 +00:00
Robert Ferrús	8a1db719e3	fix(Supplier): change isSerious to isReal	2024-11-19 11:58:16 +01:00
Jorge Penadés	1faab668b1	fix: refs #7323 show advanced fields	2024-11-19 11:53:33 +01:00
Jorge Penadés	38ccf464b7	fix: refs #7323 locale #7396	2024-11-19 11:52:00 +01:00
Carlos Andrés	8c20b8736b	feat: refs #8087 refs#8087 Redadas en travel	2024-11-19 11:10:37 +01:00
Jon Elias	5acce4d61d	Merge branch 'dev' into 6999-AddTabToFilter	2024-11-19 09:21:10 +00:00
Alex Moreno	19cb781800	Merge pull request '#8036 - arrayData_exprBuilder_after' (!845) from 8036-arrayData_exprBuilder_after into dev ... Reviewed-on: #845 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-19 09:03:49 +00:00
Alex Moreno	88d2384c35	Merge branch 'dev' of https: refs #8036//gitea.verdnatura.es/verdnatura/salix-front into 8036-arrayData_exprBuilder_after	2024-11-19 10:00:20 +01:00
Alex Moreno	bbb20ec4e6	Merge pull request 'fix(VnPaginate): disable pagination' (!964) from hotFix_disable_pagination into master ... Reviewed-on: #964 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-19 08:48:52 +00:00
Alex Moreno	5d58bb0c13	fix(VnPaginate): disable pagination	2024-11-19 09:47:59 +01:00
Alex Moreno	e7b431e9ec	fix(VnPaginate): disable pagination	2024-11-19 09:32:35 +01:00
Alex Moreno	a14cc29fc4	build: change package version	2024-11-19 09:12:43 +01:00
Alex Moreno	a43c28cb57	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-19 09:11:52 +01:00
Alex Moreno	b26028c6a5	Merge pull request '8144-devToTest_2448' (!963) from 8144-devToTest_2448 into test ... Reviewed-on: #963 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-19 07:54:41 +00:00
Javi Gallego	9c271eee08	Merge pull request '#7346 manualInvoice' (!793) from 7346-manualInvoice into dev ... Reviewed-on: #793 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-19 07:10:06 +00:00
Pablo Natek	6ab31fa2d2	Merge branch 'dev' into 8138-add-component-ticketProblems	2024-11-19 07:02:32 +00:00
Alex Moreno	8d997b5a7a	build: refs #8144 change package version	2024-11-19 07:59:48 +01:00
Pablo Natek	f999760205	fix: refs #8138 sme minor issues	2024-11-19 07:59:45 +01:00
Pablo Natek	e119bf5bfc	feat: refs #8138 add component ticket problems	2024-11-19 07:59:14 +01:00
Alex Moreno	afaf2df2ee	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-19 07:56:04 +01:00
Alex Moreno	43f58d3dba	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-19 07:48:02 +01:00
Javi Gallego	7d2f4bcf44	Merge branch 'dev' into 7346-manualInvoice	2024-11-18 15:46:08 +01:00
Alex Moreno	c2db7be8cd	fix(orderCatalogFilter): fix searchByTag	2024-11-18 15:06:09 +01:00
William Buezas	28bfda869a	refactor: refs #8162 remove comment	2024-11-18 10:47:57 -03:00