2164 Commits

Author	SHA1	Message	Date
Guillermo Bonet	4ead2345c4	Merge branch '6634-collectionLabelPrevia' of https://gitea.verdnatura.es/verdnatura/salix into 6634-collectionLabelPrevia	2024-01-15 10:03:06 +01:00
Guillermo Bonet	a900e0fff6	feat: refs #6634 Minor change	2024-01-15 10:03:05 +01:00
Guillermo Bonet	1cd9b85ddf	Merge branch 'dev' into 6634-collectionLabelPrevia	2024-01-15 09:00:08 +00:00
Guillermo Bonet	be1a94c283	feat: refs #6634 Modified collection-label	2024-01-15 09:59:32 +01:00
Alex Moreno	199656afb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-12 12:41:52 +01:00
Jorge Penadés	2a6b509a78	fix: refs #6656 change acls	2024-01-12 09:54:18 +01:00
Alex Moreno	14fff571b5	Merge branch 'dev' into 6353-ratingCatalog	2024-01-12 08:52:51 +00:00
Carlos Satorres	d0df880c32	Merge branch 'dev' into 6322-futureTicketImporte	2024-01-12 07:47:23 +00:00
Alex Moreno	9b15551013	refs #6675 fix: correct sql folder	2024-01-11 09:00:45 +01:00
Alex Moreno	a92297da73	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-01-11 08:14:56 +01:00
Alex Moreno	edde5819e3	refs #6660 feat: update mariadb version 10.7.7→10.11.6	2024-01-10 15:39:35 +01:00
Carlos Satorres	980ca81bfc	refs #6353 fixtures catalog rating	2024-01-10 09:38:20 +01:00
Guillermo Bonet	81ffc122fc	Merge branch 'test' into dev	2024-01-09 14:09:47 +01:00
Carlos Satorres	676d95563b	refs #6322 importe	2024-01-09 12:53:58 +01:00
Sergio De la torre	445703c6e2	6275-hotFix version not applied	2024-01-09 09:14:48 +01:00
Pablo Natek	2e5ae062cf	Merge branch 'dev' into 6259-ticketSmsJoinClientSms	2024-01-04 14:24:24 +00:00
Carlos Satorres	3b14c7cd23	refs #6456 fix tback, models	2024-01-04 09:51:04 +01:00
Javier Segarra	f7d83b15bd	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-04 08:08:46 +00:00
Carlos Satorres	15d6c9a65b	Merge branch '6456-refactor-ticketState' of https://gitea.verdnatura.es/verdnatura/salix into 6456-refactor-ticketState	2024-01-04 08:39:07 +01:00
Alex Moreno	2a65ad6b31	refs #6635 build: new version	2024-01-04 08:22:01 +01:00
Alex Moreno	23b544c1ec	refs #6635 fix: add translation	2024-01-04 08:19:48 +01:00
Pablo Natek	847623f9c6	Merge branch 'dev' into 6259-ticketSmsJoinClientSms	2024-01-03 18:28:46 +00:00
Javier Segarra	4d7f0329ee	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-03 12:46:26 +00:00
David Domenech	d29fd5c65a	refs #6456	2024-01-03 13:35:36 +01:00
Alex Moreno	ba26237998	refs #5914 refactor: getTaxBases	2024-01-03 12:19:28 +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
Carlos Satorres	12165ab382	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2024-01-03 08:31:07 +01:00
Alex Moreno	1e3a7e5f91	refs #5914 refactor: invoiceTickets	2024-01-02 13:17:10 +01:00
Jorge Penadés	801037da64	fix changes: refs #6274	2024-01-02 08:47:12 +01:00
Alex Moreno	dd02a932ef	Merge branch 'test' into 5914-hotFix-transferInvoice	2024-01-02 06:40:18 +00:00
Pablo Natek	323c7adcdd	Merge branch 'dev' into 6259-ticketSmsJoinClientSms	2023-12-26 07:20:58 +00:00
Pablo Natek	5a1c4ddea0	refactor(ticketSms): refs #6259 ticketSmsToClientSms	2023-12-26 08:20:13 +01:00
Jorge Penadés	2e1715a968	refactor renewToken & replace ACL: refs #6274	2023-12-22 15:19:45 +01:00
Jorge Penadés	89fda361bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-22 11:04:43 +01:00
Javier Segarra	4d2cf87f49	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-22 09:37:53 +00:00
Javier Segarra	8d08adca21	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-22 09:36:02 +00:00
Javier Segarra	ec1befcfb0	Merge branch 'dev' into 6434-signIn_issue	2023-12-22 09:25:57 +00:00
Jorge Penadés	e1888bd154	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-22 08:35:50 +01:00
Pablo Natek	35750bc93f	merge(dev): refs #6259 merge dev	2023-12-21 18:46:12 +01:00
Pablo Natek	27a369bef4	refactor(ticketSms): refs #6259 merge ticksms to clientsms	2023-12-21 18:34:22 +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
Alex Moreno	9951e911ae	refs #5925 feat(docuware_upload): use userConfig.tabletFk	2023-12-21 10:39:46 +01:00
Alex Moreno	d30dcd7d70	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5925-docuwareTablet	2023-12-21 09:22:49 +01:00
Javier Segarra	daef9ee59a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue	2023-12-21 09:01:02 +01:00
Jorge Penadés	f384616d69	move changes: refs #6274	2023-12-21 08:57:46 +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	38279b0786	refs #6594 deploy: init version 24.02	2023-12-21 08:37:30 +01:00
Alex Moreno	7b0c5fe0a0	refs #5739 fix: sql	2023-12-21 08:33:50 +01:00
Alex Moreno	f2dcbe214a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-12-21 07:44:41 +01:00
Jorge Penadés	542b09073e	changes moved: refs #6274	2023-12-20 14:02:05 +01:00