16753 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alexandre Riera	3b0ce7d2c1	Merge branch '5137-aviso-impresora' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-10 13:46:17 +02:00
Vicent Llopis	74ea0ce9fd	refs #5468 actualizados acls	2023-05-10 13:44:51 +02:00
Alexandre Riera	f72c162ca7	Merge branch 'dev' into 5137-aviso-impresora	2023-05-10 11:43:09 +00: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
Alexandre Riera	3166a9e420	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-10 13:23:10 +02:00
Alexandre Riera	ded8e0e141	refs #5137 added trigger, template and test	2023-05-10 13:22:53 +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
Vicent Llopis	62dd64eb89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-10 11:56:50 +02:00
Carlos Satorres	f4be69c85c	refs #5599 select state.classColor	2023-05-10 11:55:56 +02:00
Alex Moreno	9ab850b34d	Merge pull request 'test(e2e_order): fiter optimized' (!1510) from fix_orders_e2e into test ... Reviewed-on: #1510 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-10 09:41:43 +00:00
Carlos Satorres	61d6f47162	refs #5599 remove returns	2023-05-10 11:31:58 +02:00
Alex Moreno	e97d063832	Merge branch 'test' into fix_orders_e2e	2023-05-10 08:17:37 +00:00
Juan Ferrer	df1803a2e3	refs #5517 Front test fix	2023-05-10 10:11:52 +02:00
Alex Moreno	706c62f624	typo	2023-05-10 09:26:33 +02:00
Alex Moreno	3b8cafc783	fix(ticketConfigSql): correct folder	2023-05-10 09:22:33 +02:00
Alex Moreno	8c0deb6cfa	test(e2e_order): fiter optimized	2023-05-10 09:16:19 +02:00
Carlos Satorres	a8bb0aa196	Merge pull request 'refs #5580 add button, yml' (!1503) from 5580-buttonLink into dev ... Reviewed-on: #1503 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-10 06:58:58 +00:00
Carlos Satorres	eb3003e0f5	Merge branch 'dev' into 5580-buttonLink	2023-05-10 06:46:39 +00:00
Alex Moreno	ca8373d7f7	feat(acl): add specifics acls to ticket, claim, state and worker	2023-05-09 14:04:39 +02:00
Vicent Llopis	313c641cd7	move chages sql	2023-05-09 12:26:29 +02:00
Vicent Llopis	461966d73e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice	2023-05-09 11:33:28 +02:00
Alex Moreno	7021e52705	correct folder	2023-05-09 07:11:21 +02:00
Alex Moreno	8ae67799a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-05-09 07:11:09 +02:00
Juan Ferrer	7a668adf18	refs #5517 pagination fixes	2023-05-08 16:50:20 +02:00
Juan Ferrer	35a888a968	refs #5517 Pagination spinner fixes	2023-05-08 16:48:05 +02:00
Juan Ferrer	a2e71b57a2	refs #5517 Front test fix	2023-05-08 16:33:35 +02:00
Juan Ferrer	2aaded4ed4	refs #5517 Fix: Show spinner when loading	2023-05-08 16:30:21 +02:00
Alex Moreno	3b8d670c5b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-08 13:43:31 +02:00
Carlos Satorres	0b2c91466e	refs #5648 create vn-confirm	2023-05-08 13:25:42 +02:00
Juan Ferrer	9f02fc66c8	refs #5517 Show spinner when loading	2023-05-08 13:10:51 +02:00
Alex Moreno	3f414e28cc	Merge pull request '231801_test_to_dev' (!1507) from 231801_test_to_dev into dev ... Reviewed-on: #1507 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-08 11:06:47 +00:00
Alex Moreno	e019ab4160	deploy(232001): add changes folder, package and changelog	2023-05-08 12:40:52 +02:00
Alex Moreno	dde62f8971	Merge pull request '231801_dev_to_test' (!1501) from 231801_dev_to_test into test ... Reviewed-on: #1501 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-08 10:29:06 +00:00
Alex Moreno	90465c275a	correct folder	2023-05-08 12:21:20 +02:00
Alex Moreno	ad3c34bd35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 231801_dev_to_test	2023-05-08 12:08:00 +02:00
Alex Moreno	ebbc860ba3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-08 12:03:53 +02:00
Juan Ferrer	68b1b6c5bd	refs #5517 E2E fixes	2023-05-08 12:03:27 +02:00