16743 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	653c37f048	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-06-08 13:12:59 +02:00
Carlos Satorres	7ea7816800	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5728-bugEntry/buy	2023-06-08 12:49:28 +02:00
Juan Ferrer	32a0955c1d	refs #5667 Zone translations fixed	2023-06-08 12:48:14 +02:00
Alex Moreno	3e39564695	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-08 12:39:36 +02:00
Alex Moreno	dd72ac9107	refs #5809 version 232601 init	2023-06-08 10:48:35 +02:00
Carlos Satorres	9cdaf2e519	refs #5728 fix e2e buy	2023-06-08 10:45:27 +02:00
Carlos Satorres	0afc26e20c	refs #5728 remove add, quit e2e	2023-06-08 10:30:03 +02:00
Alex Moreno	5ba8a15316	refs #5809 deploy 232401 dev in test	2023-06-08 10:25:25 +02:00
Vicent Llopis	cf559b2ba5	refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono	2023-06-08 09:19:57 +02:00
Vicent Llopis	8b92b35e29	Merge pull request '5252-canRefund_withOutWarehouse2' (!1567) from 5252-canRefund_withOutWarehouse2 into dev ... Reviewed-on: #1567 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-06-08 05:25:19 +00:00
Vicent Llopis	a88166cdb5	Merge branch 'dev' into 5252-canRefund_withOutWarehouse2	2023-06-08 05:15:24 +00:00
Juan Ferrer	9a63ce86aa	refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models	2023-06-07 23:54:27 +02:00
Juan Ferrer	980ea67c24	Merge pull request 'test' (!1596) from test into dev ... Reviewed-on: #1596	2023-06-07 21:02:22 +00:00
Juan Ferrer	2b70bfb3c2	Merge pull request 'master' (!1595) from master into test ... Reviewed-on: #1595	2023-06-07 21:01:47 +00:00
Vicent Llopis	0dbd3abd65	refs #5808 fix: corregido el condicional	2023-06-07 15:06:37 +02:00
Vicent Llopis	e2c7a38e82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2	2023-06-07 14:18:36 +02:00
Vicent Llopis	bd4eee6606	refs #5252 eliminado warehouseFk = 1 por defecto #5252	2023-06-07 14:17:46 +02:00
Alex Moreno	e3562f9c32	Merge branch '5472-user_passExpired' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-07 13:44:55 +02:00
Alex Moreno	60024f8454	typo	2023-06-07 13:44:52 +02:00
Alex Moreno	1240a6b71a	Merge branch 'dev' into 5472-user_passExpired	2023-06-07 11:44:47 +00:00
Alex Moreno	edc601fd5d	refs #5489 fix(account/sync), fix(order) catalog-search-panel popover	2023-06-07 13:34:13 +02:00
Vicent Llopis	3fdb546d86	refs #5554 refactor: eliminado vnTokenCreated y añadido a vnToken.created	2023-06-07 10:28:29 +02:00
Carlos Satorres	4e08f51848	Merge branch 'dev' into 5635-contadotTicketExpedition	2023-06-07 07:16:13 +00:00
Vicent Llopis	7cf85eeef8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-07 09:03:33 +02:00
Alexandre Riera	7121b1e516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-07 08:50:53 +02:00
Alexandre Riera	0bc4570706	Merge pull request 'fixes #5642 Arreglar e2e ticket Advance y ticket Future' (!1525) from 5642-arreglar-e2e-ticketFuture-ticketAdvance into dev ... Reviewed-on: #1525 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-07 06:48:00 +00:00
Alexandre Riera	c9f8555194	Merge branch 'dev' into 5642-arreglar-e2e-ticketFuture-ticketAdvance	2023-06-07 06:44:22 +00:00
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
Juan Ferrer	47fe77efde	Merge pull request 'master' (!1592) from master into test ... Reviewed-on: #1592	2023-06-06 10:09:53 +00:00
Carlos Satorres	ab66ffa64a	Merge branch 'master' into hotfixTicketColors	2023-06-06 09:47:24 +00:00