13844 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	ede721a37b	Merge branch 'master' into MASTER_hotfix_deleteTrashFiles3	2022-12-01 10:57:44 +00:00
Joan Sanchez	e815292d6b	fix(componentUpdate): updated filter where sintax	2022-12-01 09:24:56 +01:00
Vicent Llopis	2bb6c1c1da	fix: borra registros aunq no tengan file adjunto	2022-12-01 07:54:32 +01:00
Joan Sanchez	6cb0e518d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-01 07:33:38 +01:00
Joan Sanchez	e9c189a963	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-12-01 07:31:45 +01:00
Vicent Llopis	444d495b7f	refactor: codigo reducido	2022-12-01 07:22:13 +01:00
Vicent Llopis	ba8fe7dfa8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-01 07:11:00 +01:00
Alex Moreno	8df7b91127	fix: entry ref	2022-11-30 15:24:33 +01:00
Pau	d428753088	Merge pull request 'refs #4875 skipped failing test' (!1193) from 4875-skip-tests into dev ... Reviewed-on: #1193 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-30 13:56:01 +00:00
Joan Sanchez	9ab2144008	Merge pull request 'hotFix: not transfer all sales if all sales is negatives' (!1192) from hotFix_withoutNegatives into master ... Reviewed-on: #1192	2022-11-30 13:53:11 +00:00
Alex Moreno	43bd583d6f	Merge branch 'dev' into 4875-skip-tests	2022-11-30 13:49:59 +00:00
Pau	79f8e30ded	add pending to the tests	2022-11-30 14:49:00 +01:00
Pau	67384b724d	refs #4875 skipped failing test	2022-11-30 14:41:03 +01:00
Alex Moreno	b769845a28	hotFix: not transfer all sales if all sales is negatives	2022-11-30 14:29:44 +01:00
Vicent Llopis	c1089c637a	fix: backTest	2022-11-30 13:43:29 +01:00
Vicent Llopis	1588492f9a	feat: solo añade los logs de salix con el model 'Sale'	2022-11-30 13:29:39 +01:00
Pau	9ed9c1a82c	Delete sendsms from core/components	2022-11-30 13:13:06 +01:00
Juan Ferrer	204eb52f78	Merge pull request 'refs #4550 fixed no ellipsize in agencyDescription' (!1191) from 4550-HOTFIX-collection-label into master ... Reviewed-on: #1191	2022-11-30 12:07:29 +00:00
Guillermo Bonet	23f429d94a	refs #4550 fixed no ellipsize in agencyDescription	2022-11-30 12:44:33 +01:00
Joan Sanchez	5423cc4298	Merge pull request 'refs #4550 changed font-family of collection-label' (!1187) from #4550-HOTFIX-collection-label-font into master ... Reviewed-on: #1187	2022-11-30 10:35:35 +00:00
Guillermo Bonet	0c8b066bc4	Merge branch 'master' into #4550-HOTFIX-collection-label-font	2022-11-30 10:32:49 +00:00
Guillermo Bonet	497e3e54a2	refs #4550 changes	2022-11-30 10:52:52 +01:00
Alex Moreno	67cf4ebbea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-11-30 10:28:21 +01:00
Pau	c68aa890b9	Merge pull request 'refs #4914 @1h' (!1190) from hotfix(#4914)-Bug-Client-Phone into dev ... Reviewed-on: #1190 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-30 09:13:17 +00:00
Joan Sanchez	53dc9eb0c7	Merge pull request 'fix balances' (!1189) from fix-balance into master ... Reviewed-on: #1189	2022-11-30 09:03:00 +00:00
Pau	97baa89a71	Merge branch 'dev' into hotfix(#4914)-Bug-Client-Phone	2022-11-30 09:52:19 +01:00
Alexandre Riera	492b852be8	delete orderBy	2022-11-30 09:22:53 +01:00
Pau	bef1071316	refs #4914 @1h	2022-11-30 09:22:03 +01:00
Alexandre Riera	27078595ce	fix balances	2022-11-30 08:39:04 +01:00
Vicent Llopis	5c1b88fa44	detele: fixtures en español	2022-11-30 08:21:53 +01:00
Guillermo Bonet	d0acd3e4c0	refs #4550 collection-label changes	2022-11-30 08:18:37 +01:00
Vicent Llopis	89e9722027	refactor: cambiados varchar por text, para q no falle en local	2022-11-30 08:14:38 +01:00
Vicent Llopis	f056c26b0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-11-30 08:03:16 +01:00
Pau	9d65d42922	Merge pull request 'fixes #4871 socialName-on-client-filter' (!1179) from 4871-socialName-on-client-filter into dev ... Reviewed-on: #1179 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-30 06:41:04 +00:00
Pau	1c4dbb5b4d	solve merge conflict	2022-11-30 07:28:48 +01:00
Pau	a676351e5b	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-30 07:24:26 +01:00
Pau	ace153996a	Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms	2022-11-30 07:12:27 +01:00
Pau	02598ced92	solve merge conficts	2022-11-30 07:12:26 +01:00
Alex Moreno	2ce0cc0122	Merge branch 'dev' into 4871-socialName-on-client-filter	2022-11-30 06:10:48 +00:00
Juan Ferrer	ebc40c20bb	Merge pull request 'refs #4613' (!1183) from 4613-Eliminar-calculo-portfoio into dev ... Reviewed-on: #1183 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-11-29 16:20:06 +00:00
Juan Ferrer	ba55ef04e3	Merge branch 'dev' into 4613-Eliminar-calculo-portfoio	2022-11-29 16:19:44 +00:00
Vicent Llopis	c258587e02	feat: plantilla email para asientos contables importados incorrectamente	2022-11-29 15:06:21 +01:00
Guillermo Bonet	b7fa4dca4c	refs #4550 changed font-family of collection-label	2022-11-29 14:16:44 +01:00
Pau	2d7b3cc3a2	Merge branch 'dev' into 4871-socialName-on-client-filter	2022-11-29 13:13:57 +00:00
Joan Sanchez	990dd88e2c	Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev ... Reviewed-on: #1186	2022-11-29 13:08:38 +00:00
Joan Sanchez	60d8eafa0f	Merge pull request 'master → test (Hacer primero)' (!1185) from master into test ... Reviewed-on: #1185	2022-11-29 13:08:07 +00:00
Joan Sanchez	5f3e7c3384	Merge branch 'test' into master	2022-11-29 11:49:06 +00:00
Guillermo Bonet	a9b4526493	Merge pull request 'refs #4550 collection-label fixes' (!1184) from #4550-HOTFIX-collection-label into master ... Reviewed-on: #1184	2022-11-29 11:23:27 +00:00
Pau	3596700513	Merge pull request 'fixes #4557 duplicate-tickets-in-routes' (!1169) from 4557-duplicate-tickets-in-routes into dev ... Reviewed-on: #1169 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-29 11:07:32 +00:00
Guillermo Bonet	2faacb169a	refs #4550 collection-label more fixes	2022-11-29 11:56:05 +01:00