15179 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	30a4356139	Merge pull request 'fixes #5184 InvoiceIn crear seccion invoiceIn serial' (!1414) from 5184-invoiceIn-serial into dev ... Reviewed-on: #1414 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:18:44 +00:00
Joan Sanchez	6366af9a15	Merge pull request 'refs #5490 traducción corregida' (!1415) from 5490-arregloExpedition into dev ... Reviewed-on: #1415 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-30 05:18:21 +00:00
Vicent Llopis	14f64e8efa	Merge branch 'dev' into 5416-supplierAccount_isPayMethodChecked	2023-03-30 05:04:14 +00:00
Joan Sanchez	cc759373a1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-29 15:20:57 +02:00
Joan Sanchez	1258dd54b6	Merge pull request 'fix(sqlConnector): handled malformed json parse' (!1417) from 4862-sqlconnector_all into master ... Reviewed-on: #1417 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-03-29 13:10:13 +00:00
Joan Sanchez	d5fd15224e	fix(sqlConnector): handled malformed json parse ... Refs #4862	2023-03-29 14:57:14 +02:00
Joan Sanchez	b70acc5c46	Merge pull request '5464-hotfix_closeTicket' (!1416) from 5464-hotfix_closeTicket into master ... Reviewed-on: #1416 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-29 12:42:27 +00:00
Vicent Llopis	b0d205c4da	refs #5464 fix: utiliza una sola cookie	2023-03-29 13:36:23 +02:00
Vicent Llopis	8f2735e126	Merge pull request '5331-monitor.tickets_actualizarFiltro' (!1410) from 5331-monitor.tickets_actualizarFiltro into dev ... Reviewed-on: #1410 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-03-29 07:52:14 +00:00
Vicent Llopis	bab4814662	Merge branch 'dev' into 5416-supplierAccount_isPayMethodChecked	2023-03-29 07:34:55 +00:00
Vicent Llopis	b8da868095	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro	2023-03-29 09:22:23 +02:00
Alexandre Riera	9a713d2753	refs #5184 stmts removed	2023-03-29 08:48:54 +02:00
Alexandre Riera	3ad85c0de3	refs #5184 subselect deleted	2023-03-29 08:44:35 +02:00
Carlos Satorres	bf5f1011e8	refs #5490 traducción corregida	2023-03-28 14:56:20 +02:00
Alexandre Riera	4a84ceba53	Merge branch 'dev' into 5184-invoiceIn-serial	2023-03-28 11:46:11 +00:00
Alexandre Riera	69be91b964	refs #5184 fix back test, added e2e	2023-03-28 13:45:26 +02:00
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	ec4b76a0f8	Merge pull request 'fix e2e: cambiado el ticket id' (!1413) from fix_e2e into dev ... Reviewed-on: #1413 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-03-27 10:41:08 +00:00
Vicent Llopis	4cc5bff914	delete focus	2023-03-27 12:14:06 +02:00
Vicent Llopis	93a34d6235	fix e2e: cambiado el ticket id	2023-03-27 12:13:20 +02:00
Alexandre Riera	8b4121e021	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-27 08:38:35 +02:00
Alexandre Riera	39af68c3dc	Merge branch 'dev' into 5056-gestion-vagones	2023-03-27 05:39:22 +00:00
Vicent Llopis	c65f01b689	refs #5416 delete: supplierAccount triggers	2023-03-24 12:30:18 +01:00
Vicent Llopis	871618b122	fix: faltaba el esquema	2023-03-24 12:29:58 +01: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
Vicent Llopis	925774c75b	refs #5331 add changelog	2023-03-24 10:16:39 +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
Alexandre Riera	cfe4570d3b	refs #5206 e2es fixed	2023-03-24 09:21: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
Alexandre Riera	0baccc4745	refs #5206 fix tests front	2023-03-24 08:25:37 +01:00
Alexandre Riera	8f2398bc8c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-24 08:12:50 +01:00
Vicent Llopis	92aed3eac1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro	2023-03-24 08:11:35 +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	0f6092483c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro	2023-03-24 07:51:31 +01:00
Alexandre Riera	74312a3cdf	refs #5056 changed acl	2023-03-24 07:30:35 +01:00
Alexandre Riera	24d032910a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-23 14:58:31 +01:00
Vicent Llopis	afdfe5e3f3	refs #5331 al filtrar por 'Pendiente' no muestra los estados 'Previa x'	2023-03-23 14:55:19 +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
Alexandre Riera	6738243534	refs #5206 added e2e	2023-03-23 14:30:58 +01:00