18582 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	b14a8d9fec	Merge pull request 'fixes #5137 Avisos impresoras cuando hayan seleccionado una que no es principal' (!1514) from 5137-aviso-impresora into dev ... Reviewed-on: #1514 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-07 06:41:33 +00:00
Alex Moreno	abf454496d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-07 08:34:55 +02:00
Alexandre Riera	bfd421c188	Merge branch 'dev' into 5137-aviso-impresora	2023-06-07 06:30:43 +00:00
Carlos Satorres	cc27d1fa97	refs #5066 fix vehicle res.data	2023-06-07 08:30:37 +02:00
Alexandre Riera	46a3faea51	Merge pull request 'fixes #5507 this.vnConfig no tiene datos cargados al inicio de la aplicación' (!1565) from 5507-loadConfigAtStart into dev ... Reviewed-on: #1565 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-07 06:30:09 +00:00
Alexandre Riera	b036b1f7df	Merge branch 'dev' into 5507-loadConfigAtStart	2023-06-07 06:21:57 +00:00
Alexandre Riera	92a8e5f689	Merge pull request 'fix addFromBuy backTest' (!1593) from fix-addFromBuy-backTest into dev ... Reviewed-on: #1593 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-06-07 06:21:31 +00:00
Carlos Satorres	738b04af4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted	2023-06-07 08:15:50 +02:00
Carlos Satorres	d09075d490	Merge branch 'dev' into 5635-contadotTicketExpedition	2023-06-07 05:57:05 +00:00
Vicent Llopis	3805812aba	fix: backTest	2023-06-07 07:43:44 +02:00
Alexandre Riera	16ad082967	back fixed	2023-06-07 07:36:30 +02:00
Alexandre Riera	fd1e6122e8	Merge branch 'dev' into 5507-loadConfigAtStart	2023-06-07 05:19:13 +00:00
Alex Moreno	ac0e7ae32b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-07 07:08:02 +02:00
Alex Moreno	cb50c617ee	refs #5489 deprecate account.user.password	2023-06-06 15:09:01 +02:00
Alex Moreno	7311e79273	fix(vn-model): rewriteMethod	2023-06-06 15:07:54 +02:00
Alexandre Riera	bda1ed41ae	refs #5507 vnConfig moved to core	2023-06-06 14:14:31 +02:00
Alexandre Riera	2203f6cfef	Merge branch 'dev' into 5642-arreglar-e2e-ticketFuture-ticketAdvance	2023-06-06 11:48:32 +00:00
Alexandre Riera	9521548953	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5507-loadConfigAtStart	2023-06-06 13:41:00 +02:00
Carlos Satorres	4ae6b7c739	Merge pull request 'hotfixTicketColors' (!1591) from hotfixTicketColors into master ... Reviewed-on: #1591 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-06 11:13:52 +00:00
Vicent Llopis	b144948dcf	conflictos resueltos	2023-06-06 12:31:44 +02:00
Vicent Llopis	98af8ee10f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-06 12:31:20 +02:00
Vicent Llopis	391dba6d2c	refs #5561 feat: add async functions	2023-06-06 12:15:39 +02:00
Juan Ferrer	47fe77efde	Merge pull request 'master' (!1592) from master into test ... Reviewed-on: #1592	2023-06-06 10:09:53 +00:00
Vicent Llopis	024cb1e3f4	refs #5561 feat: permite modificar registros	2023-06-06 11:56:14 +02:00
Carlos Satorres	ab66ffa64a	Merge branch 'master' into hotfixTicketColors	2023-06-06 09:47:24 +00:00
Carlos Satorres	05111c9268	hotfix test front	2023-06-06 11:43:14 +02:00
Carlos Satorres	6f3704c365	hotfix colors ticket advance ticket future	2023-06-06 11:42:35 +02:00
Juan Ferrer	6ef7055bc9	refs #5563 Display show values in logs	2023-06-06 11:05:04 +02:00
Alexandre Riera	daf85368a0	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-06-06 08:40:07 +00:00
Alexandre Riera	6e4d7e8b01	refs #5749 added id	2023-06-06 10:31:08 +02:00
Alexandre Riera	a477bb32ad	Merge pull request 'fixes #5513 Crear back para añadir funcionalidad de Embalajes de la app' (!1504) from 5513-backs-embalajes into dev ... Reviewed-on: #1504 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-06 06:21:09 +00:00
Alexandre Riera	36b0216640	refs #5513 changed tests description	2023-06-06 07:40:38 +02:00
Alex Moreno	5d6eaca6b8	refs #5472 test(changePassword): e2e	2023-06-05 15:20:07 +02:00
Alexandre Riera	9c9a2d4fe2	Merge branch 'dev' into 5513-backs-embalajes	2023-06-05 12:25:50 +00:00
Alex Moreno	64abf4bf14	refs #5472 fix req.data.error.code	2023-06-05 13:21:52 +02:00
Carlos Satorres	4d333c3a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-05 10:38:59 +02:00
Carlos Satorres	d6cde764d7	refs #5334 changelog	2023-06-05 10:38:08 +02:00
Vicent Llopis	5eac9d20dc	a	2023-06-05 09:43:39 +02:00
Vicent Llopis	b253ea8edf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-06-05 09:40:23 +02:00
Alexandre Riera	15b5f10a93	refs #5513 addFromBuy back added	2023-06-05 09:10:19 +02:00
Carlos Satorres	8afd149954	Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-05 09:06:45 +02:00
Carlos Satorres	2545a40087	Merge branch 'dev' into 5334-editDepartment	2023-06-05 07:00:27 +00:00
Juan Ferrer	fe32a2af05	refs #5667 RoleInherit & Sms: Translations added	2023-06-05 08:35:07 +02:00
Carlos Satorres	d8f5978284	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-05 08:30:12 +02:00
Carlos Satorres	c1cda1a3ff	refs #5334 basicData e2e	2023-06-05 08:29:56 +02:00
Alex Moreno	91b0e3013a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-05 08:11:47 +02:00
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Carlos Satorres	9ef51f5600	remove fdescribe puppeter	2023-06-05 07:55:53 +02:00
Carlos Satorres	5798b28c5e	refs #5334 baicData e2e	2023-06-05 07:51:15 +02:00
Juan Ferrer	47c6ad6a71	refs #5667 Translation fix	2023-06-02 15:48:27 +02:00