12148 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	d793dc3e09	Merge pull request '4348-rocketChat_2.0' (#1033) from 4348-rocketChat_2.0 into master ... Reviewed-on: #1033 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-07-27 07:38:14 +00:00
Vicent Llopis	e5349ec7ed	fix: send messages to channels	2022-07-27 09:16:49 +02:00
Joan Sanchez	882c4cc3d7	fix(insurance): force script execution	2022-07-26 13:19:57 +02:00
Joan Sanchez	a0ad26faa8	Merge pull request '4348-rocketChat' (#1032) from 4348-rocketChat into master ... Reviewed-on: #1032	2022-07-26 11:07:12 +00:00
Vicent Llopis	3fd289ff51	update chat	2022-07-26 13:03:03 +02:00
Joan Sanchez	e916915435	Updated to POST	2022-07-26 12:08:38 +02:00
Joan Sanchez	bbae986424	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-07-26 12:06:37 +02:00
Joan Sanchez	f4825488c6	refactor(Tasks API): ghanged method to GET	2022-07-26 11:47:43 +02:00
Joan Sanchez	2122f8adac	Merge pull request 'feat: set daysInFuture value' (#1021) from 4276-accountingType.daysInFuture into test ... Reviewed-on: #1021	2022-07-04 07:02:27 +00:00
Vicent Llopis	e441c658fd	feat: set daysInFuture value	2022-07-04 08:31:53 +02:00
Joan Sanchez	b2c4ca4453	Merge pull request '4273-MASTER_hotFix(entry): isExcludedFromAvailable' (#1020) from 4273-master_hotFix_entry into master ... Reviewed-on: #1020	2022-07-01 09:21:48 +00:00
Alex Moreno	169f39cf1a	fix entry isExcludedFromAvailable	2022-07-01 09:53:44 +02:00
Joan Sanchez	305158a765	Merge pull request '4273-hotFix_entry_isInventory' (#1018) from 4273-hotFix_entry_isInventory into test ... Reviewed-on: #1018	2022-06-30 12:22:29 +00:00
Alex Moreno	c02433faab	typo	2022-06-30 13:24:26 +02:00
Alex Moreno	c88df46b4f	typo	2022-06-30 13:23:57 +02:00
Alex Moreno	ca767b84f0	fix(entry): change isInventory to isExcludedFromAvailable	2022-06-30 13:21:07 +02:00
Joan Sanchez	140af7e808	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-30 13:14:08 +02:00
Joan Sanchez	ad021265c7	Deprecated field taxTypeFk	2022-06-30 11:42:37 +02:00
Joan Sanchez	df2be27dd3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-28 12:28:19 +02:00
Joan Sanchez	ae8aae6c20	Changed scope	2022-06-28 11:58:01 +02:00
Joan Sanchez	5714eb80f2	fix(closure): Wrong error handler scope	2022-06-28 11:21:47 +02:00
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00
Joan Sanchez	e7bf88c703	Fix order	2022-06-21 14:26:34 +02:00
Joan Sanchez	b41cf7a569	Merge pull request '4208-ticket.refund' (#1000) from 4208-ticket.refund into test ... Reviewed-on: #1000	2022-06-21 11:31:43 +00:00
Joan Sanchez	7ce11c10f5	Merge branch 'test' into 4208-ticket.refund	2022-06-21 11:18:05 +00:00
Vicent Llopis	ec852b898c	fix: check if services exists	2022-06-21 12:44:19 +02:00
Joan Sanchez	16d677528a	FIX: Sort by id as last field	2022-06-21 12:18:33 +02:00
Joan Sanchez	4118f52a2f	Force master update	2022-06-20 10:04:00 +02:00
Juan Ferrer	504fb9acea	docker-compose fixes	2022-06-19 13:17:48 +02:00
Carlos Jimenez Ruiz	b75053dd56	Merge pull request 'fix(changes): prevent sql errors when test to master' (#1005) from TEST_preventSQLerror into test ... Reviewed-on: #1005 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-17 10:47:29 +00:00
Alex Moreno	fd6b688382	fix(changes): prevent sql errors when test to master	2022-06-17 09:40:33 +02:00
Vicent Llopis	363c5f349a	fix: solved bug to create temporary table	2022-06-13 10:04:12 +02:00
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