15695 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	32df51ecca	refs #5092 moved sql	2023-04-04 08:40:51 +02:00
Alexandre Riera	24f576a4b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-04-04 08:40:03 +02:00
Vicent Llopis	d1100384bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2	2023-04-04 08:27:27 +02:00
Vicent Llopis	862101c4b0	refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador	2023-04-03 21:29:02 +02:00
Juan Ferrer	ae22c58ecb	refs #5517 JSON value component code clean, max str len increased	2023-04-03 18:48:40 +02:00
Juan Ferrer	7f18366ece	refs #5517 Relative dates, style fixes	2023-04-03 18:40:50 +02:00
Joan Sanchez	f4ff869c4d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-03 08:55:51 +02:00
Joan Sanchez	02a1bcbfd3	fix(setPassword): proper access type ... Refs #5471	2023-04-03 08:54:15 +02:00
Juan Ferrer	12074bd0f4	refs #5517 vnLog: watchers fixes	2023-04-03 04:13:09 +02:00
Juan Ferrer	5b80951e3e	refs #5517 vnLog: View improved	2023-04-03 03:54:35 +02:00
Carlos Satorres	9944e9a645	Merge branch 'dev' into 5250-observacionesWorker	2023-03-31 13:03:57 +00:00
Joan Sanchez	0ea30552dd	Eslint as default formatter	2023-03-30 14:57:53 +02:00
Joan Sanchez	8b4c70e8ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-30 14:57:00 +02:00
Vicent Llopis	67689695e4	refs #5275 filtra por defecto por el this.vnConfig.warehouseFk	2023-03-30 14:29:19 +02:00
Vicent Llopis	e1bfdc3f3c	eliminada variable que no se usa	2023-03-30 11:13:40 +02:00
Joan Sanchez	6ff6004627	Added version 2314.01	2023-03-30 08:35:04 +02:00
Carlos Satorres	60383eda0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker	2023-03-30 08:26:45 +02:00
Carlos Satorres	4edb2463b8	refs #5250 eliminacion isEnabled	2023-03-30 08:23:53 +02:00
Vicent Llopis	5a67f47305	refs #4856 fix: actualizar estado a 'SENDED' movido al back	2023-03-30 08:14:17 +02:00
Joan Sanchez	6aca23e466	Merge pull request 'fixes #5056 Nuevo sistema de sacado de pedidos: Gestión de vagones' (!1386) from 5056-gestion-vagones into dev ... Reviewed-on: #1386 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-30 05:23:29 +00:00
Joan Sanchez	cafb21d90b	Merge pull request 'fixes #5206 travel buscador en el lateral' (!1384) from 5206-travel-buscadorLateral into dev ... Reviewed-on: #1384 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-30 05:21:24 +00:00
Joan Sanchez	26bddef5e5	Merge pull request 'refs #5425 modificacion de los campos' (!1394) from 5425-modCamposBasicos(pesoycaja) into dev ... Reviewed-on: #1394 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:50 +00:00
Joan Sanchez	ea60e31361	Merge pull request '5432-propiedadesBotonMas' (!1396) from 5432-propiedadesBotonMas into dev ... Reviewed-on: #1396 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:28 +00:00
Joan Sanchez	3bab90f9e5	Merge pull request '5416-supplierAccount_isPayMethodChecked' (!1411) from 5416-supplierAccount_isPayMethodChecked into dev ... Reviewed-on: #1411 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:07 +00:00
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
Carlos Satorres	9be06c6f4b	refs #084200 arreglo lang	2023-03-29 12:07:45 +02:00
Carlos Satorres	71220c58f7	refs #084200 inserts	2023-03-29 12:00:01 +02:00
Vicent Llopis	d066c4ea0b	refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'	2023-03-29 11:27:48 +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
Vicent Llopis	3b615d9879	refs #5275 fix: actualiza correctamete los elementos del checkedDummy	2023-03-29 09:11:40 +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
Vicent Llopis	c53c54b6cd	refs #5275 feat: modificar masivamente	2023-03-28 14:59:08 +02:00
Carlos Satorres	bf5f1011e8	refs #5490 traducción corregida	2023-03-28 14:56:20 +02:00
Vicent Llopis	b4e04fcdad	refs #5275 feat: colorear fechas	2023-03-28 14:40:14 +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
Pablo Natek	2c01ebf681	Merge branch 'dev' into 5075-client_balance	2023-03-28 13:26:17 +02:00
Alexandre Riera	695444f6ae	refs #5184 back and front tests added	2023-03-28 11:34:14 +02:00
Vicent Llopis	fb1b39da17	refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto	2023-03-28 10:30:02 +02:00
Carlos Satorres	809c24f6cf	Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker	2023-03-28 10:07:18 +02:00