8111 Commits

Author	SHA1	Message	Date
Jorge Penadés	932b993723	Merge branch 'dev' into 6515-hasAnyNegativeBase	2024-01-04 11:45:38 +00:00
Javier Segarra	f7d83b15bd	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-04 08:08:46 +00:00
Alex Moreno	23b544c1ec	refs #6635 fix: add translation	2024-01-04 08:19:48 +01:00
Alex Moreno	227afbe39d	refs #5914 fix(invoiceOut_descriptorMenu): transalation	2024-01-03 14:54:01 +01:00
Alex Moreno	af784522c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2024-01-03 14:52:16 +01:00
Javier Segarra	4d7f0329ee	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-03 12:46:26 +00:00
Guillermo Bonet	a6ebd01ebd	Merge branch 'test' into dev	2024-01-03 13:28:23 +01:00
Alex Moreno	ba26237998	refs #5914 refactor: getTaxBases	2024-01-03 12:19:28 +01:00
Guillermo Bonet	f73a447391	refs #6398 Hotfix 1/2	2024-01-03 11:57:49 +01:00
Jorge Penadés	5dc49d226a	refs #6274 fix locale	2024-01-03 10:13:56 +01:00
Alex Moreno	121caee93a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2024-01-03 09:53:52 +01:00
Jorge Penadés	23854cb103	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase	2024-01-03 09:02:52 +01:00
Jorge Penadés	b086da1936	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2024-01-03 08:57:46 +01:00
Alex Moreno	399ca694ab	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-01-03 08:38:01 +01:00
Alex Moreno	f607719efe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2024-01-03 08:34:00 +01:00
Carlos Satorres	12165ab382	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2024-01-03 08:31:07 +01:00
Jorge Penadés	31c282ac0b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase	2024-01-02 14:50:26 +01:00
Guillermo Bonet	176cbe1537	Merge branch 'dev' into 6433-sectorRefactor	2024-01-02 13:02:16 +00:00
Alex Moreno	1e3a7e5f91	refs #5914 refactor: invoiceTickets	2024-01-02 13:17:10 +01:00
Guillermo Bonet	7cfcb17aff	Merge branch 'dev' into 6433-sectorRefactor	2024-01-02 10:50:00 +00:00
Jorge Penadés	6b8a4a512b	adding filter: refs #6606	2024-01-02 10:42:50 +01:00
Javier Segarra	4510f0a037	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-02 09:26:18 +00:00
Jorge Penadés	3bd14095fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6369-fixGetNegativeBasesInvoices	2024-01-02 09:45:44 +01:00
Jorge Penadés	763af7da2d	fix test: refs #6274	2024-01-02 08:58:41 +01:00
Alex Moreno	dd02a932ef	Merge branch 'test' into 5914-hotFix-transferInvoice	2024-01-02 06:40:18 +00:00
Jorge Penadés	15ec91ec79	fix query: refs #6369	2023-12-29 14:05:01 +01:00
Jorge Penadés	1b8461034e	using hasAnyNegative: refs #6515	2023-12-29 12:40:48 +01:00
Jorge Penadés	86db5a931d	arrange test suites: refs #6274	2023-12-22 10:44:21 +01:00
Jorge Penadés	0998b5bf2c	add locale and refactor: refs #6274	2023-12-21 13:58:33 +01:00
Javier Segarra	6b37f23349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-21 13:06:52 +01:00
Guillermo Bonet	0f20f95dc5	refactor: refs #6433 Deleted isPreviousPrepared* columns in model	2023-12-21 10:08:17 +01:00
Jorge Penadés	f5cc2cd75b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-21 08:38:33 +01:00
Alex Moreno	7b65ebb58b	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-21 06:50:45 +00:00
Guillermo Bonet	5f83fc158c	Merge branch 'dev' into 6582-routesMonitorTraduction	2023-12-20 13:03:57 +00:00
Jorge Penadés	5d75592627	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-20 12:19:10 +01:00
Javier Segarra	01e6e7dc39	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-20 11:02:00 +00:00
Juan Ferrer	10bfafdd3c	Merge branch 'dev' into 6264-renewToken	2023-12-20 09:05:53 +00:00
Alex Moreno	351a12204a	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-20 08:07:30 +00:00
Guillermo Bonet	753c6e9ec5	feat: refs #6582 Added traductions	2023-12-20 07:28:54 +01:00
Guillermo Bonet	516a3760a1	feat: refs #6582 Added traductions	2023-12-20 07:27:13 +01:00
Alex Moreno	7777696cf7	refs #6589 fix(worker_absences): fix started hours	2023-12-19 13:58:08 +01:00
Guillermo Bonet	17e177b788	fix: refs #6398 Fix tests back	2023-12-19 10:12:03 +01:00
David Domenech	d60f2a7f88	fix: refs #6398 Changed alias of views	2023-12-19 09:43:09 +01:00
Carlos Satorres	e4de704b4c	Merge branch 'dev' into 6220-addressFilter	2023-12-18 11:16:58 +00:00
Javier Segarra	7723b244d0	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-18 07:17:51 +00:00
Javier Segarra	8d650cf6c0	refs #6172 test: remove message code	2023-12-18 08:09:44 +01:00
Javier Segarra	29a7d9b941	Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor	2023-12-15 13:01:47 +01:00
Javier Segarra	dc98436b85	refs #2051 perf: rename variable	2023-12-15 13:01:44 +01:00
Javier Segarra	c9af8cba81	refs #5878 feat: remove . for this message	2023-12-15 12:50:05 +01:00
Alex Moreno	21a1dbeae7	refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets	2023-12-14 15:56:49 +01:00