Commit Graph

21561 Commits

Author SHA1 Message Date
Javier Casado 3968d88a8d Merge branch 'master' into hotfix_languageClaimNotification
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-03 11:37:15 +00:00
jcasado 09f023090e hotfix claimStateLanguage
gitea/salix/pipeline/pr-master This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-03 11:57:28 +02:00
Ivan Mas cd7ed5f17b Merge pull request 'hotfix_clientsDisable' (!2240) from hotfix_clientsDisable into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2240
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-03 08:46:46 +00:00
Ivan Mas b9520b53ab hotfix_clientsDisable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-03 10:03:59 +02:00
Robert Ferrús 448b8e6ea3 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-03 07:50:06 +00:00
Sergio De la torre 11991ed5a1 refs #6497:redirect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-03 09:36:03 +02:00
Sergio De la torre 53015d1c67 refs #6497:redirect 2024-04-03 09:33:50 +02:00
Sergio De la torre c65ce5fb61 refs #6497:redirect 2024-04-03 09:31:15 +02:00
Sergio De la torre 642d280386 refs #6497:rdirect 2024-04-03 09:30:18 +02:00
Javi Gallego d71f3e0818 test
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-03 09:02:34 +02:00
Javier Segarra 3449e27150 Actualizar print/templates/email/zone-included/zone-included.js
gitea/salix/pipeline/pr-test There was a failure building this commit Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-03 07:23:36 +02:00
Javi Gallego 52457b9642 feat: sin concatenar en el nombre 2024-04-03 07:09:07 +02:00
Javier Segarra 1b72572440 FIX render HTML 2024-04-02 11:58:30 +00:00
Juanjo Breso 4767b98442 Merge branch '6493--refactorizar-procedimientos-vn2008-parte2' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-02 10:59:25 +02:00
Juanjo Breso 4389cd5d74 feat: refs#6493 modificar procedimiento available_traslate 2024-04-02 09:56:46 +02:00
Pako Natek 7aeb9e4f32 Merge pull request '6358-boxPicking_blueMammut' (!2230) from 6358-boxPicking_blueMammut into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2234
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-04-01 12:29:16 +00:00
Pako Natek cb745b0f4d release_lock
gitea/salix/pipeline/pr-master This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2233
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-04-01 10:05:12 +00:00
Pako Natek 3a1f5109d9 lines and volume
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-01 11:58:16 +02:00
Pako Natek 7c4fc31b50 version productionConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:55:21 +02:00
Pako Natek df911b9b75 fora comentaris
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:47:47 +02:00
Pako Natek 547df47049 delete old proc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:47:16 +02:00
Pako Natek 98b1e933f7 prova
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:46:07 +02:00
Pako Natek 9aae9677e6 modificaciones
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:43:26 +02:00
Jorge Penadés a62e189e47 feat: refs #6724 hook added
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-28 16:10:52 +01:00
Robert Ferrús 5f12e498d5 Merge pull request 'fix: riesgos' (!2225) from hotFixCompany_getSuppliersDebt into master
gitea/salix/pipeline/head This commit looks good Details
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
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