20536 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Sergio De la torre	7634d82d8b	refs #6964 feat:hasItemOlder	2024-03-28 07:15:30 +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
Carlos Satorres	f4915fbe2e	Merge branch 'dev' into 6074-KkearisBlocked	2024-03-27 16:50:03 +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 Satorres	97b2500eea	refs #6074 fix comment	2024-03-27 14:24:58 +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
Pako Natek	8f872b4bbb	Merge branch '6358-boxPicking_YellowZebra' of https://gitea.verdnatura.es/verdnatura/salix into 6358-boxPicking_YellowZebra	2024-03-27 12:22:26 +01:00
Pako Natek	c9431e605e	second proposals	2024-03-27 12:22:22 +01:00
Robert Ferrús	ad16eddf6b	Merge pull request 'fix: refs #7141 catalog_calculate' (!2207) from 7141-sale_replaceItem into master ... Reviewed-on: #2207 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-27 10:57:08 +00:00
Robert Ferrús	c3e3d72182	Merge branch 'master' into 7141-sale_replaceItem	2024-03-27 10:53:31 +00:00
Sergio De la torre	483345666e	refs #3520 feat:back WarehouseFk	2024-03-27 11:01:32 +01:00
Alex Moreno	be863c1269	Merge pull request 'hotFix: recreate addressTaxArea' (!2220) from hotFix_create_fn_addressTaxArea into master ... Reviewed-on: #2220 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-03-27 07:47:02 +00:00
Alex Moreno	b532ce3f77	hotFix: recreate addressTaxArea	2024-03-27 08:30:45 +01:00
Javi Gallego	fe0a1ad7be	feat: #7013 purge productionError	2024-03-27 08:12:05 +01:00
Javi Gallego	4b41ac68aa	feat: #7013 en mayusculas y con espacio en comentarios	2024-03-27 08:05:33 +01:00
Pako Natek	b1a91ab7d3	Merge branch 'dev' into 6358-boxPicking_YellowZebra	2024-03-27 06:55:41 +00:00
Sergio De la torre	9240732c00	refs #6964 feat:advice for olderItem	2024-03-27 07:49:51 +01:00
Sergio De la torre	2cf572baf8	refs #3520 hasUncheckedTicket	2024-03-27 07:48:16 +01:00
Sergio De la torre	a983f25c57	refs #3520 hasUncheckedTicket	2024-03-27 07:47:36 +01:00
Alex Moreno	5a19c1ebb1	Merge branch 'dev' into 6964_itemOlder	2024-03-27 06:30:00 +00:00
Sergio De la torre	39b1e9ff7b	refs #3520 hasUncheckedTicket	2024-03-27 07:26:11 +01:00
Javi Gallego	075259dee9	Merge pull request 'fix: solo un trabajador por fallo' (!2210) from 6782-productionError_add into dev ... Reviewed-on: #2210 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-27 06:24:25 +00:00
Javi Gallego	c3aa4c9355	Merge branch 'dev' into 6782-productionError_add	2024-03-27 06:22:48 +00:00
Javi Gallego	2881409b1e	feat: #7120 con fecha por defecto	2024-03-27 07:19:51 +01:00
Sergio De la torre	eaf3749440	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3520_wareshouse_back	2024-03-27 07:11:16 +01:00
Sergio De la torre	ff8522cfd1	refs #6964 feat:advice for olderItem	2024-03-27 07:09:18 +01:00
Sergio De la torre	43b042a616	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-27 07:08:47 +01:00
Javier Segarra	d5a2c2f814	Merge pull request 'refs #5858 fix rename file' (!2214) from #5858_fix_extension into dev ... Reviewed-on: #2214 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-27 06:01:33 +00:00
Javier Segarra	e22122e577	Merge branch 'dev' into #5858_fix_extension	2024-03-27 05:52:52 +00:00
Javier Segarra	fe042e4d86	refs #5858 fix: test	2024-03-27 06:50:22 +01:00
Juan Ferrer	2604fb28f8	Merge pull request 'test' (!2217) from test into dev ... Reviewed-on: #2217	2024-03-26 16:04:28 +00:00
Juan Ferrer	ce86c04185	Merge pull request 'fix: HOTFIX PROC vn.collection_new release lock on error' (!2216) from master into test ... Reviewed-on: #2216	2024-03-26 16:04:12 +00:00
Juan Ferrer	9aa46c3a90	fix: HOTFIX PROC vn.collection_new release lock on error	2024-03-26 16:50:15 +01:00
Robert Ferrús	8e2770aa56	feat: refs #7141	2024-03-26 16:27:49 +01:00
Javier Segarra	281ac0c5c0	Merge branch 'dev' into #5858_fix_extension	2024-03-26 14:33:52 +00:00
Javier Segarra	8b20a56407	Merge pull request '#6930 FIX Show report and File.getPath' (!2215) from 6930_FIX_dms_TokenMultimedia into dev ... Reviewed-on: #2215 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-26 14:18:20 +00:00
Javier Segarra	38c5209c33	refs #6930 fix more endpoints	2024-03-26 15:01:28 +01:00
Pako Natek	861d9b3135	javi's proposals	2024-03-26 14:59:06 +01:00
Jorge Penadés	6ded14b593	feat: refs #7002 update direction if it was not manual	2024-03-26 14:25:25 +01:00