19683 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
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
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
Carlos Satorres	8514a23f9c	refs #5858 fix conflicts	2024-02-20 13:18:37 +01:00
Carlos Satorres	ed37902291	Merge branch '5858-fiscalData-validations' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations	2024-02-20 13:14:54 +01:00
Ivan Mas	3813dbb9fd	refs #6784 Delete clientTypeFk	2024-02-20 13:10:03 +01:00
Carlos Satorres	728224cad9	refs #5858 fix accepts	2024-02-20 13:04:45 +01:00
Alex Moreno	bbc3940cd9	Merge pull request 'hotFix_workerTimeControl_reUse_hasToRefill' (!2049) from hotFix_workerTimeControl_reUse_hasToRefill into master ... Reviewed-on: #2049 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-20 11:30:24 +00:00
Alex Moreno	7fbb9b5c3f	Merge branch 'master' into hotFix_workerTimeControl_reUse_hasToRefill	2024-02-20 11:15:16 +00:00
Alex Moreno	ab9c952afc	hotFix(sendMail): hasToRefill	2024-02-20 12:13:49 +01:00
Carlos Satorres	f3511d4a43	refs #6414 tback	2024-02-20 09:53:28 +01:00
Alex Moreno	668903fa5f	hotFix(getUrl): fix prop name environment	2024-02-20 09:08:32 +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
Pablo Natek	f731fbe01c	Merge pull request 'fix(usesMana): refs #6879 add mana excluded worker' (!2053) from 6879-fixUsesManaExlusion into master ... Reviewed-on: #2053 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-19 13:22:44 +00:00
Pablo Natek	011880eb72	fix(spec): refs #6879 remove f from describe	2024-02-19 14:15:44 +01:00