15963 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	8502b74dee	feat(): replace hasRole to checkAccessAcl	2023-04-24 11:07:04 +02: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
Alexandre Riera	d945707761	Merge pull request 'hotfix savesign dms hasFile' (!1474) from hotfix-dms-hasFile into master ... Reviewed-on: #1474 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-21 12:57:29 +00:00
Alexandre Riera	6609f96f92	Merge branch 'master' into hotfix-negativeBases	2023-04-21 12:56:15 +00:00
Alexandre Riera	bbf1c40987	Merge branch 'master' into hotfix-dms-hasFile	2023-04-21 12:48:06 +00:00
Alexandre Riera	2975e7fae3	hotfix savesign	2023-04-21 14:46:46 +02:00
Vicent Llopis	e24366707b	refactor: añadido focus a la seccion usuarios	2023-04-21 14:26:12 +02:00
Vicent Llopis	2b74ab43ae	refactor front	2023-04-21 14:12:53 +02:00
Vicent Llopis	9f04581862	refs #5542 "importar reclamacion" crea un registro en ticketRefund	2023-04-21 14:00:28 +02:00
Vicent Llopis	38e5660e61	refs #5542 refactorizado "abono" para que siempre cree un único ticket abono	2023-04-21 13:59:28 +02:00
Alex Moreno	faee5ccd7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-21 13:53:07 +02:00
Vicent Llopis	75432b8823	Merge pull request '5128-client.credit-management' (!1459) from 5128-client.credit-management into dev ... Reviewed-on: #1459 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-21 11:49:32 +00:00
Vicent Llopis	f96122ad3e	Merge branch 'dev' into 5128-client.credit-management	2023-04-21 11:43:14 +00:00
Vicent Llopis	f347256617	Merge pull request '5456-client-welcome_email_añadirTraducciones' (!1470) from 5456-client-welcome_email_añadirTraducciones into dev ... Reviewed-on: #1470 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-21 11:38:33 +00:00
Alex Moreno	f738d1659b	Merge branch 'dev' into 5456-client-welcome_email_añadirTraducciones	2023-04-21 11:31:00 +00:00
Vicent Llopis	ea1035311e	Merge branch 'dev' into 5128-client.credit-management	2023-04-21 11:30:58 +00:00
Alex Moreno	294bf2b8a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-21 13:30:34 +02:00