15566 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	ca30aaa18a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-04-05 08:39:43 +02:00
Carlos Satorres	77b91b77b2	refs #5439 requesterFk solve	2023-04-05 08:19:50 +02:00
Vicent Llopis	e97b5a9f80	refs #5275 fix backTest	2023-04-05 07:54:56 +02:00
Vicent Llopis	28a12d0706	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor	2023-04-05 07:36:53 +02:00
Alexandre Riera	8f4de7e7e9	refs #5259 undo delete, update trigger	2023-04-04 15:27:10 +02:00
Alexandre Riera	589e996b69	refs #5259 minor fix	2023-04-04 15:17:19 +02:00
Juan Ferrer	d0c94b985d	Merge pull request 'fixes #5529 Fixes: missing awaits, buffer-to-file' (!1422) from 5529-invoicingFixes into master ... Reviewed-on: #1422 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-04 13:13:30 +00:00
Carlos Andrés	e342852ed8	Merge branch 'master' into 5529-invoicingFixes	2023-04-04 13:05:49 +00:00
Joan Sanchez	d464818ddb	Merge pull request 'hotfix_sendMail_insertsIntoWorkerTimeControlMail' (!1419) from hotfix_sendMail_insertsIntoWorkerTimeControlMail into master ... Reviewed-on: #1419 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-04 13:02:18 +00:00
Carlos Andrés	0372d44415	fixes #5529 Fixes: missing awaits, buffer-to-file	2023-04-04 15:00:28 +02:00
Alexandre Riera	81cf35f2d3	refs #5259 drop procedure invoiceOut_afterInsert	2023-04-04 14:55:37 +02:00
Alexandre Riera	eed1ecc208	refs #4954 trigger modified	2023-04-04 14:47:13 +02:00
Vicent Llopis	14f966ab9a	Merge branch 'master' into hotfix_sendMail_insertsIntoWorkerTimeControlMail	2023-04-04 12:32:56 +00:00
Vicent Llopis	35d19e586a	add translatiojn	2023-04-04 14:27:16 +02:00
Vicent Llopis	7a274e2721	Merge branch 'dev' into 5410-client.defaulter_getChecked	2023-04-04 12:12:20 +00:00
Vicent Llopis	3630c7d398	refs #5410 creada ruta de back para enviar emails	2023-04-04 14:09:55 +02:00
Joan Sanchez	c126c6044a	Updated format	2023-04-04 13:55:44 +02:00
Joan Sanchez	b6cfab26d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-04-04 13:53:42 +02:00
Joan Sanchez	b49307463e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-04 13:53:25 +02:00
Joan Sanchez	e8f0a49f0c	fix(resetPassword): increased token TTL for password recovery ... Refs #5474	2023-04-04 13:51:44 +02:00
Vicent Llopis	c89f95a33e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-04-04 13:40:12 +02:00
Alexandre Riera	9380b88460	refs #5437 back and test deprecated	2023-04-04 12:40:03 +02:00
Vicent Llopis	0bfa4c54aa	fix: inserta en workerTimeControlMail	2023-04-04 09:52:46 +02:00
Alexandre Riera	ecbfdad102	refs #5418 changelog	2023-04-04 09:51:07 +02:00
Alexandre Riera	1a14c793cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price	2023-04-04 09:47:31 +02:00
Vicent Llopis	0db3bc5e26	refs #4856 fix test	2023-04-04 09:29:51 +02:00
Vicent Llopis	21b7050cfd	refs #4856 otros usuarios pueden actualizar el estado	2023-04-04 09:29:40 +02:00
Alexandre Riera	25df36eec9	Merge pull request 'fixes #5092 Listado tickets sin facturar' (!1368) from 5092-listado-ticketsSinFacturar into dev ... Reviewed-on: #1368 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-04 07:17:15 +00:00
Alexandre Riera	98f61ecfdb	refs #5092 changelog	2023-04-04 08:47:56 +02:00
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
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
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