Commit Graph

19408 Commits

Author SHA1 Message Date
Sergio De la torre ca438c7c7f Merge branch 'dev' into 6669_ticketClosure
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 05:57:29 +00:00
David Domenech ae0ce91127 refs #6685
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-16 06:10:09 +01:00
Carlos Satorres bb6861d799 Merge pull request 'hotfix creditClient' (!2041) from hotfix-creditClient into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2041
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-15 15:25:46 +00:00
Jorge Penadés 78583751ec refactor: refs #6760 ticketsIds improved
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 16:22:13 +01:00
Jorge Penadés 3d25b599ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 14:49:21 +01:00
Jorge Penadés f11aa2605b feat: refs #6776 back & procedure modified
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 14:48:30 +01:00
Javi Gallego 27627017c5 feat: #6392 fk que faltan
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 14:21:49 +01:00
Guillermo Bonet 98ad133afd Merge pull request 'refactor: refs #6775 Deleted proc itemProposal_Add' (!2034) from 6775-itemProposalAdd into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2034
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-15 12:21:23 +00:00
Guillermo Bonet 4b568bc41e Merge branch 'dev' into 6775-itemProposalAdd
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 13:19:58 +01:00
Carlos Satorres 98d2b5a0ff hotfix creditClient
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-15 12:59:30 +01:00
Alex Moreno 8cb17762f8 refs #6863 deployt: init version 24.10
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 12:21:45 +01:00
Juan Ferrer acc9d05530 build: refs #6859 pnpm-lock.yaml updated
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 11:49:25 +01:00
Juan Ferrer 38cfb6e03e build: refs #6859 Merge from test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-15 11:47:33 +01:00
Juan Ferrer a9ccbfc1d4 Merge branch 'test' into dev 2024-02-15 11:41:01 +01:00
Juan Ferrer cc24ecdc7d build(dump): refs #6859
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 11:28:46 +01:00
Jorge Penadés be7a570314 fix: refs #6776 test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 11:18:01 +01:00
Guillermo Bonet f63abc1a6e fix: refs #6859 zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-15 11:07:47 +01:00
Jorge Penadés bec574ff99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 11:03:33 +01:00
Guillermo Bonet 256aa76e23 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 09:18:13 +00:00
Alex Moreno 625922275c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-15 10:14:19 +01:00
Alex Moreno 6685a20114 build: refs #6859 myt pull db
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 10:04:15 +01:00
Alex Moreno 2703d50cbf refs #6859 fix(account): changePassword name
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 09:39:02 +01:00
Guillermo Bonet 5a0ce700b3 fix: refs #5586 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 09:38:34 +01:00
Jorge Penadés fa7b94590d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 08:36:00 +01:00
Javier Segarra 904692a11f Merge pull request '#2687 - Fix Travel_cloneWithEntries' (!2021) from 2687_fix_travel_cloneWithEntries into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2021
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-15 07:34:49 +00:00
Javi Gallego 6691155217 Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-15 08:14:56 +01:00
Javier Segarra 234ea26fe2 Merge branch 'test' into 2687_fix_travel_cloneWithEntries
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-15 07:07:44 +00:00
Guillermo Bonet 8c262df31e Merge branch '5586-optimizeNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 07:52:34 +01:00
Guillermo Bonet 10bfb7a7d7 fix: refs #5586 Minor change 2024-02-15 07:52:33 +01:00
Alex Moreno fddbf6451b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 07:52:08 +01:00
Javier Segarra 0e32814717 Merge branch '2687_fix_travel_cloneWithEntries' of https://gitea.verdnatura.es/verdnatura/salix into 2687_fix_travel_cloneWithEntries
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-15 07:50:22 +01:00
Guillermo Bonet 46a1ad35b5 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 06:50:03 +00:00
Javier Segarra d9756a0f3f refs #2687 feat: comments 2024-02-15 07:49:57 +01:00
Guillermo Bonet 05b7c37b94 fix: refs #5586 Rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 07:49:17 +01:00
Alex Moreno b08dd95e92 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 07:30:42 +01:00
Javier Segarra 3ff3c812ed refs #2687 fix: remove bad changes file
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-14 20:15:34 +01:00
Javi Gallego 798bd10303 Merge pull request 'feat: refs #5720 vehicle nuevos campos' (!2029) from 5720-poolbancario into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2029
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-14 14:02:21 +00:00
Robert Ferrús e21f8aafe0 Merge pull request 'fix: refs #6371 balanceNestTree add constraint' (!2039) from 6371-fixCreateConstraint into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2039
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-14 13:48:57 +00:00
Javi Gallego d7efdacab3 Merge branch 'dev' into 5720-poolbancario
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 13:47:13 +00:00
Robert Ferrús 88f508a424 fix: refs #6371 balanceNestTree add constraint
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 14:42:04 +01:00
Guillermo Bonet a690401b33 Merge pull request 'refactor: refs #6778 Migrated views of vn2008 to vn' (!1996) from 6778-changeViewDependencesVn2008 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1996
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-14 13:17:46 +00:00
Jorge Penadés 32f8d13359 fix: refs #6760 back modified & revoke update on ticket.clientFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 13:15:31 +01:00
Guillermo Bonet 8ee8fe1851 Merge branch '6778-changeViewDependencesVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 12:12:41 +01:00
Guillermo Bonet 35fc8930ce fix: refs #6778 Fix and tested 2024-02-14 12:12:40 +01:00
Guillermo Bonet 18c10e2dd7 refactor: refs #6778 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 11:39:15 +01:00
Guillermo Bonet 2c82a64029 Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 10:38:33 +00:00
Guillermo Bonet 267fd8beb8 Merge pull request 'refactor: refs #6501 Migrated procs from vn2008 to vn' (!2016) from 6501-procMigration into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2016
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-14 10:31:12 +00:00
Guillermo Bonet b46087b75c refactor: refs #6501 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 11:21:22 +01:00
Guillermo Bonet b815677a1f Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 11:16:53 +01:00
Guillermo Bonet b64637254b refactor: refs #6501 Requested changes 2024-02-14 11:16:52 +01:00