15075 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	695444f6ae	refs #5184 back and front tests added	2023-03-28 11:34:14 +02:00
Alexandre Riera	6f2de903bc	refs #5184 working on search panel	2023-03-27 14:29:22 +02:00
Vicent Llopis	4bc24b02f6	Merge pull request '5395-travel.extra-community' (!1400) from 5395-travel.extra-community into dev ... Reviewed-on: #1400 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-24 11:14:08 +00:00
Vicent Llopis	a32dea0acd	Merge branch 'dev' into 5395-travel.extra-community	2023-03-24 11:00:22 +00:00
Vicent Llopis	9311a59a54	Merge pull request '4858-chat_realTime' (!1313) from 4858-chat_realTime into dev ... Reviewed-on: #1313 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-24 10:12:23 +00:00
Vicent Llopis	dca760d4e4	Merge branch 'dev' into 4858-chat_realTime	2023-03-24 10:02:51 +00:00
Vicent Llopis	6433e889c7	Merge pull request '5013-observaciones_facturas' (!1401) from 5013-observaciones_facturas into dev ... Reviewed-on: #1401 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-03-24 09:56:27 +00:00
Vicent Llopis	91cc91716f	Merge branch 'dev' into 5013-observaciones_facturas	2023-03-24 09:37:13 +00:00
Vicent Llopis	cbe79a964c	refs #5013 eliminado espacio en blanco al final de la cadena y añadidas fixtures	2023-03-24 10:31:02 +01:00
Joan Sanchez	00a0f88dc4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-24 10:03:23 +01:00
Joan Sanchez	e67a40714c	Claim log hotfix	2023-03-24 09:59:55 +01:00
Vicent Llopis	5784f05fd4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community	2023-03-24 08:34:04 +01:00
Vicent Llopis	dd412606ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5013-observaciones_facturas	2023-03-24 08:26:06 +01:00
Vicent Llopis	3b9a17e179	Merge pull request '5342-monitor.tickets_isFragile' (!1393) from 5342-monitor.tickets_isFragile into dev ... Reviewed-on: #1393 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-03-24 07:10:25 +00:00
Vicent Llopis	a45308c6a5	refs #5342 fix: testFront	2023-03-24 07:58:27 +01:00
Vicent Llopis	2513377add	Merge branch 'dev' into 5342-monitor.tickets_isFragile	2023-03-23 13:38:08 +00:00
Joan Sanchez	ea50da8a19	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-23 14:33:10 +01:00
Joan Sanchez	7ee33a77b1	Merge pull request 'fix tests logs' (!1408) from fix-tests-logs into dev ... Reviewed-on: #1408 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-23 12:47:05 +00:00
Joan Sanchez	4762f3b54f	fix(deliveryNote): ticket without delivery address	2023-03-23 13:33:14 +01:00
Joan Sanchez	83c1750aae	Merge pull request 'hotfix_claim.detail_noPermiteModificarReclamados' (!1409) from hotfix_claim.detail_noPermiteModificarReclamados into master ... Reviewed-on: #1409	2023-03-23 09:59:00 +00:00
Vicent Llopis	805df64bb2	fallo cantidad reclamados	2023-03-23 10:54:04 +01:00
Alexandre Riera	4e5364dc0b	refs #5036 fix tests logs	2023-03-23 10:05:02 +01:00
Vicent Llopis	2b73fb5a7e	Merge branch 'dev' into 5013-observaciones_facturas	2023-03-23 08:29:23 +00:00
Vicent Llopis	46e61543a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile	2023-03-23 09:29:03 +01:00
Vicent Llopis	7e37d7f3f1	refs #5342 actualido el itemType.isFragile para las 'plants'	2023-03-23 09:25:56 +01:00
Joan Sanchez	7b5e0bae8e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-23 08:20:33 +01:00
Joan Sanchez	72b30c91a2	Merge pull request 'hotfix-added-grabUser-logs' (!1404) from hotfix-added-grabUser-logs into test ... Reviewed-on: #1404 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-23 06:11:48 +00:00
Vicent Llopis	d98bd7b92b	Merge branch 'dev' into 5013-observaciones_facturas	2023-03-23 06:04:20 +00:00
Joan Sanchez	fcd422eb49	added relation	2023-03-22 14:55:54 +01:00
Vicent Llopis	27bb50ad12	refs #5342 esta tabla ya se borra en el proc	2023-03-22 12:17:48 +01:00
Vicent Llopis	56565ed47a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile	2023-03-22 12:16:58 +01:00
Alexandre Riera	60eabbf7a0	Merge branch 'test' into hotfix-added-grabUser-logs	2023-03-22 10:37:57 +00:00
Alexandre Riera	81472a5e50	removed duplicated log	2023-03-22 11:36:28 +01:00
Alexandre Riera	59c3ef23de	grabUser added	2023-03-22 11:03:13 +01:00
Alexandre Riera	48f7c4d251	Merge pull request 'fixes e2e' (!1402) from fix-e2e into dev ... Reviewed-on: #1402 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-22 09:58:05 +00:00
Vicent Llopis	d276c7b611	refs #5342 unificados proc x_getWarnings	2023-03-22 10:57:18 +01:00
Vicent Llopis	2559be8230	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile	2023-03-22 10:29:21 +01:00
Vicent Llopis	eb910e1b4d	refs #5395 add changelog	2023-03-22 10:25:04 +01:00
Vicent Llopis	18afcbabc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community	2023-03-22 10:20:55 +01:00
Alexandre Riera	5598bbaaa8	fix e2e	2023-03-22 10:13:37 +01:00
Vicent Llopis	c8eb6dfb31	refs #5013 borrado changes sql, pq fallan los test de back	2023-03-22 09:24:28 +01:00
Vicent Llopis	9ef5c0c560	refs #5013 mostrar las observaciones del ticket	2023-03-22 09:07:22 +01:00
Vicent Llopis	1d0024c538	refs #5013 feat: añadida observacion para cada ticket	2023-03-21 14:08:34 +01:00
Vicent Llopis	4141a97356	refs #4858 fix: backTest	2023-03-21 11:37:26 +01:00
Vicent Llopis	32e2d1c0fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime	2023-03-21 11:26:41 +01:00
Vicent Llopis	d1f0ae3865	refs #4858 fix: filtro corregido	2023-03-21 11:26:25 +01:00
Joan Sanchez	d209b35071	Merge pull request 'refs #5423 añadido 3r decimal' (!1392) from #5423-tercerDecimalCoste into dev ... Reviewed-on: #1392 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-21 10:22:37 +00:00
Joan Sanchez	82a674e2f6	Merge pull request 'refs #5073 adaptacion para solo el año' (!1397) from 5073-diaActual into dev ... Reviewed-on: #1397 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-21 10:21:59 +00:00
Joan Sanchez	46b40c03a7	Merge pull request '5241-virtual_pos' (!1399) from 5241-virtual_pos into dev ... Reviewed-on: #1399 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-03-21 09:35:19 +00:00
Joan Sanchez	3a922b453f	Merge branch 'dev' into 5241-virtual_pos	2023-03-21 09:10:34 +00:00