19351 Commits

All Branches

Search

Author	SHA1	Message	Date
David Domenech	d48fd77f48	refs #6372	2024-02-22 08:25:38 +01:00
David Domenech	0384f7d83d	Merge pull request 'refs #6372 DeleteTablesFromVn2008' (!2055) from 6372-Delete-views-from-vn2008 into dev ... Reviewed-on: #2055 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-22 06:14:25 +00:00
David Domenech	5110d6e71d	fix error refs #6372	2024-02-22 07:09:35 +01:00
David Domenech	e4d60d20c5	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-22 05:59:00 +00:00
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
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
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
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
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
Carlos Satorres	7514348d13	Merge branch 'dev' into 6414-testBackClient	2024-02-21 09:29:45 +00: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
Pablo Natek	913e7aa1d8	fix(run): refs #6372 change version	2024-02-20 14:22:07 +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	f3511d4a43	refs #6414 tback	2024-02-20 09:53:28 +01:00
Alex Moreno	06445f3ec1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-20 09:04:53 +01:00
Alex Moreno	4952e0be20	hotFix(getUrl): fix prop name environment	2024-02-20 09:04:50 +01:00
Guillermo Bonet	4d2637764e	Merge pull request 'refactor: refs #5586 Optimized SQL negativeBases' (!2007) from 5586-optimizeNegativeBases into dev ... Reviewed-on: #2007 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-20 06:28:04 +00:00
Guillermo Bonet	6daa7a03ff	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-20 06:26:16 +00:00
David Domenech	8f80b6ab7b	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-20 06:05:34 +00:00
Javi Gallego	175f141fbe	Merge pull request '6392-balance-produccion-propia' (!2009) from 6392-balance-produccion-propia into dev ... Reviewed-on: #2009 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-19 14:10:35 +00:00
Javi Gallego	a7c48e9132	feat: #6392 quito de fixtures para que no falle la fk	2024-02-19 15:05:11 +01:00
Javi Gallego	c53ff1243f	feat: #6392 no es necesario agencyTermConfig	2024-02-19 14:37:36 +01:00
Javi Gallego	2c1172bd88	feat: #6392 sin gastos	2024-02-19 13:56:16 +01:00
Javi Gallego	8642ddcd7f	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-19 13:34:27 +01:00
Jorge Penadés	6720ef89b9	Merge pull request '#6776 makeMulti & itemShelvin_add refactor' (!1970) from 6776-makeMulti into dev ... Reviewed-on: #1970 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-19 12:23:44 +00:00
Jorge Penadés	d127354905	Merge branch 'dev' into 6776-makeMulti	2024-02-19 12:21:48 +00:00
Pako Natek	84a93cafd2	Merge pull request 'packing' (!2046) from 6358-boxPicking-BluePinguin into dev ... Reviewed-on: #2046 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-02-19 10:56:20 +00:00
Pako Natek	f0d59f12e6	Merge branch 'dev' into 6358-boxPicking-BluePinguin	2024-02-19 10:55:11 +00:00
David Domenech	9bc676ddfd	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-19 10:35:32 +00:00
Sergio De la torre	7e9d222b35	Merge pull request 'refs #6669 fix:ticket_isOutClosureZone' (!1984) from 6669_ticketClosure into dev ... Reviewed-on: #1984 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-19 10:33:51 +00:00
Sergio De la torre	a656447fdb	Merge branch 'dev' into 6669_ticketClosure	2024-02-19 10:31:49 +00:00