20412 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	b75cd3b768	Merge pull request 'fix: refs #7152 add supplier storage' (!2246) from 7152-hotFix_addSupplierStorage into master ... Reviewed-on: #2246 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-04 06:58:05 +00:00
Jon Elias	3e044a8efe	fix: refs #7152 add supplier storage	2024-04-04 08:16:37 +02: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
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
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
Robert Ferrús	9a7bcdf104	fix: company_getSuppliersDebt	2024-03-28 13:26:09 +01: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	ed46ad03d2	refs #7152 warmFix	2024-03-28 09:33:57 +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
Javi Gallego	585dd70a60	Merge pull request 'feat: #7117 company_getSuppliersDebt devolver el pais del banco' (!2211) from 7117 into dev ... Reviewed-on: #2211	2024-03-28 08:02:30 +00:00
Javi Gallego	699883182c	Merge pull request '7120-specialPrice' (!2213) from 7120-specialPrice into dev ... Reviewed-on: #2213 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-28 08:01:45 +00:00
Javi Gallego	6596efdc91	Merge pull request '7013-solunionRiskRequest' (!2190) from 7013-solunionRiskRequest into dev ... Reviewed-on: #2190 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-28 08:01:28 +00:00
Pako Natek	d1809c4087	Merge pull request 'primer prototipo' (!2205) from 6358-boxPicking_YellowZebra into dev ... Reviewed-on: #2205 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-28 07:20:36 +00:00
Alex Moreno	f1931fce69	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-28 08:19:26 +01:00
Pako Natek	8396b8cd64	Merge branch 'dev' into 6358-boxPicking_YellowZebra	2024-03-28 07:19:12 +00:00
Alex Moreno	9f527d2cd2	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-28 08:19:00 +01:00
Alex Moreno	c47989c6fe	Merge pull request '3520_wareshouse_back' (!2218) from 3520_wareshouse_back into dev ... Reviewed-on: #2218 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:16:56 +00:00
Alex Moreno	0b764ebc1b	Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev ... Reviewed-on: #2209 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:12:51 +00:00
Sergio De la torre	4ca3e8f650	Merge branch 'dev' into 3520_wareshouse_back	2024-03-28 07:12:24 +00:00
Sergio De la torre	8e6416d59c	refs #3520 feat:uncheckedTicket	2024-03-28 08:08:32 +01:00
Alex Moreno	6853454d30	Merge pull request '#7002 update direction if device exists' (!2206) from 7002-fixUpdateTimeEntry into dev ... Reviewed-on: #2206 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:04:17 +00:00
Alex Moreno	1d83c2a9ad	Merge pull request 'refs #6532 redirect grafana, remove mermas' (!2184) from 6532-deleteMermas into dev ... Reviewed-on: #2184 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 06:57:27 +00:00
Alex Moreno	8cccc78b88	Merge branch 'dev' into 6532-deleteMermas	2024-03-28 06:42:39 +00:00
Javier Segarra	824a560bf5	Merge pull request 'More updates to use scopedMultimedia' (!2227) from 6930_scopedMultimedia into dev ... Reviewed-on: #2227 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 06:38:12 +00:00
Javier Segarra	d30cac971f	refs #6930 updates	2024-03-28 07:22:28 +01:00
Robert Ferrús	1f819ab16a	fix: riesgos	2024-03-27 19:02:05 +01:00
Carlos Andrés	30e1acedf3	Merge pull request 'fix: TRIGGER incorrecto en travel refs #7148' (!2223) from 7148-TRIGGER-en-travel-incorrectos into master ... Reviewed-on: #2223 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-27 17:59:51 +00:00
Sergio De la torre	3cae155837	Merge branch 'dev' into 3520_wareshouse_back	2024-03-27 15:32:44 +00:00
Juan Ferrer	f917a9895b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-03-27 16:18:22 +01:00
Juan Ferrer	2a8256319f	fix: #6085 Old db/changes directory removed	2024-03-27 16:18:21 +01:00
Carlos Satorres	5d5dc9583a	refs #6532 change url	2024-03-27 14:44:46 +01:00
Carlos Andrés	4ac418111b	fix: TRIGGER incorrecto en travel refs #7148	2024-03-27 14:12:34 +01:00
Jorge Penadés	e7a29119d0	feat: refs #7002 add test	2024-03-27 13:38:04 +01:00
Pako Natek	09c9a3d7ef	vRest	2024-03-27 12:25:57 +01:00
Jorge Penadés	227d123247	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7002-fixUpdateTimeEntry	2024-03-27 12:24:19 +01:00