13550 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	d7a6350995	refs #4898 Created report expedition-pallet-label	2022-12-12 18:27:45 +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
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
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
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
Guillermo Bonet	d0acd3e4c0	refs #4550 collection-label changes	2022-11-30 08:18:37 +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
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
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
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
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
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
Vicent Llopis	e3e337c02e	fix: backTest	2022-11-28 14:28:47 +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
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