15772 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	43bb762129	Merge branch 'dev' into 5237-greugeAlarmNotification	2023-04-26 07:46:15 +00:00
Carlos Satorres	a945f4dedd	Merge branch '084200-footerAlbaranReport' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport	2023-04-26 09:22:21 +02:00
Carlos Satorres	57ec0f8587	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport	2023-04-26 09:03:37 +02:00
Carlos Satorres	ad9c189e35	Merge branch 'dev' into 084200-footerAlbaranReport	2023-04-26 06:13:50 +00:00
Alexandre Riera	740e03f0ee	Merge pull request 'fixes #5293 Añadir secciones en claim' (!1448) from 5293-claim-sections into dev ... Reviewed-on: #1448 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-26 06:10:02 +00:00
Carlos Satorres	24a007d609	Merge branch 'dev' into 084200-footerAlbaranReport	2023-04-26 06:07:41 +00:00
Alex Moreno	73153071d6	Merge branch 'dev' into 5293-claim-sections	2023-04-26 05:56:46 +00:00
Alexandre Riera	c9a42f9eb8	Merge pull request 'added #5518 changelog' (!1484) from changelog-5518 into dev ... Reviewed-on: #1484 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-26 05:50:39 +00:00
Alexandre Riera	59b556ede1	Merge branch 'dev' into changelog-5518	2023-04-26 05:28:59 +00:00
Alexandre Riera	60146b8b9c	added #5518 changelog	2023-04-26 07:28:30 +02:00
Pablo Natek	e8ce8e42fd	refs #5153	2023-04-25 14:25:22 +02:00
Alexandre Riera	f2bef8dcf6	Merge pull request 'test -> dev' (!1481) from test-to-dev into dev ... Reviewed-on: #1481 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-25 09:36:03 +00:00
Alexandre Riera	83319894b2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev	2023-04-25 11:25:29 +02:00
Alex Moreno	a6653c5622	refs #5542 fix e2e	2023-04-25 10:40:35 +02:00
Alex Moreno	618100b68a	refs #5542 eliminados procesos que no se usan	2023-04-25 10:40:24 +02:00
Alex Moreno	11d1900859	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor	2023-04-25 09:40:36 +02:00
Alexandre Riera	782f86e84c	Merge pull request 'master -> test' (!1479) from master-to-test into test ... Reviewed-on: #1479 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-25 07:05:44 +00:00
Alexandre Riera	91b2d15234	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into master-to-test	2023-04-25 08:53:50 +02:00
Alexandre Riera	4477976ea6	Merge pull request 'hotfix negativeBases' (!1472) from hotfix-negativeBases into master ... Reviewed-on: #1472 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-25 06:48:33 +00:00
Alexandre Riera	edb1e2197c	Merge branch 'master' into hotfix-negativeBases	2023-04-25 06:23:08 +00:00
Juan Ferrer	49368a837b	refs #5517 Filter improved	2023-04-24 19:10:04 +02:00
Pablo Natek	7636302e7f	Merge pull request '5075-feat: sendEmail checkBox and docuware open clientBalanceCreate with default data' (!1317) from 5075-client_balance into dev ... Reviewed-on: #1317 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-24 15:51:19 +00:00
Pablo Natek	3e15728db4	Merge branch 'dev' into 5075-client_balance	2023-04-24 15:33:28 +00:00
Carlos Satorres	b1376a394f	Merge pull request 'refs #5575 mod3Decimal' (!1461) from 5575-tercerDecimalLatest into dev ... Reviewed-on: #1461 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-24 13:39:22 +00:00
Carlos Satorres	40da3dfe52	Merge branch 'dev' into 5575-tercerDecimalLatest	2023-04-24 12:53:28 +00:00
Carlos Satorres	ce20f46fef	Merge pull request '5436-mensajeClienteSinCorreo' (!1469) from 5436-mensajeClienteSinCorreo into dev ... Reviewed-on: #1469 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-24 12:44:58 +00:00
Carlos Satorres	08e890d6d9	Merge branch 'dev' into 5436-mensajeClienteSinCorreo	2023-04-24 12:40:57 +00:00
Carlos Satorres	70ef302b67	Merge pull request 'refs #5439 inheritedRole' (!1447) from 5439-inheritRole into dev ... Reviewed-on: #1447 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-24 12:27:16 +00:00
Juan Ferrer	a053764122	refs #5517 E2E fixes	2023-04-24 12:59:56 +02:00
Carlos Satorres	9d0facd2ba	Merge branch 'dev' into 084200-footerAlbaranReport	2023-04-24 09:42:41 +00:00
Juan Ferrer	081b4af6d6	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-24 10:44:42 +02:00
Carlos Satorres	4473cc11c7	Merge branch 'dev' into 5439-inheritRole	2023-04-24 08:43:19 +00:00
Carlos Satorres	210bd949d2	Merge branch 'dev' into 5436-mensajeClienteSinCorreo	2023-04-24 08:38:06 +00:00
Carlos Satorres	1717f03ccc	Merge branch 'dev' into 5575-tercerDecimalLatest	2023-04-24 07:38:06 +00:00
Vicent Llopis	4983aa1632	refs #5542 fix backTest	2023-04-24 09:11:09 +02:00
Vicent Llopis	9b432bac85	refs #5542 fix: test	2023-04-24 08:57:10 +02:00
Alexandre Riera	4eeeccf263	Merge pull request 'test-to-dev' (!1478) from test-to-dev into dev ... Reviewed-on: #1478 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-24 06:54:32 +00:00
Carlos Satorres	67db2f0476	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-24 06:51:41 +00:00
Alexandre Riera	925e30350a	resolved conflicts	2023-04-24 08:50:18 +02:00
Carlos Satorres	cd4f66e292	refs #5540 arreglar e2e	2023-04-24 08:48:35 +02:00
Vicent Llopis	bf558761a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor	2023-04-24 08:45:56 +02:00
Alexandre Riera	0a1583aa54	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev	2023-04-24 08:42:32 +02:00
Carlos Satorres	caed48de01	Merge branch 'dev' into 084200-footerAlbaranReport	2023-04-24 06:38:02 +00:00
Alexandre Riera	5b44323009	Merge pull request 'master -> test' (!1477) from master-to-test into test ... Reviewed-on: #1477 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-24 06:37:44 +00:00
Alexandre Riera	84c01ecea7	Merge branch 'test' into master-to-test	2023-04-24 06:19:25 +00:00
Alexandre Riera	d48ede678d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into master-to-test	2023-04-24 08:10:22 +02:00
Alex Moreno	ef12fdf889	Merge branch 'dev' into 5575-tercerDecimalLatest	2023-04-24 06:02:34 +00:00
Alex Moreno	5e33395534	Merge branch 'dev' into 5436-mensajeClienteSinCorreo	2023-04-24 06:02:00 +00:00
Vicent Llopis	a7a0853248	Merge pull request '5318-deviceProductionLog_toSalix' (!1460) from 5318-deviceProductionLog_toSalix into dev ... Reviewed-on: #1460 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-24 05:07:06 +00:00
Vicent Llopis	5b7ca82509	Merge branch 'dev' into 5318-deviceProductionLog_toSalix	2023-04-24 04:58:30 +00:00