12113 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	9dbd1e6f72	Merge pull request '3653-refactor(clientInsurance): rename column add Fk' (#997) from 3653-clientInsurance into dev ... Reviewed-on: #997 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-10 07:13:38 +00:00
Alex Moreno	de0f7c98fa	Merge branch 'dev' into 3653-clientInsurance	2022-06-10 05:32:58 +00:00
Alex Moreno	417c798afd	add schema	2022-06-09 14:52:01 +02:00
Joan Sanchez	d08e1cee23	Merge pull request '4164 - Endpoint refactor' (#996) from 4164-edi_updateData into dev ... Reviewed-on: #996 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-06-09 11:10:31 +00:00
Juan Ferrer	86605c3d67	Merge branch 'dev' into 4164-edi_updateData	2022-06-09 10:18:03 +00:00
Joan Sanchez	4a823f1a35	Merge pull request '4163-supplier.account' (#998) from 4163-supplier.account into dev ... Reviewed-on: #998 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-09 10:06:11 +00:00
Joan Sanchez	1bb8527c49	Merge branch 'dev' into 4163-supplier.account	2022-06-09 09:59:18 +00:00
Joan Sanchez	be50663faa	Merge pull request '4040-chat_sendQueued' (#993) from 4040-chat_sendQueued into dev ... Reviewed-on: #993 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-09 09:57:56 +00:00
Joan Sanchez	83d4627f2d	Removed font color	2022-06-09 11:31:18 +02:00
Carlos Jimenez Ruiz	92088c00f7	Merge branch 'dev' into 4163-supplier.account	2022-06-09 09:04:14 +00:00
Carlos Jimenez Ruiz	626057fc4e	Merge branch 'dev' into 4164-edi_updateData	2022-06-09 08:49:28 +00:00
Carlos Jimenez Ruiz	cd5dba6fcb	Merge branch 'dev' into 4040-chat_sendQueued	2022-06-09 08:44:22 +00:00
Carlos Jimenez Ruiz	a3c928d196	Merge pull request '3817-updatePortfolio' (#989) from 3817-updatePortfolio into dev ... Reviewed-on: #989 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-09 08:42:44 +00:00
Joan Sanchez	7fe7fb2e8f	Replaced fs sync functions	2022-06-09 10:13:45 +02:00
Carlos Jimenez Ruiz	ad8eace5cb	Merge branch 'dev' into 3817-updatePortfolio	2022-06-09 07:52:52 +00:00
Vicent Llopis	fb7f26216c	feat: update combo "Banck entity"	2022-06-09 08:43:33 +02:00
Alex Moreno	61cc3c19f3	refactor(client): creditInsuarnce change creditClassification for creditClassificationFk	2022-06-09 07:13:54 +02:00
Vicent Llopis	93bb678738	updated endpoints description	2022-06-08 13:08:53 +02:00
Vicent Llopis	aa99424476	deleted unnecessary 'await'	2022-06-08 12:50:32 +02:00
Carlos Jimenez Ruiz	a824da3908	Merge branch 'dev' into 4164-edi_updateData	2022-06-08 09:17:24 +00:00
Carlos Jimenez Ruiz	94dd650992	Merge pull request '4067- Extended client list' (#991) from 4067-client_detail into dev ... Reviewed-on: #991 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-07 13:41:46 +00:00
Alex Moreno	81f42985e4	sql	2022-06-07 15:15:25 +02:00
Joan Sanchez	c92f444776	Ammends	2022-06-07 14:59:18 +02:00
Carlos Jimenez Ruiz	27e8c99604	Merge branch 'dev' into 4067-client_detail	2022-06-07 12:50:37 +00:00
Carlos Jimenez Ruiz	6ebcf4bc02	Merge branch 'dev' into 3817-updatePortfolio	2022-06-07 12:35:31 +00:00
Carlos Jimenez Ruiz	c867b4e8bb	Merge pull request '4111-claim.summary' (#985) from 4111-claim.summary into dev ... Reviewed-on: #985 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-07 12:34:41 +00:00
Joan Sanchez	58a1eea642	Merge branch 'dev' into 4111-claim.summary	2022-06-07 12:27:12 +00:00
Joan Sanchez	f633a09717	Removed package-lock	2022-06-07 13:15:07 +02:00
Joan Sanchez	33e9dacf60	Merge branch 'dev' into 4164-edi_updateData	2022-06-07 11:07:19 +00:00
Joan Sanchez	f77f5cee58	4164 - Endpoint refactor	2022-06-07 13:06:42 +02:00
Joan Sanchez	13e0772f0b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-03 14:28:39 +02:00
Vicent Llopis	e4b23fa14d	fix: bugs	2022-06-03 14:02:23 +02:00
Joan Sanchez	96f500d161	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-06-03 14:00:05 +02:00
Joan Sanchez	5059f72ea5	Clean directory	2022-06-03 13:54:58 +02:00
Vicent Llopis	e30817644a	fix: bug	2022-06-03 13:48:44 +02:00
Joan Sanchez	bdb581db94	Disable file delete	2022-06-03 13:47:40 +02:00
Vicent Llopis	9f57481390	refator: change comments	2022-06-03 13:44:42 +02:00
Vicent Llopis	fa27e6dd58	fix: backTest	2022-06-03 13:36:21 +02:00
Joan Sanchez	391960b390	Fixed sql table name	2022-06-03 13:27:58 +02:00
Joan Sanchez	3752ca2347	Changed when file is removed	2022-06-03 13:22:32 +02:00
Joan Sanchez	33049c507f	Transaction fix	2022-06-03 13:01:39 +02:00
Joan Sanchez	b790ee88d9	Edi fixes	2022-06-03 12:57:39 +02:00
Joan Sanchez	9bb264da38	Fixes	2022-06-03 12:52:41 +02:00
Joan Sanchez	d0e7ef8f47	Fixed SQL templates	2022-06-03 12:44:39 +02:00
Joan Sanchez	b1ce77d362	Debug logs	2022-06-03 12:35:45 +02:00
Vicent Llopis	3eac002fb4	feat: add queue to send rocket messages	2022-06-03 12:22:07 +02:00
Joan Sanchez	b98ac4f233	Debugging logs	2022-06-03 12:18:06 +02:00
Joan Sanchez	f3eb36f8ee	Edi fixes	2022-06-03 11:47:43 +02:00
Joan Sanchez	77f3af7679	Merge pull request 'MASTER_hotFix(ticket_expedition): delete e.checked in filter' (#992) from hotFix_ticket_expedition_filter into master ... Reviewed-on: #992 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-06-02 13:46:30 +00:00
Alex Moreno	4e3380cf65	hotFix(ticket_expedition): delete e.checked in filter	2022-06-02 15:28:11 +02:00