16980 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	f37974c835	Merge branch 'dev' into 5468-account_privileges	2023-06-20 12:39:27 +00:00
Vicent Llopis	3462e49d23	Merge pull request '5554-renovar_token' (!1566) from 5554-renovar_token into dev ... Reviewed-on: #1566 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-20 12:38:46 +00:00
Vicent Llopis	556bdb52ce	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:18:46 +00:00
Robert Ferrús	004bfdbe1e	Merge pull request '5112-entryUpdateComission' (!1621) from 5112-entryUpdateComission into dev ... Reviewed-on: #1621 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-20 12:18:26 +00:00
Vicent Llopis	f6cb1cb130	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:07:52 +00:00
Vicent Llopis	4444b45b08	refs #4734 feat: se utiliza la libreria ejs y xmldom	2023-06-20 14:07:36 +02:00
Carlos Satorres	fa10070675	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted	2023-06-20 14:04:38 +02:00
Robert Ferrús	e83396de11	Merge branch 'dev' into 5112-entryUpdateComission	2023-06-20 10:00:34 +00:00
Juan Ferrer	2649db852f	refs #5772 Invoice PDF size reduced	2023-06-20 11:50:36 +02:00
Vicent Llopis	a4d3e8efd0	Merge pull request 'hotfix_errorEliminarTicket' (!1626) from hotfix_errorEliminarTicket into master ... Reviewed-on: #1626 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-20 09:40:00 +00:00
Vicent Llopis	62818a9414	Merge pull request '5697-monitores_quitarFiltroFecha' (!1625) from 5697-monitores_quitarFiltroFecha into dev ... Reviewed-on: #1625 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-20 09:29:28 +00:00
Vicent Llopis	e99627c0b2	codigo innecesario	2023-06-20 11:28:25 +02:00
Vicent Llopis	13e95bcd35	add vue commented code	2023-06-20 11:25:47 +02:00
Vicent Llopis	cea6fae649	fix: eliminada variable que no estaba definida	2023-06-20 10:40:57 +02:00
Carlos Satorres	a7d9bbc582	refs #5537 change cl c	2023-06-20 10:22:30 +02:00
Vicent Llopis	6c00e704cc	refs #5697 fix: eliminado por la columna fecha, que no se formatea correctamente	2023-06-20 09:42:08 +02:00
Carlos Satorres	f0f8b112cd	Merge branch 'dev' into 5334-editDepartment	2023-06-20 07:22:52 +00:00
Alex Moreno	5a6a18c76a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-20 09:20:54 +02:00
Alex Moreno	dcfb991f94	hotFix(getLeaves): remoteMethodCtx correct defined	2023-06-20 09:20:06 +02:00
Carlos Satorres	c63df30e5c	refs #5334 fix back	2023-06-20 09:19:20 +02:00
Carlos Satorres	a155f846c2	refs #5334 fix ctx	2023-06-20 09:15:37 +02:00
Robert Ferrús	ffbaa45320	refs #5112 changelog	2023-06-20 09:05:39 +02:00
Robert Ferrús	503054fe05	refs #5112 modificaciones entry_updateComission	2023-06-20 08:58:22 +02:00
Carlos Satorres	4537344790	merge	2023-06-20 08:20:13 +02:00
Carlos Satorres	7f20973650	refs #5334 merge	2023-06-20 08:16:36 +02:00
Vicent Llopis	8a2cab0e62	Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys	2023-06-20 05:30:55 +00:00
Vicent Llopis	c3af2e3c92	refs #4734 refactor: actualizada descripcion	2023-06-20 07:19:32 +02:00
Vicent Llopis	1ba19714da	refs #4734 feat: add acl	2023-06-20 07:11:45 +02:00
Alex Moreno	092471f74e	refs #5475 feat(account_changePassword): accessScope and backTest	2023-06-19 15:06:06 +02:00
Juan Ferrer	9fa6e2df71	refs #5595 VnModel.rawSql() bugfix	2023-06-19 14:54:32 +02:00
Vicent Llopis	cfe340eeff	refs #4734 feat: xml en otro archivo	2023-06-19 14:27:24 +02:00
Alex Moreno	63888e2d64	refs #5595 console.log(orderFk, userId) for rawSQL logs	2023-06-19 13:52:25 +02:00
Carlos Satorres	168e7f1929	changelog	2023-06-19 13:48:54 +02:00
Carlos Satorres	3701acd26e	refs #5334 error getLeaves solve	2023-06-19 13:48:14 +02:00
Carlos Satorres	98125f8974	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-19 13:22:41 +02:00
Carlos Satorres	d4cc9cf82a	change log remove	2023-06-19 13:21:26 +02:00
Vicent Llopis	303be74382	refs #4734 refactor: use loopback instead of	2023-06-19 11:55:07 +02:00
Sergio De la torre	b6c8ca20ee	refs #5339 data	2023-06-19 08:58:20 +02:00
Robert Ferrús	068eca80ab	Merge branch 'dev' into 5112-entryUpdateComission	2023-06-19 05:21:18 +00:00
Alex Moreno	2197441159	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-19 07:20:00 +02:00
Alex Moreno	70413fe0d6	Merge pull request 'refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType' (!1604) from warnFix_ticket_sale_orderBy into test ... Reviewed-on: #1604 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-19 05:12:41 +00:00
Alex Moreno	ee1b901dea	refs #5475 feat(account_changePassword): accessScope	2023-06-16 14:31:14 +02:00
Vicent Llopis	219ad75172	a	2023-06-16 14:30:33 +02:00
Vicent Llopis	ab68cb7165	refs #4734 fix: manejo errores	2023-06-16 14:27:29 +02:00
Vicent Llopis	90ce0d1c27	refs #4734 refactor: consulta con loopback	2023-06-16 14:24:47 +02:00
Vicent Llopis	1027e0753e	test in paralel	2023-06-16 14:06:36 +02:00
Vicent Llopis	998597dfcc	refs #4734 recator: cambiado nombre ruta	2023-06-16 13:49:21 +02:00
Alex Moreno	dd157d59d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-16 13:42:13 +02:00
Juan Ferrer	b1b9bf106a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-16 13:39:26 +02:00
Juan Ferrer	081cf43ece	refs #5667 SupplierAccount translation added	2023-06-16 13:39:24 +02:00