18264 Commits

All Branches

Search

Author	SHA1	Message	Date
David Domenech	d29fd5c65a	refs #6456	2024-01-03 13:35:36 +01:00
Guillermo Bonet	a6ebd01ebd	Merge branch 'test' into dev	2024-01-03 13:28:23 +01:00
Jorge Penadés	6986ec1f8a	Merge pull request '#6274 workerTimeControl' (!1858) from 6274-loginWorkerTimeControl into dev ... Reviewed-on: #1858 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-01-03 11:31:48 +00: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
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	b70e2fc1a4	Merge pull request 'refs #6085 aclMail back' (!1869) from 6085-ACLsMail into dev ... Reviewed-on: #1869 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-03 07:56:07 +00:00
Alex Moreno	b7c53507f8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2024-01-03 08:38:28 +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
Guillermo Bonet	2c35eae354	Merge pull request 'refactor: refs #6433 Deleted isPreviousPrepared* columns in model' (!1901) from 6433-sectorRefactor into dev ... Reviewed-on: #1901 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-01-02 13:14:51 +00:00
Guillermo Bonet	176cbe1537	Merge branch 'dev' into 6433-sectorRefactor	2024-01-02 13:02:16 +00:00
Jorge Penadés	fad5e84329	Merge pull request '#6606 fix export csv button' (!1907) from 6606-fixExportBtn into dev ... Reviewed-on: #1907 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-02 11:49:05 +00: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
Jorge Penadés	7fd27cd7a5	Merge pull request 'fix query: refs #6369' (!1906) from 6369-fixGetNegativeBasesInvoices into dev ... Reviewed-on: #1906 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-01-02 09:00:20 +00:00
Robert Ferrús	4b5cf4a28d	Merge pull request 'refs #5854 itemShelving traducciones' (!1862) from 5854-itemShelvingTraduciones into dev ... Reviewed-on: #1862 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-02 08:48:26 +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
Jorge Penadés	801037da64	fix changes: refs #6274	2024-01-02 08:47:12 +01:00
Jorge Penadés	cd701ccd9e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2024-01-02 08:42:06 +01:00
Alex Moreno	0101dcda3a	refs #5925 fix: add options	2024-01-02 08:12:45 +01:00
Alex Moreno	ed1764ff30	Merge branch 'dev' into 5854-itemShelvingTraduciones	2024-01-02 07:12:45 +00:00
Alex Moreno	318761185b	refs #6434 fix: remove console.log	2024-01-02 08:07:16 +01:00
Robert Ferrús	f7a28eea58	Merge branch 'dev' into 5854-itemShelvingTraduciones	2024-01-02 06:27:08 +00:00
Jorge Penadés	15ec91ec79	fix query: refs #6369	2023-12-29 14:05:01 +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
Jorge Penadés	86db5a931d	arrange test suites: refs #6274	2023-12-22 10:44:21 +01:00
Javier Segarra	703e16ffcd	Merge pull request '#6434 - signIn_issue' (!1892) from 6434-signIn_issue into dev ... Reviewed-on: #1892 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-12-22 09:36:29 +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
Carlos Satorres	36698c1ace	Merge pull request 'refs #5925 models table docuware' (!1889) from 5925-docuwareTablet into dev ... Reviewed-on: #1889 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-12-21 13:20:01 +00:00
Jorge Penadés	0998b5bf2c	add locale and refactor: refs #6274	2023-12-21 13:58:33 +01:00
Alex Moreno	9951e911ae	refs #5925 feat(docuware_upload): use userConfig.tabletFk	2023-12-21 10:39:46 +01:00
Javier Segarra	dc661f298b	refs #6434 test: update tests	2023-12-21 09:10:18 +00:00
Guillermo Bonet	0f20f95dc5	refactor: refs #6433 Deleted isPreviousPrepared* columns in model	2023-12-21 10:08:17 +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	0feb8e5a16	Merge branch '6434-signIn_issue' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue	2023-12-21 09:01:07 +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	f4489a7b56	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-12-21 08:34:44 +01:00
Alex Moreno	7b0c5fe0a0	refs #5739 fix: sql	2023-12-21 08:33:50 +01:00
Javier Segarra	3c8ff346e2	Merge branch 'dev' into 6434-signIn_issue	2023-12-21 06:58:09 +00:00
Alex Moreno	7b65ebb58b	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-21 06:50:45 +00:00
Alex Moreno	3094c330df	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-12-21 07:47:07 +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