20253 Commits

All Branches

Search

Author	SHA1	Message	Date
Pako Natek	091d0ce684	Merge pull request 'done' (!2058) from 6906-workerActivity into dev ... Reviewed-on: #2058 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-21 16:17:48 +00:00
Pako Natek	10bdc21829	Merge branch 'dev' into 6906-workerActivity	2024-02-21 16:16:41 +00:00
Javier Segarra	838effadc0	refs #5858 feat: move change to vnx	2024-02-21 15:18:10 +01:00
Alex Moreno	60dfe8ec05	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8	2024-02-21 15:12:48 +01:00
Javier Segarra	cc90b13668	refs #5858 feat: remove unnecesary update	2024-02-21 15:05:38 +01:00
Alex Moreno	1f1b5ab6ee	Merge pull request 'test_into_dev' (!2065) from test_into_dev into dev ... Reviewed-on: #2065 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-02-21 14:00:49 +00:00
Alex Moreno	92f2282632	Revert "Merge pull request 'Revert "Merge branch 'dev' into test"' (!2064) from test_revert into test" ... This reverts commit cbe23d8df5, reversing changes made to c4a64b93cc.	2024-02-21 14:52:28 +01:00
Alex Moreno	cbe23d8df5	Merge pull request 'Revert "Merge branch 'dev' into test"' (!2064) from test_revert into test ... Reviewed-on: #2064 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-02-21 13:47:38 +00:00
Alex Moreno	01f1bd0088	Revert "Merge branch 'dev' into test" ... This reverts commit c4a64b93cc, reversing changes made to 2ab1cebb31.	2024-02-21 14:44:34 +01:00
David Domenech	658c351860	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-21 13:36:42 +00:00
Alex Moreno	c4a64b93cc	Merge branch 'dev' into test	2024-02-21 13:32:54 +00:00
Javier Segarra	714345ab04	Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-21 14:29:31 +01:00
Javier Segarra	57a1f2a1f6	refs #5858 test: check vn_schedules	2024-02-21 14:29:20 +01:00
Javier Segarra	7bf89cd448	Merge branch 'dev' into 5858-zone_Collisions	2024-02-21 13:27:38 +00:00
Javier Segarra	dddd482317	refs #5858 test: check vn_schedules	2024-02-21 14:22:19 +01:00
Javier Segarra	88a88640e5	refs #5858 feat: sql comments	2024-02-21 14:22:06 +01:00
Ivan Mas	4a8707e327	Merge pull request '6626-Restricción-en-invoiceInTax' (!2060) from 6626-Restricción-en-invoiceInTax into dev ... Reviewed-on: #2060 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-21 13:14:48 +00:00
David Domenech	29accbb23e	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-21 13:10:20 +00:00
David Domenech	5bef3989cd	refs #6372	2024-02-21 14:07:52 +01:00
Robert Ferrús	2ab1cebb31	Merge pull request 'feat: refs #6371 restore Proveedores_cargueras' (!2061) from 6371-restoreProveedoresCargueras into test ... Reviewed-on: #2061 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-21 13:02:28 +00:00
Javier Segarra	e00133458b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-21 13:48:53 +01:00
Robert Ferrús	fba353f8e4	feat: refs #6371 restore Proveedores_cargueras	2024-02-21 13:43:33 +01:00
Ivan Mas	84270d29b8	refs #6626 modify invoiceInTax	2024-02-21 13:15:46 +01:00
Ivan Mas	f30a5a7597	refs #6626 invoiceInTax different transactions	2024-02-21 13:13:28 +01:00
Ivan Mas	65cb2d45fd	refs #6784 Eliminate row in fixtures.before.sql	2024-02-21 12:30:25 +01:00
Ivan Mas	f0daf2dd9a	refs #6784 Modify fixtures.before.sql	2024-02-21 12:22:27 +01:00
Pako Natek	40a3df18e8	Merge branch 'dev' into 6906-workerActivity	2024-02-21 11:14:35 +00:00
Pako Natek	3463b8fcb1	done	2024-02-21 12:09:52 +01:00
Carlos Satorres	b4a0688bfc	Merge pull request 'refs #6414 tback' (!2051) from 6414-testBackClient into dev ... Reviewed-on: #2051 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-21 11:09:39 +00:00
Carlos Satorres	94359ea3db	Merge branch 'dev' into 6414-testBackClient	2024-02-21 11:08:16 +00:00
Sergio De la torre	1328a8fa96	Merge pull request 'refs #6834 feat:handle Error' (!2057) from 6834_sectorCollectionSaleGroup_add into dev ... Reviewed-on: #2057 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-21 11:06:53 +00:00
Ivan Mas	f592045925	refs #6784 Delete clientType.id and modify relationships in json and js	2024-02-21 11:49:27 +01:00
Jorge Penadés	c6c2f84e29	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-02-21 10:29:49 +01:00
Carlos Satorres	7514348d13	Merge branch 'dev' into 6414-testBackClient	2024-02-21 09:29:45 +00:00
Alex Moreno	8182809d8a	Merge branch 'master' into 6403-mrwIntegration	2024-02-21 08:50:54 +00:00
Alex Moreno	946006c7e6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-21 07:48:05 +01:00
David Domenech	1cf17a3d8d	refs #6372	2024-02-21 07:35:57 +01:00
Sergio De la torre	448763ee72	refs #6834 feat:handle Error	2024-02-21 07:15:43 +01:00
Sergio De la torre	614652c357	refs #6834 feat:handle Error	2024-02-21 07:08:45 +01:00
Sergio De la torre	be81835474	refs #6834 feat:handle Error	2024-02-20 16:11:59 +01:00
Sergio De la torre	b9fe990003	refs #6834 feat:handle Error	2024-02-20 16:10:16 +01:00
Javier Segarra	be0e835a37	refs #5878 feat: remove vn_event_getCollisions	2024-02-20 14:40:38 +01:00
Javier Segarra	791687f271	refs #5878 feat: comments	2024-02-20 14:27:22 +01:00
Pablo Natek	913e7aa1d8	fix(run): refs #6372 change version	2024-02-20 14:22:07 +01:00
Javier Segarra	ed5197be13	Merge branch 'dev' into 5858-fiscalData-validations	2024-02-20 13:14:51 +00:00
Javier Segarra	811a49275d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-20 13:53:18 +01:00
Carlos Satorres	e7f8b7282b	refs #5858 remove clean pr	2024-02-20 13:48:31 +01:00
Carlos Satorres	62ccbb3074	refs #5858 fix error	2024-02-20 13:45:10 +01:00
David Domenech	1fb0545817	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-20 13:21:38 +01:00
Carlos Satorres	f3f0360059	refs #5858 fix conflicts	2024-02-20 13:19:31 +01:00