15021 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	e48565fe9e	refs #5414 eliminados chips de la searchBar	2023-03-22 12:58:50 +01:00
Alexandre Riera	48f7c4d251	Merge pull request 'fixes e2e' (!1402) from fix-e2e into dev ... Reviewed-on: #1402 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-22 09:58:05 +00:00
Alexandre Riera	5598bbaaa8	fix e2e	2023-03-22 10:13:37 +01:00
Joan Sanchez	d209b35071	Merge pull request 'refs #5423 añadido 3r decimal' (!1392) from #5423-tercerDecimalCoste into dev ... Reviewed-on: #1392 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-21 10:22:37 +00:00
Joan Sanchez	82a674e2f6	Merge pull request 'refs #5073 adaptacion para solo el año' (!1397) from 5073-diaActual into dev ... Reviewed-on: #1397 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-21 10:21:59 +00:00
Joan Sanchez	46b40c03a7	Merge pull request '5241-virtual_pos' (!1399) from 5241-virtual_pos into dev ... Reviewed-on: #1399 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-03-21 09:35:19 +00:00
Joan Sanchez	3a922b453f	Merge branch 'dev' into 5241-virtual_pos	2023-03-21 09:10:34 +00:00
Joan Sanchez	6d6c2cbfb3	Default formatter	2023-03-21 10:09:03 +01:00
Joan Sanchez	5e61cbabc7	Merge pull request 'refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion' (!1398) from 5203-supplier.create_refactor into dev ... Reviewed-on: #1398 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-21 09:07:07 +00:00
Joan Sanchez	12a9ff599b	Updated unit test	2023-03-21 10:05:27 +01:00
Joan Sanchez	3881e435f4	Renamed method	2023-03-21 09:55:45 +01:00
Vicent Llopis	46a6a5fc63	refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion	2023-03-21 08:51:30 +01:00
Joan Sanchez	634db7c7fc	refactor(getTransactions): lilium customer transactions	2023-03-20 23:09:17 +01:00
Carlos Satorres	da05140635	Merge branch '#5423-tercerDecimalCoste' of https://gitea.verdnatura.es/verdnatura/salix into #5423-tercerDecimalCoste	2023-03-20 15:14:11 +01:00
Carlos Satorres	78d8bbd82a	refs #5423 tercer decimal en entrada	2023-03-20 10:44:44 +01:00
Carlos Satorres	f5109724bf	refs #5073 adaptacion para solo el año	2023-03-17 11:39:16 +01:00
Joan Sanchez	40ccc4f409	Merge pull request 'refs #4357 add operator model' (!1395) from 4357-operatorSalix into dev ... Reviewed-on: #1395 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-17 10:12:48 +00:00
Robert Ferrús	1d697e1ac5	refs #4357 add operator model	2023-03-17 08:46:01 +01:00
Juan Ferrer	ed20927b52	Merge pull request 'fixes #4632 Llamar al nuevo método back de guardar firmas de salix' (!1346) from 4632-guardarFirmas-salix into dev ... Reviewed-on: #1346 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-03-16 09:53:50 +00:00
Juan Ferrer	f61c205a7b	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-16 09:53:16 +00:00
Alexandre Riera	668fa73386	refs #4632 deleted return in definition	2023-03-16 10:32:00 +01:00
Alexandre Riera	60162fe71f	refs #4632 removed return	2023-03-16 10:30:53 +01:00
Carlos Satorres	aadb796adf	Merge branch 'dev' into #5423-tercerDecimalCoste	2023-03-16 09:12:56 +00:00
Joan Sanchez	1a79bb586c	Added version 2312.01	2023-03-16 09:07:59 +01:00
Alexandre Riera	c0094d8047	Merge branch '4632-guardarFirmas-salix' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix	2023-03-16 09:07:21 +01:00
Alexandre Riera	a0be5c50fc	refs #4632 changed packed from boxed	2023-03-16 09:07:19 +01:00
Alexandre Riera	f037575428	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-16 08:06:17 +00:00
Alexandre Riera	6e2269b428	refs #4632 removed alert level id from code	2023-03-16 09:04:57 +01:00
Carlos Satorres	70beaf9b6c	refs #5423 añadido 3r decimal	2023-03-16 09:03:16 +01:00
Alexandre Riera	cd8695741c	Merge pull request 'fixes #5036 Regularizar históricos' (!1244) from 5036-regularizar-historicos into dev ... Reviewed-on: #1244 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-03-16 07:26:31 +00:00
Alexandre Riera	a99bd2577a	refs #4632 changed route from TicketDms to Ticket	2023-03-16 08:24:34 +01:00
Alexandre Riera	387576d63a	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-16 06:42:39 +00:00
Joan Sanchez	8fda595c2e	Merge pull request '4856-worker.time-control' (!1375) from 4856-worker.time-control into dev ... Reviewed-on: #1375 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:39:00 +00:00
Vicent Llopis	ab5a592434	refs #4856 add changelog	2023-03-16 07:37:59 +01:00
Joan Sanchez	d373d80b12	Merge pull request '5120-reports_loopback' (!1389) from 5120-reports_loopback into dev ... Reviewed-on: #1389 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:34:02 +00:00
Vicent Llopis	a87e0c52d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-16 07:32:04 +01:00
Joan Sanchez	a8049c5b2c	Merge pull request '5380-m3/itemMaxSize' (!1377) from 5380-m3/itemMaxSize into dev ... Reviewed-on: #1377 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-16 06:28:03 +00:00
Joan Sanchez	e911f7a127	Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev ... Reviewed-on: #1391 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:27:33 +00:00
Joan Sanchez	d9296c139d	Merge pull request 'fix: autocompletar el switf/bic' (!1388) from 5352-worker.create_swift/bic into dev ... Reviewed-on: #1388 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:25:18 +00:00
Joan Sanchez	1f52326091	Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev ... Reviewed-on: #1390 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-03-16 06:22:45 +00:00
Joan Sanchez	4f0ad00a6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-16 07:20:18 +01:00
Joan Sanchez	596a017cfd	Don't throw error on file unlink	2023-03-16 07:18:29 +01:00
Joan Sanchez	0d5272de30	Merge branch 'dev' into 5182-print_publish	2023-03-15 15:05:43 +00:00
Pablo Natek	0f0bec8769	Merge pull request 'refs #5151 botones' (!1383) from 5151-claim.descriptor-2-botones-mas into dev ... Reviewed-on: #1383 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-03-15 13:50:32 +00:00
Pablo Natek	defa1b660c	test	2023-03-15 14:40:49 +01:00
Joan Sanchez	a947666838	refactor(imageQueue): remplaced sharp with gm	2023-03-15 14:24:30 +01:00
Vicent Llopis	286bc541b6	refs #5120 delete console.log	2023-03-15 11:27:01 +01:00
Vicent Llopis	da5886243e	refs #5120 refactor: no utilizar receipt directamente	2023-03-15 10:22:34 +01:00
Joan Sanchez	bdb86a432f	Merge branch '5182-print_publish' of https://gitea.verdnatura.es/verdnatura/salix into 5182-print_publish	2023-03-15 08:07:17 +01:00
Joan Sanchez	f052af92cd	Proper template name	2023-03-15 08:07:14 +01:00