Commit Graph

21413 Commits

Author SHA1 Message Date
Jorge Penadés 0a89cddff9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 15:04:28 +01:00
Jorge Penadés df271a242d fix: refs #6492 procedure
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 15:03:33 +01:00
Pako Natek c942786783 pruebas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 14:54:30 +01:00
Javier Segarra bfb6b25d1a Merge pull request 'Restore storage rule' (!2231) from fix_gitignore into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2231
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-03-28 13:35:24 +00:00
Juanjo Breso 76c04cb260 Restore storage rule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 13:33:21 +00:00
Jorge Penadés 3e1f8b5937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6724-permisos-vn.entry.isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 14:31:25 +01:00
Juanjo Breso a911d7fc88 Merge branch '6493-refactorizar-procedimientos-vn2008-parte2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 14:27:38 +01:00
Juanjo Breso 46f60615bd feat: refs#6493 modificar procedimiento available_traslate 2024-03-28 14:27:29 +01:00
Jorge Penadés e851c3b481 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 14:15:31 +01:00
Jorge Penadés e83d8b1464 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6724-permisos-vn.entry.isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 13:35:33 +01:00
Robert Ferrús 9a7bcdf104 fix: company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-28 13:26:09 +01:00
Pako Natek d031fef1a0 Merge branch 'dev' into 6358-boxPicking_blueMammut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 11:47:40 +00:00
Pako Natek 1d906c993b portes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 10:08:56 +00:00
Robert Ferrús 1c18b09531 fix: company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-28 10:47:47 +01:00
Robert Ferrús 063745167e fix: modificar company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-28 10:30:41 +01:00
Alex Moreno a376003da6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-28 10:10:22 +01:00
Alex Moreno ed46ad03d2 refs #7152 warmFix
gitea/salix/pipeline/head This commit looks good Details
2024-03-28 09:33:57 +01:00
Alex Moreno c1310ada91 refs #7152 deploy: init version 24.16
gitea/salix/pipeline/head This commit looks good Details
2024-03-28 09:28:42 +01:00
Alex Moreno 98469c13c4 Merge pull request '7152-devToTest_2414' (!2228) from 7152-devToTest_2414 into test
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 08:13:37 +00:00
Javi Gallego 585dd70a60 Merge pull request 'feat: #7117 company_getSuppliersDebt devolver el pais del banco' (!2211) from 7117 into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
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
gitea/salix/pipeline/head Build queued... Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-28 08:19:26 +01:00
Pako Natek 8396b8cd64 Merge branch 'dev' into 6358-boxPicking_YellowZebra
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 07:19:12 +00:00
Alex Moreno 9f527d2cd2 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-03-28 08:19:00 +01:00
Alex Moreno c47989c6fe Merge pull request '3520_wareshouse_back' (!2218) from 3520_wareshouse_back into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 07:12:24 +00:00
Sergio De la torre 8e6416d59c refs #3520 feat:uncheckedTicket
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2227
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-28 06:38:12 +00:00
Javier Segarra d30cac971f refs #6930 updates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 07:22:28 +01:00
Sergio De la torre 7634d82d8b refs #6964 feat:hasItemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 07:15:30 +01:00
Robert Ferrús 1f819ab16a fix: riesgos
gitea/salix/pipeline/pr-master This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 16:50:03 +00:00
Robert Ferrús ed1bc06301 feat: refs #7150
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 17:30:52 +01:00
Robert Ferrús 9667d31441 feat: refs #7150
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 17:00:27 +01:00
Sergio De la torre 3cae155837 Merge branch 'dev' into 3520_wareshouse_back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 15:32:44 +00:00
Juan Ferrer f917a9895b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 14:44:46 +01:00
Carlos Satorres 97b2500eea refs #6074 fix comment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 14:24:58 +01:00