16071 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
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
Alexandre Riera	1bb5033729	Merge branch 'dev' into 5137-aviso-impresora	2023-05-29 10:56:21 +00:00
Alexandre Riera	059467a383	refs #5137 sql moved to template	2023-05-29 12:55:20 +02: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
Alexandre Riera	1550716b1a	Merge branch 'dev' into 5642-arreglar-e2e-ticketFuture-ticketAdvance	2023-05-29 07:59:22 +00:00
Alexandre Riera	1ed8000be9	refs #5642 e2es refactored	2023-05-29 09:58:49 +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
Alexandre Riera	e3300d2287	Merge branch 'dev' into 5642-arreglar-e2e-ticketFuture-ticketAdvance	2023-05-29 07:19:19 +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
Vicent Llopis	60e694423d	Merge pull request '5600-workerPhoto_incorrectSize' (!1522) from 5600-workerPhoto_incorrectSize into dev ... Reviewed-on: #1522 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-26 12:34:54 +00:00
Alex Moreno	f37d93b469	refs #5488 correct folder	2023-05-26 14:04:00 +02:00
Vicent Llopis	4e3f8f6975	Merge branch 'dev' into 5600-workerPhoto_incorrectSize	2023-05-26 11:33:41 +00:00
Alexandre Riera	be06a65a45	refs #5507 fixed e2e	2023-05-26 11:53:32 +02:00
Alex Moreno	c7b8e57d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-26 07:41:48 +02:00
Alex Moreno	b9cb812e0d	Merge pull request 'fix item_getBalance' (!1569) from master_to_test2 into test ... Reviewed-on: #1569 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-05-26 05:37:35 +00:00
Alexandre Riera	8d3ee18172	Merge pull request 'fixes #5634 Adelantar el mismo ticket origen a múltiples tickets destino' (!1529) from 5634-ticketAdvance-mismoOrigen-multiplesDestinos into dev ... Reviewed-on: #1529 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-26 05:08:53 +00:00
Juan Ferrer	27d4d10472	refs #5667 Expedition translation fixes	2023-05-25 18:32:03 +02:00
Juan Ferrer	2e0721b101	refs #5667 Fixes: Id filter, translations	2023-05-25 18:22:46 +02:00
Alex Moreno	375fdf2a21	fix item_getBalance	2023-05-25 14:31:28 +02:00
Alexandre Riera	c46e6cd862	Merge pull request 'hotfix item_getBalance' (!1563) from hotfix-item_getBalance into master ... Reviewed-on: #1563	2023-05-25 12:01:14 +00:00
Alexandre Riera	a584e1ab5e	Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos	2023-05-25 11:22:51 +00:00
Alexandre Riera	7e5fcc73ad	modified fixed structure	2023-05-25 13:10:05 +02:00
Alexandre Riera	ee8ce8f0de	Merge branch 'hotfix-item_getBalance' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-item_getBalance	2023-05-25 12:42:52 +02:00
Alexandre Riera	cd508e970d	changed structure like prod	2023-05-25 12:42:49 +02:00
Carlos Satorres	fa8fd8d5bc	refs #5398 update from oldbranch	2023-05-25 11:41:14 +02:00