16604 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	7d2076ff90	Merge pull request '232402_test_to_dev' (!1637) from 232402_test_to_dev into dev ... Reviewed-on: #1637 Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>	2023-06-26 10:10:53 +00:00
Alex Moreno	224a44847d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-26 11:56:07 +02:00
Alex Moreno	ecf742959c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-06-26 11:55:28 +02:00
Alex Moreno	ef8e1c4169	refs #5531 refs #5753 fix travelConfig sql	2023-06-26 10:57:12 +02:00
Juan Ferrer	e980717d14	refs #5900, #5772 Changelog updated	2023-06-26 10:56:53 +02:00
Carlos Satorres	88e845b511	change applyFilters	2023-06-26 10:49:09 +02:00
Juan Ferrer	c42b38c5cc	refs #5900 Code clean, refactor & accurated	2023-06-26 10:23:34 +02:00
Guillermo Bonet	e54e0784bf	Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs	2023-06-26 10:06:41 +02:00
Guillermo Bonet	cc5021a75f	refs #5684 Removed xxxLog.create and dependences	2023-06-26 09:40:55 +02:00
Alex Moreno	798481b24a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-26 07:53:44 +02:00
Juan Ferrer	630ce40ef7	Merge branch 'test' into 5900-removeDuplicatedLogs	2023-06-25 20:00:02 +02:00
Juan Ferrer	544445c4ae	refs #5800 Origin separator style more clear	2023-06-25 19:52:14 +02:00
Juan Ferrer	d69cbe0ad4	refs #5900 Origin separator style fix	2023-06-25 19:39:27 +02:00
Juan Ferrer	e32a29fc09	refs #5900 Remove duplicated logs	2023-06-25 19:08:13 +02:00
Juan Ferrer	efe0966069	refs #5900 Removed code to split user changes based on date	2023-06-25 19:01:46 +02:00
Juan Ferrer	c15d9a4753	refs #5900 Log order fix	2023-06-25 18:49:38 +02:00
Juan Ferrer	631c0e3121	refs #5900 Log grouping fix	2023-06-25 18:09:28 +02:00
Juan Ferrer	fd69d69ff0	refs #5900 Style: margin adjustments	2023-06-25 17:40:09 +02:00
Juan Ferrer	d31d1e5a13	refs #5900 User avatar margin fix	2023-06-25 17:25:11 +02:00
Juan Ferrer	57277ceb2e	refs #5900 Show user every 6 changes, model info margin fix	2023-06-25 17:17:04 +02:00
Juan Ferrer	df049201f1	refs #5900 Optimization: remove unnecessary watcher	2023-06-25 17:14:41 +02:00
Juan Ferrer	21988fba8c	refs #5900 Hide PIT button on insert actions	2023-06-25 17:11:01 +02:00
Juan Ferrer	98301f8e70	refs #5900 Small fixes & code clean	2023-06-25 17:06:38 +02:00
Juan Ferrer	f70df714df	refs #5772, #5900 InvoiceOut back test removed, logs improved	2023-06-25 16:31:24 +02:00
Juan Ferrer	7660d76850	refs #5772 Test environment fix	2023-06-23 22:52:03 +02:00
Juan Ferrer	665339c8d2	refs #5772 Fix for unhandled ENOENT error	2023-06-23 22:02:33 +02:00
Juan Ferrer	c9f11830a2	refs #5772 smtp.send() error throw flow fix	2023-06-23 20:03:56 +02:00
Juan Ferrer	2fec5bf2aa	Merge pull request 'refs #5772 test into dev' (!1633) from test into dev ... Reviewed-on: #1633	2023-06-23 09:51:44 +00:00
Juan Ferrer	8c0e8e9e12	refs #5772 Fixes fetching parallelism from front	2023-06-23 11:50:40 +02:00
Juan Ferrer	47a4a9950f	refs #5772 Parallelism added to PDF generation	2023-06-23 11:42:30 +02:00
Pablo Natek	16af0c5d6c	Merge branch 'dev' into 5347-clientCreate-→-client_create	2023-06-22 16:02:30 +00:00
Pablo Natek	203e80afa8	refs #5347	2023-06-22 17:56:45 +02:00
Pablo Natek	f0fec2cdd6	refs #5347	2023-06-22 17:46:21 +02:00
Pablo Natek	f6cc59eafb	refs #5347	2023-06-22 16:23:36 +02:00
Carlos Satorres	beb173f6ce	refs #5334 quit e2e no necesario	2023-06-22 15:20:28 +02:00
Vicent Llopis	d9b1f4b8a1	refs #5688 fix: test e2e	2023-06-22 15:06:27 +02:00
Carlos Satorres	137e01e60c	refs #5334 fix acl, filter	2023-06-22 15:00:59 +02:00
Pablo Natek	27946c0062	Refs #5347	2023-06-22 15:00:15 +02:00
Carlos Satorres	cce837686d	Merge pull request 'refs #5728 remove add, quit e2e' (!1598) from 5728-bugEntry/buy into dev ... Reviewed-on: #1598 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-22 12:53:06 +00:00
Vicent Llopis	d272121258	refs 5688 fix: e2e	2023-06-22 14:52:42 +02:00
Carlos Satorres	757360f3d1	Merge branch 'dev' into 5728-bugEntry/buy	2023-06-22 12:46:36 +00:00
Carlos Satorres	4931745cde	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-22 14:42:28 +02:00
Alex Moreno	344ba298f8	refs #5832 232801 init	2023-06-22 14:27:33 +02:00
Carlos Andrés	d4dceac74c	Merge pull request '5772-reduceInvoicePdfSize' (!1632) from 5772-reduceInvoicePdfSize into dev ... Reviewed-on: #1632 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-22 11:45:50 +00:00
Vicent Llopis	389b53ceff	refs #5772 fix: back test	2023-06-22 13:37:43 +02:00
Vicent Llopis	d26778e94e	refs #5688 fix: e2e	2023-06-22 13:30:53 +02:00
Carlos Andrés	12aa9c6b4b	Merge branch 'dev'	2023-06-22 13:23:03 +02:00
Carlos Andrés	b7cd32f4ce	refs #5772 eliminar tags en report invoice	2023-06-22 13:18:16 +02:00
Vicent Llopis	2d21da1faa	Merge pull request '5528-entry.latest-buys_fixEditBuys' (!1611) from 5528-entry.latest-buys_fixEditBuys into dev ... Reviewed-on: #1611 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-22 10:53:57 +00:00
Vicent Llopis	591fc14ffa	refs #5772 refactor: movido codigo para enviar rocket al back	2023-06-22 12:48:50 +02:00