Commit Graph

19456 Commits

Author SHA1 Message Date
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
Guillermo Bonet 08db19bf4e Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 10:11:12 +00:00
Robert Ferrús 0ee5226dcb Merge pull request 'feat: refs #6371 cleanTablesFix' (!2011) from 6371-limpiezaTablasVn2008Part1Fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2011
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-14 10:10:10 +00:00
Guillermo Bonet cddb8dc216 Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 10:06:23 +00:00
Guillermo Bonet 874f776498 refactor: refs #6501 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 11:05:16 +01:00
David Domenech 0c7ca79ae0 Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 10:03:49 +00:00
David Domenech fd785ee429 refs #6372
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-14 11:01:37 +01:00
Robert Ferrús fb44052a09 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 10:01:36 +00:00
Javier Segarra d1b24125f4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 2687_fix_travel_cloneWithEntries
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-14 09:33:34 +01:00
Javier Segarra fb1d11af17 refs #2687 feat: comments
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-02-14 09:32:44 +01:00
Javier Segarra b9a624d9cd refs #2687 feat: create util.procedures
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-02-14 09:30:31 +01:00
Javier Segarra f608eb1859 Merge pull request '#6386 - Download method add file with extension' (!1993) from 6386_imageWithNoFormat into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1993
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-02-14 08:13:55 +00:00
Javi Gallego 3665db359e feat: #63922 actualiza usando las fk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-14 09:02:39 +01:00
Alex Moreno 8483a29b5e Merge pull request 'feat: refs #6728 revision triggers test' (!2038) from 6728-revisar-Triggers into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2038
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-14 07:48:14 +00:00
Robert Ferrús 4cfe4cf96d Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 07:39:18 +00:00
Juanjo Breso 8542f1fae5 feat: refs #6728 revision triggers test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-14 08:34:02 +01:00
Juanjo Breso f765fcca2c Merge pull request 'feat: refs #6693 revisar triggers' (!2033) from 6693-revisarTriggersPendientes into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2033
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-02-14 07:12:02 +00:00
Juanjo Breso 6fe6e35607 Merge branch 'dev' into 6693-revisarTriggersPendientes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 07:10:08 +00:00
Juanjo Breso c2dadc09a2 feat: refs #6693 comprobar triggers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-14 07:36:38 +01:00
Guillermo Bonet d83823ed0e Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 07:07:00 +01:00
Guillermo Bonet 9dd5b725e1 Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 06:04:25 +00:00
Guillermo Bonet 142c1bf7bd Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 06:03:46 +00:00
Juan Ferrer 19bbb4a4bf fix: refs#6706 package.json deprecated scripts removed
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 17:20:04 +01:00
Juan Ferrer 27d7a114e6 fix: refs#6706 package.json dbtest script removed
gitea/salix/pipeline/head This commit looks good Details
2024-02-13 17:16:10 +01:00
Juan Ferrer a5d1597884 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-02-13 16:21:02 +01:00
Juan Ferrer 999d9a0f9c fix: refs#6706 E2E show parameter fix 2024-02-13 16:21:01 +01:00