16129 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	06d1334e1f	refs #4764 withWarehouse	2023-06-09 14:30:46 +02:00
Carlos Satorres	9ca82a2f79	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-09 14:23:55 +02:00
Carlos Satorres	61d9e2dcd3	refs #4764 remake refund, back front	2023-06-09 14:19:17 +02:00
Carlos Satorres	edb06a894a	Merge pull request '5760-changesSMS' (!1601) from 5760-changesSMS into dev ... Reviewed-on: #1601 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-09 11:26:51 +00:00
Carlos Satorres	9b4c4496b6	Merge branch 'dev' into 5760-changesSMS	2023-06-09 11:16:02 +00:00
Pablo Natek	b81b6c7020	Merge pull request 'refs #5735 fix currency' (!1570) from 5735-creditFormat into dev ... Reviewed-on: #1570 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-09 07:31:02 +00:00
Carlos Satorres	a06cd1929f	Merge branch 'dev' into 5760-changesSMS	2023-06-09 07:11:33 +00:00
Pablo Natek	9aadd71356	Merge branch 'dev' into 5735-creditFormat	2023-06-09 07:08:42 +00:00
Juan Ferrer	d083ba795d	Merge pull request 'refs #5667 UI improved, filter by record' (!1600) from test into dev ... Reviewed-on: #1600	2023-06-09 06:31:47 +00:00
Carlos Satorres	c66feb53f0	refs #5760 fix fixtures	2023-06-09 08:29:18 +02:00
Carlos Satorres	ec9dfa90fd	refs #5760 fixtures	2023-06-09 08:06:45 +02:00
Pablo Natek	ac67a2606f	Merge branch 'dev' into 5735-creditFormat	2023-06-09 07:11:13 +02:00
Juan Ferrer	9c007504ea	refs #5667 UI improved, filter by record	2023-06-09 01:22:36 +02:00
Carlos Satorres	bdffc0401f	refs #5760 update getChanges, traduccion	2023-06-08 15:29:03 +02:00
Alex Moreno	dd72ac9107	refs #5809 version 232601 init	2023-06-08 10:48:35 +02:00
Alex Moreno	5ba8a15316	refs #5809 deploy 232401 dev in test	2023-06-08 10:25:25 +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	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
Carlos Satorres	a34519f6d0	refs #4764 refundTicket	2023-06-07 14:12:04 +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
Alexandre Riera	bfd421c188	Merge branch 'dev' into 5137-aviso-impresora	2023-06-07 06:30:43 +00: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
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	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
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
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	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
Alexandre Riera	9c9a2d4fe2	Merge branch 'dev' into 5513-backs-embalajes	2023-06-05 12:25:50 +00: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
Alexandre Riera	15b5f10a93	refs #5513 addFromBuy back added	2023-06-05 09:10:19 +02:00
Juan Ferrer	fe32a2af05	refs #5667 RoleInherit & Sms: Translations added	2023-06-05 08:35:07 +02:00