20710 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	a99ea23d43	Merge branch 'master' into 5858_fix_zone-incldued_HTML	2024-04-04 05:43:09 +00:00
Javier Segarra	b7c0ce0852	Merge branch 'test' into 5858_fix_zone-incldued_HTML	2024-04-04 05:41:26 +00:00
Alex Moreno	016b314e0b	Merge pull request '7167-testToMaster_2414' (!2244) from 7167-testToMaster_2414 into master ... Reviewed-on: #2244 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-04 05:32:40 +00:00
Alex Moreno	ff2e00c51c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-03 16:24:45 +02:00
Alex Moreno	927f2e9ebf	Merge pull request 'debug(closure): add log' (!2243) from hotFix_closure_logErrors into master ... Reviewed-on: #2243 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-03 13:32:16 +00:00
Alex Moreno	59ead0c2e5	debug(closure): add log	2024-04-03 15:29:56 +02:00
Javier Casado	e753c14421	Merge pull request 'hotfix claimStateLanguage' (!2242) from hotfix_languageClaimNotification into master ... Reviewed-on: #2242 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-03 11:39:37 +00:00
Javier Casado	3968d88a8d	Merge branch 'master' into hotfix_languageClaimNotification	2024-04-03 11:37:15 +00:00
jcasado	09f023090e	hotfix claimStateLanguage	2024-04-03 13:33:56 +02:00
Guillermo Bonet	d9ea126fd8	Merge pull request 'feat: refs #6829 Added two indexes' (!2241) from 6829-indexesSrtExpeditionLog into master ... Reviewed-on: #2241 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-04-03 10:01:40 +00:00
Guillermo Bonet	064d6dbb64	feat: refs #6829 Added two indexes	2024-04-03 11:57:28 +02:00
Ivan Mas	cd7ed5f17b	Merge pull request 'hotfix_clientsDisable' (!2240) from hotfix_clientsDisable into master ... Reviewed-on: #2240 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-03 08:46:46 +00:00
Ivan Mas	b9520b53ab	hotfix_clientsDisable	2024-04-03 10:03:59 +02:00
Robert Ferrús	448b8e6ea3	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-04-03 07:50:06 +00:00
Javier Segarra	3449e27150	Actualizar print/templates/email/zone-included/zone-included.js	2024-04-03 05:50:04 +00:00
Javier Segarra	1f8afc074d	Actualizar print/templates/email/zone-included/zone-included.html	2024-04-03 05:49:40 +00:00
jcasado	09e1e4de19	refactor: #7123 change credit document	2024-04-03 07:23:36 +02:00
Javier Segarra	1b72572440	FIX render HTML	2024-04-02 11:58:30 +00:00
Pako Natek	7aeb9e4f32	Merge pull request '6358-boxPicking_blueMammut' (!2230) from 6358-boxPicking_blueMammut into dev ... Reviewed-on: #2230 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-02 05:13:52 +00:00
Pako Natek	a5ff545259	Merge branch 'dev' into 6358-boxPicking_blueMammut	2024-04-02 05:12:13 +00:00
Pako Natek	3b0209977b	Merge pull request 'hotfix-collection_assign_releaseLock' (!2234) from hotfix-collection_assign_releaseLock into master ... Reviewed-on: #2234 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-01 12:29:16 +00:00
Pako Natek	cb745b0f4d	release_lock	2024-04-01 14:21:34 +02:00
Pako Natek	bfa59bdcea	release_lock	2024-04-01 14:20:25 +02:00
Pako Natek	3ac0af24d1	Merge pull request 'lines and volume' (!2233) from hotfix-collection_new_20240401 into master ... Reviewed-on: #2233 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-01 10:05:12 +00:00
Pako Natek	3a1f5109d9	lines and volume	2024-04-01 11:58:16 +02:00
Pako Natek	7c4fc31b50	version productionConfig	2024-04-01 08:55:21 +02:00
Pako Natek	df911b9b75	fora comentaris	2024-04-01 08:47:47 +02:00
Pako Natek	547df47049	delete old proc	2024-04-01 08:47:16 +02:00
Pako Natek	98b1e933f7	prova	2024-04-01 08:46:07 +02:00
Pako Natek	9aae9677e6	modificaciones	2024-04-01 08:43:26 +02:00
Robert Ferrús	5f12e498d5	Merge pull request 'fix: riesgos' (!2225) from hotFixCompany_getSuppliersDebt into master ... Reviewed-on: #2225 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-28 14:10:44 +00:00
Jorge Penadés	0a89cddff9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-28 15:04:28 +01:00
Jorge Penadés	df271a242d	fix: refs #6492 procedure	2024-03-28 15:03:33 +01:00
Pako Natek	c942786783	pruebas	2024-03-28 14:54:30 +01:00
Javier Segarra	bfb6b25d1a	Merge pull request 'Restore storage rule' (!2231) from fix_gitignore into dev ... Reviewed-on: #2231 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-03-28 13:35:24 +00:00
Juanjo Breso	76c04cb260	Restore storage rule	2024-03-28 13:33:21 +00:00
Jorge Penadés	e851c3b481	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-28 14:15:31 +01:00
Robert Ferrús	9a7bcdf104	fix: company_getSuppliersDebt	2024-03-28 13:26:09 +01:00
Pako Natek	d031fef1a0	Merge branch 'dev' into 6358-boxPicking_blueMammut	2024-03-28 11:47:40 +00:00
Pako Natek	1d906c993b	portes	2024-03-28 12:43:13 +01:00
Pako Natek	b445d745a5	cambios	2024-03-28 11:40:18 +01:00
Sergio De la torre	b62905c5ef	Merge branch 'dev' into 6964_itemOlder	2024-03-28 10:08:56 +00:00
Robert Ferrús	1c18b09531	fix: company_getSuppliersDebt	2024-03-28 10:47:47 +01:00
Robert Ferrús	063745167e	fix: modificar company_getSuppliersDebt	2024-03-28 10:30:41 +01:00
Alex Moreno	a376003da6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-28 10:10:22 +01:00
Alex Moreno	ed46ad03d2	refs #7152 warmFix	2024-03-28 09:33:57 +01:00
Alex Moreno	c1310ada91	refs #7152 deploy: init version 24.16	2024-03-28 09:28:42 +01:00
Alex Moreno	98469c13c4	Merge pull request '7152-devToTest_2414' (!2228) from 7152-devToTest_2414 into test ... Reviewed-on: #2228 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-03-28 08:26:33 +00:00
Carlos Satorres	76dcf97591	Merge pull request 'refs #6074 remove isBlocked' (!2196) from 6074-KkearisBlocked into dev ... Reviewed-on: #2196 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-28 08:15:10 +00:00
Carlos Satorres	9f438751d3	Merge branch 'dev' into 6074-KkearisBlocked	2024-03-28 08:13:37 +00:00