7149 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
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
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
Alex Moreno	8d997b5a7a	build: refs #8144 change package version	2024-11-19 07:59:48 +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	00fdbfa2e4	fix(OrderCatalogFilter): hotFix use search-url="params"	2024-11-18 13:41:54 +01:00
Alex Moreno	8f526798f9	Merge pull request 'fix: hotfix OrderTickets' (!960) from hotfix-orderTickets into master ... Reviewed-on: #960 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-18 12:31:06 +00:00
Alex Moreno	f3ca51aab4	Merge branch 'master' into hotfix-orderTickets	2024-11-18 12:30:22 +00:00
Carlos Satorres	d3993442b6	fix: hotfix OrderTickets	2024-11-18 13:26:27 +01:00
Jon Elias	3c5472ad4a	Merge pull request 'Fix: changed route.query' (!959) from Fix-OrderCatalogCategoryFilter into dev ... Reviewed-on: #959 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-18 11:28:25 +00:00
Jon Elias	0c0b9ca648	fix: changed route.query	2024-11-18 12:27:07 +01:00
Alex Moreno	dd490888cf	merge test in dev	2024-11-18 11:23:36 +01:00
Alex Moreno	09be2d4d41	Merge pull request 'solveConflicts_test_to_dev' (!957) from solveConflicts_test_to_dev into dev ... Reviewed-on: #957 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-18 10:21:50 +00:00
Alex Moreno	1e7f2b3f4d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-18 11:14:29 +01:00
Alex Moreno	009a6b09d6	Merge pull request 'feat(TicketSummary): add ticketDescritporMenu' (!956) from hotFix_ticketSummary_add_ticketDescriptorMenu into master ... Reviewed-on: #956 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-18 10:11:42 +00:00
Alex Moreno	5b4299114b	Merge branch 'master' into hotFix_ticketSummary_add_ticketDescriptorMenu	2024-11-18 10:00:54 +00:00
Javier Segarra	5ab28c13d0	Merge pull request 'HOTFIX: CustomerSummary BalanceDue' (!955) from hotFix_customerSumamry_balanceDue into master ... Reviewed-on: #955 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-18 10:00:08 +00:00
Javier Segarra	f52095a2fc	Merge branch 'test' into solveConflicts_test_to_dev	2024-11-18 10:57:49 +01:00
Alex Moreno	383f51c1b2	refactor(TicketDescritporMenu): url isEditable	2024-11-18 10:57:26 +01:00
Javier Segarra	0c36d385ec	Merge branch 'test' into solveConflicts_test_to_dev	2024-11-18 10:50:42 +01:00
Alex Moreno	09aad5914f	feat(TicketSummary): add ticketDescritporMenu	2024-11-18 10:49:30 +01:00
Javier Segarra	9ea9239250	fix: customerSummary balanceDue label value	2024-11-18 10:41:25 +01:00
Alex Moreno	29239ef2cd	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-18 10:13:27 +01:00