16018 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Juan Ferrer	47c6ad6a71	refs #5667 Translation fix	2023-06-02 15:48:27 +02:00
Juan Ferrer	45eba4533a	refs #5667 VnUser translation added	2023-06-02 15:47:45 +02:00
Juan Ferrer	5be79bbdef	refs #5667 VnUser translations added	2023-06-02 15:31:36 +02:00
Juan Ferrer	35cf48314a	refs #4090 back memory limit increased because of pupeteer	2023-06-02 13:51:26 +02:00
Vicent Llopis	1408e5f5ad	Merge pull request 'hotfix_sendMail' (!1587) from hotfix_sendMail into master ... Reviewed-on: #1587 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-06-02 10:39:17 +00:00
Vicent Llopis	01175a4c6c	quitado vn	2023-06-02 12:32:34 +02:00
Vicent Llopis	186ec2ea41	fix sendMail: sustituido modelo Journey por BusinessSchedule	2023-06-02 12:22:27 +02:00
Juan Ferrer	c05d6bb9a1	refs #5563 WorkerDocument translation fixes	2023-06-02 11:43:44 +02:00
Juan Ferrer	95715763a1	refs #5667 Worker translations added/fixed	2023-06-02 08:57:22 +02:00
Guillermo Bonet	20e574aef4	Merge pull request 'refs #5684 edi/updateData fix' (!1585) from 5684-ediUpdateData into master ... Reviewed-on: #1585 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-02 06:29:50 +00:00
Alex Moreno	cefe8e3e17	Merge pull request 'REFACTOR(node_version)! update to v20' (!1553) from salix-node20 into dev ... Reviewed-on: #1553 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-02 06:14:01 +00:00
Guillermo Bonet	5b0a1d10bb	refs #5684 edi/updateData fix	2023-06-02 07:51:01 +02:00
Alex Moreno	a26ab80e88	Merge branch 'dev' into salix-node20	2023-06-01 13:00:55 +00: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
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
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
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
Pablo Natek	382bc06075	refs #5153	2023-05-30 11:23:07 +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	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
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
Vicent Llopis	d2355412a0	Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas	2023-05-29 08:59:20 +00:00
Carlos Satorres	41b1b2fb3f	fix >	2023-05-29 10:02:21 +02:00
Carlos Satorres	b797f747f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaimFIX	2023-05-29 10:00:33 +02:00
Carlos Satorres	fad28dc711	Merge pull request 'refs #5398 update from oldbranch' (!1564) from 5398-Agencys&WarehousesData into dev ... Reviewed-on: #1564 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-29 07:58:13 +00:00
Pablo Natek	a232e9ecea	refs #5153	2023-05-29 09:26:36 +02:00
Vicent Llopis	d313517e14	Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas	2023-05-29 07:24:28 +00:00
Carlos Satorres	138d158f4f	#refs 5684 remove and mod selectors	2023-05-29 09:11:41 +02:00
Carlos Satorres	1593b4b626	Merge branch 'dev' into 5398-Agencys&WarehousesData	2023-05-29 07:09:08 +00:00
Alex Moreno	aca6e11983	Merge branch 'dev' into salix-node20	2023-05-29 06:32:53 +00:00
Alex Moreno	a22ae3809e	Merge pull request '5488-use_checkAccessAcl' (!1482) from 5488-use_checkAccessAcl into dev ... Reviewed-on: #1482 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-29 05:20:28 +00:00
Alex Moreno	ffbc39ca56	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-29 05:09:45 +00:00
Carlos Satorres	95c438b73a	refs #5648 move claimSure	2023-05-26 14:52:47 +02:00