17797 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	25e58f4f66	fix merge conflicts	2022-11-30 07:21:30 +01:00
Pau	cb7aa48fde	Solve merge conflicts	2022-11-30 07:13:56 +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	cc87565190	Merge branch 'dev' into 4732-previa-label	2022-11-29 14:16:15 +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
Pau	18a23cf8b5	add some right padding to prevent the printer from cutting the label	2022-11-29 13:47:53 +01: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
Alexandre Riera	cd8d5efa88	corrections	2022-11-29 10:29:18 +01:00
Pau	ddc543ad63	Merge branch 'dev' into 4557-duplicate-tickets-in-routes	2022-11-29 08:22:05 +00:00
Vicent Llopis	5e864a672b	Merge pull request 'DEV_fix_deleteTrashFiles' (!1177) from DEV_fix_deleteTrashFiles into dev ... Reviewed-on: #1177 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-29 08:08:01 +00:00
Alexandre Riera	acbd0474a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-29 08:50:48 +01:00
Vicent Llopis	2801e11965	Merge branch 'dev' into DEV_fix_deleteTrashFiles	2022-11-29 07:43:50 +00:00
Vicent Llopis	1c0d90cdf8	Merge pull request '4903-sendMail_refactor' (!1181) from 4903-sendMail_refactor into dev ... Reviewed-on: #1181 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-29 07:42:47 +00:00
Vicent Llopis	a218c086ce	Merge pull request 'TEST_fix_log' (!1182) from TEST_fix_log into test ... Reviewed-on: #1182 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-29 07:42:30 +00:00
Guillermo Bonet	b262b29627	refs #4550 collection-label fixes	2022-11-29 08:22:32 +01:00
Carlos Andrés	8a0c810a84	refs #4613	2022-11-28 17:45:19 +01:00
Alex Moreno	7f1478f2e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-11-28 14:48:37 +01:00
Vicent Llopis	a0f5cf1449	refactor: borrados saltos de linea	2022-11-28 14:48:37 +01:00
Vicent Llopis	c3d06ca5db	fix: crashea cuando el log no tiene changedModel	2022-11-28 14:47:23 +01:00
Pau	97cdbc4118	Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-11-28 14:34:15 +01:00
Vicent Llopis	e3e337c02e	fix: backTest	2022-11-28 14:28:47 +01:00
Pau	884286015f	fix labels not working on test data refs #4732 @2h	2022-11-28 14:01:38 +01:00
Vicent Llopis	4b54cf954b	refactor: envia el email con formato Verdnatura	2022-11-28 13:56:21 +01:00
Carlos Andrés	df6f836b59	Merge pull request '#4613 eliminar uso de portfolio' (!1178) from 4613-Eliminar-cálculo-portfolio into dev ... Reviewed-on: #1178 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-28 12:42:25 +00:00
Carlos Andrés	2a4e8cdde9	Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio	2022-11-28 12:19:58 +00:00
Alex Moreno	f9c311804a	Merge pull request '4077-login_recover-password & account_verifyEmail' (!1063) from 4077-login_recover-password into dev ... fixes #4077	2022-11-28 11:34:01 +00:00
Alex Moreno	d9e4ff6772	fix: use $location	2022-11-28 11:48:25 +01:00
Carlos Andrés	6b76804913	refs #4865 Sintaxis mensajes rocket	2022-11-28 10:52:15 +01:00
Pau	6675095b45	Merge branch 'dev' into 4871-socialName-on-client-filter	2022-11-28 09:52:10 +00:00
Pau	aa100891cd	refs #4871 @1h test passed	2022-11-28 10:47:32 +01:00
Pau	0d6e424a3e	allow client search by socialname	2022-11-28 10:21:01 +01:00
Alex Moreno	e49cbbaa80	Merge branch '4613-Eliminar-cálculo-portfolio' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:14:35 +01:00
Alex Moreno	da2d1df522	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:14:16 +01:00
Carlos Andrés	bc83b9fd1f	Merge branch '4613-Eliminar-cálculo-portfolio' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:07:21 +01:00
Carlos Andrés	2b0e6ab5ed	test	2022-11-28 10:07:18 +01:00
Alex Moreno	e4bbb6e83a	Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio	2022-11-28 08:43:55 +00:00
Pau	aee7cd113e	add template strings to sql	2022-11-28 09:33:14 +01:00
Joan Sanchez	7121dcb25c	Merge pull request 'MASTER_-fix_sendMail' (!1176) from MASTER_-fix_sendMail into master ... Reviewed-on: #1176	2022-11-28 08:06:17 +00:00
Vicent Llopis	d58e567295	fix: maneja si el dms no tiene file. Simplemente borra el registro	2022-11-28 08:51:04 +01:00