16427 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	a26ab80e88	Merge branch 'dev' into salix-node20	2023-06-01 13:00:55 +00:00
Alex Moreno	d134ca45f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-01 14:19:23 +02:00
Alex Moreno	8d0ae30610	Merge pull request 'fix(workerLog): acl to hr' (!1584) from fix_workerLog_acl into master ... Reviewed-on: #1584 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-06-01 11:32:33 +00:00
Alex Moreno	69bf26433d	fix(workerLog): acl to hr	2023-06-01 13:19:34 +02:00
Carlos Satorres	ffba5b2d7e	Merge pull request 'refs #5398 fix' (!1579) from 5398-fixAgenciesWarehouses into dev ... Reviewed-on: #1579 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-06-01 07:49:38 +00:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Alex Moreno	fb330cdbfa	Merge pull request '232201_test_to_master' (!1582) from 232201_test_to_master into master ... Reviewed-on: #1582 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-06-01 06:16:44 +00:00
Carlos Satorres	0ee8811c15	refs #5398 fix agencies, warehouses	2023-06-01 07:52:21 +02:00
Alex Moreno	de91e016e9	update changelLg	2023-06-01 07:22:09 +02:00
Alex Moreno	d02ee2fd12	deploy(232201)	2023-06-01 07:16:06 +02:00
Alex Moreno	4f3b6c3035	typo	2023-05-31 15:00:33 +02:00
Alex Moreno	0263d76021	refs #5701 update to mariadb 10.7.7	2023-05-31 14:58:16 +02:00
Carlos Satorres	967e07933d	refs #5398 fix	2023-05-31 14:46:19 +02:00
Alex Moreno	23c52cc9b5	Merge pull request '5752-master_to_test' (!1578) from 5752-master_to_test into test ... Reviewed-on: #1578 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-31 12:35:10 +00:00
Alex Moreno	0aed2c2c08	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-05-31 13:10:25 +02:00
Alexandre Riera	eeadd72cc4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-05-31 09:53:56 +02:00
Pablo Natek	38823f8481	Merge pull request 'refs #5153 client descriptor business type' (!1573) from 5153---business-type-worker-descriptor into master ... Reviewed-on: #1573 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-05-31 06:29:20 +00:00
Alex Moreno	6d23ef5d1e	Merge branch 'master' into 5153---business-type-worker-descriptor	2023-05-31 05:04:57 +00:00
Juan Ferrer	a4d7988591	refs #5517 Translations fixes	2023-05-30 19:39:11 +02:00
Carlos Satorres	38c0dc2e01	Merge pull request 'refs #5398 capital letters' (!1575) from 5398-fixErrorWarehouses into dev ... Reviewed-on: #1575 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-30 14:08:45 +00:00
Carlos Satorres	d6c588d7eb	Merge branch 'dev' into 5398-fixErrorWarehouses	2023-05-30 14:02:54 +00:00
Carlos Satorres	2c3869d961	refs #5398 capital letters	2023-05-30 15:48:09 +02:00
Alexandre Riera	576a5f050e	refs #5513 fix back test	2023-05-30 13:48:56 +02:00
Alexandre Riera	c0c522c619	Merge branch '5513-backs-embalajes' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-30 13:47:11 +02:00
Alexandre Riera	1fd51c191f	refs #5513 minor fixes	2023-05-30 13:47:09 +02:00
Vicent Llopis	46b6625527	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-05-30 12:06:31 +02:00
Vicent Llopis	2b34dd19e8	refs #554 delete: test back que falla	2023-05-30 12:06:15 +02:00
Vicent Llopis	4f9dae3522	refs #5468 fix: no muestra el id de contrato en worker/calendar	2023-05-30 11:52:04 +02:00
Alexandre Riera	30816f7947	Merge branch 'dev' into 5513-backs-embalajes	2023-05-30 09:51:42 +00:00
Alexandre Riera	060b2fdf50	Merge branch '5137-aviso-impresora' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-30 11:34:55 +02:00
Alexandre Riera	138f03d891	refs #5137 fix back test	2023-05-30 11:34:53 +02:00
Alexandre Riera	32bdaa640e	Merge branch 'dev' into 5137-aviso-impresora	2023-05-30 09:30:34 +00:00
Pablo Natek	382bc06075	refs #5153	2023-05-30 11:23:07 +02:00
Alexandre Riera	632662c440	refs #5595 added userId in makeInvoice	2023-05-30 10:49:10 +02:00
Alexandre Riera	e05d3b0793	Merge branch 'dev' into 5595-modify-loggable-tables-in-procs	2023-05-30 08:27:35 +00:00
Vicent Llopis	20cb1ea821	refs #5468 fix: te2e	2023-05-30 10:20:49 +02:00
Vicent Llopis	21448a84dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-30 10:16:34 +02:00
Vicent Llopis	7d59c6ec0c	refs #5468 feat: eliminado acl nativo y añadido a salix.ACL	2023-05-30 10:07:17 +02:00
Vicent Llopis	81a8f383aa	refs #5468 feat: no depender del modulo worker	2023-05-30 10:00:05 +02:00
Alexandre Riera	153542d2be	refs #5595 taking active connection	2023-05-30 09:49:39 +02:00
Carlos Satorres	6ff4c4f51d	Merge pull request 'refs #5328 mod funcion createTicketRefund' (!1498) from 5328-abonarTodoTicket into dev ... Reviewed-on: #1498 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-30 07:47:47 +00:00
Carlos Satorres	cb664ecec4	Merge branch '5328-abonarTodoTicket' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket	2023-05-30 09:18:57 +02:00
Carlos Satorres	ec5a5be9e6	refs #5328 remove spaces	2023-05-30 09:18:52 +02:00
Carlos Satorres	3872078507	Merge branch 'dev' into 5328-abonarTodoTicket	2023-05-30 07:16:38 +00:00
Vicent Llopis	ea1c860a18	refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta	2023-05-30 09:13:47 +02:00
Vicent Llopis	94e7e8e321	Merge pull request '5327-ticket.sale_ordenarPorColumnas' (!1517) from 5327-ticket.sale_ordenarPorColumnas into dev ... Reviewed-on: #1517 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-05-30 07:11:48 +00:00
Vicent Llopis	27700bd72c	Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas	2023-05-30 06:14:48 +00:00
Alexandre Riera	90cb4e224c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5507-loadConfigAtStart	2023-05-30 08:06:49 +02:00
Carlos Satorres	0d394ec3aa	Merge pull request 'refs #5648 move claimSure' (!1571) from 5648-sureClaimFIX into dev ... Reviewed-on: #1571 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-30 06:03:13 +00:00
Alexandre Riera	ba850415be	refs #5137 moved sql	2023-05-29 12:56:54 +02:00