16018 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	0f66e56390	Merge pull request 'refs #5639 smart-tabla defaulter' (!1550) from 5639-seccionesFormaPagoYPais(MOROSOS) into dev ... Reviewed-on: #1550 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-24 07:04:50 +00:00
Carlos Satorres	6cf2c38927	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-24 06:59:04 +00:00
Vicent Llopis	e43e0a8f9f	Merge pull request '5609-ticket.index_searchByFilter' (!1554) from 5609-ticket.index_searchByFilter into dev ... Reviewed-on: #1554 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-05-24 06:39:46 +00:00
Carlos Satorres	bb39724718	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-05-24 08:09:44 +02:00
Carlos Satorres	e46caffe96	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-24 06:05:44 +00:00
Alex Moreno	a1bd051112	Merge branch 'dev' into salix-node20	2023-05-24 05:52:49 +00:00
Vicent Llopis	3caef0c135	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas	2023-05-24 07:46:08 +02:00
Vicent Llopis	1ddad7a5ec	Merge branch 'dev' into 5609-ticket.index_searchByFilter	2023-05-24 05:45:04 +00:00
Alex Moreno	6a6d28efa0	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-24 05:40:11 +00:00
Vicent Llopis	68c33efd9a	refs #5609 fix: front test	2023-05-24 07:33:01 +02:00
Alexandre Riera	b2f4c02b95	Merge pull request 'fixes #5581 ticket.sale transferir lineas' (!1549) from 5581-transferir-lineas into dev ... Reviewed-on: #1549 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-24 05:17:26 +00:00
Alexandre Riera	97653d9b8f	Merge branch 'dev' into 5581-transferir-lineas	2023-05-24 05:07:33 +00:00
Vicent Llopis	3119ae4471	refs #5609 delete: console.log	2023-05-23 15:12:20 +02:00
Carlos Satorres	0dda7791f6	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-23 12:51:10 +00:00
Carlos Satorres	31b22b759d	refs #5639 fix e2e selectors	2023-05-23 14:50:16 +02:00
Alex Moreno	eba945c297	Merge branch 'salix-node20' of https://gitea.verdnatura.es/verdnatura/salix into salix-node20	2023-05-23 14:43:16 +02:00
Alex Moreno	fe8ad91514	fix node 20	2023-05-23 14:43:15 +02:00
Carlos Satorres	af1f92613f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-05-23 13:57:11 +02:00
Vicent Llopis	0ab411ddc4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter	2023-05-23 13:45:03 +02:00
Carlos Satorres	2d06f42493	refs #5639 defaulterView	2023-05-23 13:33:06 +02:00
Alex Moreno	f0b3177e21	Merge branch 'dev' into salix-node20	2023-05-23 11:32:03 +00:00
Alex Moreno	9a5511f083	REFACTOR(node_version)! update to v20	2023-05-23 13:31:09 +02:00
Carlos Satorres	4f5bd95d21	refs #5639 order	2023-05-23 13:23:46 +02:00
Carlos Satorres	e2bea16e68	refs #5639 select country, paymethod	2023-05-23 12:31:02 +02:00
Carlos Satorres	db7d3b6868	refs #5639 payMethodFk	2023-05-23 11:32:26 +02:00
Carlos Satorres	7fd2927ec9	refs #5639 smart-table country	2023-05-23 11:26:31 +02:00
Carlos Satorres	766d809523	Merge pull request 'refs #5599 remove returns' (!1511) from 5599-ticketColors into dev ... Reviewed-on: #1511 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-23 08:23:55 +00:00
Carlos Satorres	84abba5566	Merge branch 'dev' into 5599-ticketColors	2023-05-23 07:38:01 +00:00
Alex Moreno	64fbd5d2c7	Merge pull request 'refs #5579 fix(route_index): order' (!1551) from 5579-fix-order into dev ... Reviewed-on: #1551	2023-05-23 07:28:21 +00:00
Alexandre Riera	73c2ae9fdc	refs #5581 changelog	2023-05-23 09:17:37 +02:00
Alex Moreno	9500e99b86	Merge branch 'dev' into 5579-fix-order	2023-05-23 07:17:25 +00:00
Alex Moreno	53e55de605	refs #5579 fix(route_index): order	2023-05-23 09:15:31 +02:00
Carlos Satorres	d7d94796d6	Merge branch 'dev' into 5599-ticketColors	2023-05-23 07:13:47 +00:00
Carlos Satorres	0c673e43bc	refs #5639 smart-tabla defaulter	2023-05-23 09:02:05 +02:00
Carlos Satorres	ec1a203430	Merge pull request 'refs #5648 create vn-confirm' (!1508) from 5648-sureClaim into dev ... Reviewed-on: #1508 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-23 07:00:13 +00:00
Alexandre Riera	bf8d82f3c6	refs #5581 refresh model	2023-05-23 08:43:31 +02:00
Alex Moreno	dc244b5567	refs #5488 remove State_seeFilteredEditableStates	2023-05-23 08:23:52 +02:00
Carlos Satorres	ee8685329f	Merge branch 'dev' into 5599-ticketColors	2023-05-23 06:23:19 +00:00
Alex Moreno	6f503e2a81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-23 08:23:16 +02:00
Carlos Satorres	8ee581eb67	Merge branch 'dev' into 5648-sureClaim	2023-05-23 06:02:17 +00:00
Alexandre Riera	b9f6dc0a39	Merge branch 'dev' into 5581-transferir-lineas	2023-05-23 05:54:12 +00:00
Alex Moreno	6f0c3eeb29	Merge pull request 'refs #5094 fix get email' (!1548) from 5094-fix_email into test ... Reviewed-on: #1548 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-23 05:53:29 +00:00
Alexandre Riera	0e11bfab0b	refs #5581 ticketId != id	2023-05-23 07:53:25 +02:00
Alex Moreno	0045edb698	refs #5094 fix get email	2023-05-23 07:39:43 +02:00
Juan Ferrer	da0aa57539	Merge branch 'test' into dev	2023-05-22 19:06:20 +02:00
Juan Ferrer	26c2ab867d	Merge pull request 'master into test' (!1546) from master into test ... Reviewed-on: #1546	2023-05-22 17:04:32 +00:00
Alex Moreno	f030ecd2a7	Merge pull request '5579-db-export' (!1526) from 5579-db-export into dev ... Reviewed-on: #1526 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-22 14:44:37 +00:00
Carlos Satorres	71ba45c580	Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim	2023-05-22 15:56:16 +02:00
Carlos Satorres	3994e65040	refs #5648 spaces fix2	2023-05-22 15:56:14 +02:00
Carlos Satorres	a7c59f51b9	Merge branch 'dev' into 5599-ticketColors	2023-05-22 13:51:35 +00:00