16027 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	1dcce0f3ee	Merge pull request 'hotFix(reset-passowrd): use model vnUser' (!1523) from hotFix_vnUser_reset-password into master ... Reviewed-on: #1523 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-05-16 07:01:44 +00:00
Alex Moreno	504791fd6d	typo	2023-05-16 08:48:25 +02:00
Alex Moreno	a1a3f910d3	hotFix(reset-passowrd): use model vnUser	2023-05-16 08:46:16 +02:00
Alex Moreno	3e33030b1d	refs #5579 update mariadb version to 10.7.6	2023-05-15 15:16:22 +02:00
Vicent Llopis	6300ee4be4	refs #5600 foto de los trabajadores cuadrada	2023-05-15 14:24:31 +02:00
Alex Moreno	08fcbebbaf	refs #5488 polish specifics acls	2023-05-15 14:14:08 +02:00
Vicent Llopis	9ce3e79e00	refs #5594 eliminado archivo ducplicado	2023-05-15 11:50:51 +02:00
Vicent Llopis	d5f5115980	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice	2023-05-15 11:50:09 +02:00
Alex Moreno	7d589d5101	Merge pull request 'hotFix(worker_new): use postcode not postalCode' (!1520) from hotFix_worker_new_postcode into master ... Reviewed-on: #1520 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-15 08:12:29 +00:00
Alex Moreno	0aa12a5efb	hotFix(worker_new): use postcode not postalCode	2023-05-15 09:54:40 +02:00
Alex Moreno	248caf8519	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-15 07:20:53 +02:00
Alex Moreno	ea6837e33a	refs #5579 export structure and data	2023-05-12 13:07:24 +02:00
Pablo Natek	8419c76b12	refs #5153 worker sin tr	2023-05-12 12:51:07 +02:00
Carlos Satorres	ece2875b38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket	2023-05-12 12:30:34 +02:00
Juan Ferrer	4abc8521d3	refs #5517 Style fixes	2023-05-12 11:25:16 +02:00
Carlos Satorres	9cbf3006a0	refs #5599 futureState	2023-05-12 11:17:51 +02:00
Carlos Satorres	943e8b09c1	refs #5599 DELIMITER	2023-05-12 11:15:47 +02:00
Juan Ferrer	f6e1ffa849	refs #5517 Log loader fix	2023-05-12 09:48:22 +02:00
Alexandre Riera	b9ec6b93b6	Merge branch 'dev' into 5655-afinar-login	2023-05-12 07:46:10 +00:00
Alex Moreno	598fe7ac0d	Merge pull request '231801_test_to_master' (!1519) from 231801_test_to_master into master ... Reviewed-on: #1519 Reviewed-by: Vicent Llopis <vicent@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-12 06:29:54 +00:00
Pablo Natek	65082be077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr	2023-05-12 08:28:19 +02:00
Carlos Satorres	0dea1dfd9e	Merge branch 'dev'	2023-05-11 15:52:35 +02:00
Carlos Satorres	fd85cd2d98	refs #5599 replace	2023-05-11 15:48:31 +02:00
Alex Moreno	1d6a541b02	test into master	2023-05-11 15:07:02 +02:00
Alex Moreno	30e71a9d5e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 231801_test_to_master	2023-05-11 15:06:50 +02:00
Carlos Satorres	f53eef0455	Merge pull request 'refs move reports views' (!1518) from footnotesSolve into test ... Reviewed-on: #1518 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-11 12:50:27 +00:00
Alex Moreno	5924a557e9	Merge branch 'test' into footnotesSolve	2023-05-11 12:16:17 +00:00
Carlos Satorres	35b6642095	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors	2023-05-11 14:15:30 +02:00
Javi Gallego	8a843b37bd	refs #5160 Back test timeout workaround	2023-05-11 13:54:42 +02:00
Juan Ferrer	d0c8be5697	refs #5517, #5667 Fix crudModel status, log fixes	2023-05-11 12:07:14 +02:00
Carlos Satorres	43ab07d954	refs move reports views	2023-05-11 11:57:13 +02:00
Vicent Llopis	2ed99426ef	eliminado focus	2023-05-11 10:18:02 +02:00
Vicent Llopis	90b844062d	refs #5327 add frontTest	2023-05-11 10:17:41 +02:00
Vicent Llopis	59f4b63db7	borrado espacio	2023-05-11 10:04:59 +02:00
Vicent Llopis	a7fcd8a1bf	changes	2023-05-11 10:04:15 +02:00
Vicent Llopis	f00643505d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas	2023-05-11 10:03:07 +02:00
Vicent Llopis	8ed17d99c3	refs #5327 permite filtrar por columnas (desde el front)	2023-05-11 10:02:45 +02:00
Alexandre Riera	7bcb00c127	refs #5655 removed relation	2023-05-11 08:55:11 +02:00
Alex Moreno	4818e985ff	Merge pull request 'master to test' (!1515) from 231801_master_to_test into test ... Reviewed-on: #1515 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-05-11 06:19:32 +00:00
Alex Moreno	7704256079	master to test	2023-05-11 08:00:49 +02:00
Carlos Satorres	43a91194fd	refs #5599 remove e2e	2023-05-10 15:59:29 +02:00
Carlos Satorres	2111ca0993	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors	2023-05-10 14:49:37 +02:00
Carlos Satorres	e258e779b3	refs #5599 ticketFuture	2023-05-10 14:49:19 +02:00
Carlos Satorres	9a813c075c	refs #5599 procedure y colorClass	2023-05-10 14:43:08 +02:00
Alex Moreno	a345265a89	refs #5488 specifics acls	2023-05-10 14:09:06 +02:00
Carlos Satorres	c59915f951	refs #5599 procedure	2023-05-10 13:55:36 +02:00
Alex Moreno	29e0562c8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-10 13:33:52 +02:00
Alex Moreno	1654cc410a	Merge pull request 'test_to_dev' (!1513) from test_to_dev into dev ... Reviewed-on: #1513 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-10 10:41:11 +00:00
Alex Moreno	49e2c38ddd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_to_dev	2023-05-10 12:30:56 +02:00
Carlos Satorres	f4be69c85c	refs #5599 select state.classColor	2023-05-10 11:55:56 +02:00