Commit Graph

24001 Commits

Author SHA1 Message Date
Pablo Natek 2084d047b2 fix: refs #6130 code 2024-04-05 15:01:12 +02:00
Pablo Natek 29f952308f #code: refs #6130 code@ 2024-04-05 14:58:43 +02:00
Pablo Natek 1e669e99f8 fix: refs #6130 code:code 2024-04-05 14:58:20 +02:00
Pablo Natek 70bdb52371 fix: refs #6130 code 2024-04-05 14:57:52 +02:00
Pablo Natek 11dea43da2 fix:refs #6130 code 2024-04-05 14:53:06 +02:00
Alex Moreno 93000aaecf Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 12:20:09 +00:00
Pablo Natek 021280c53c fix commit code 2024-04-05 14:14:10 +02:00
Pablo Natek 42e21eb602 feat(githook) add reference 2024-04-05 14:13:17 +02:00
Robert Ferrús 9af87f5cf2 Merge pull request 'feat: refs #6738 crear las Fk de la tabla flight' (!2054) from 6738-cleanTables2008Part2to2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2054
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-05 11:51:21 +00:00
Carlos Satorres e0c0c4dbc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6111-routeList
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 13:30:14 +02:00
Carlos Andrés cedfdbb421 fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 13:22:54 +02:00
Juanjo Breso 07b45748f0 Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 12:58:36 +02:00
Juanjo Breso c74aea74bc feat: refs#6493 modificaciones solicitadas. 2024-04-05 12:58:31 +02:00
Juanjo Breso f316ca6974 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 10:55:20 +00:00
Robert Ferrús cf5113c5a6 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 10:23:55 +00:00
Guillermo Bonet 6c1e44638e feat: refs #6636 Added getEnumValue method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 11:01:00 +02:00
Alex Moreno 0af3713a07 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 10:33:47 +02:00
Alex Moreno 03fb52bf6f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 10:33:26 +02:00
Alex Moreno 273507d3b7 Merge pull request 'refs #7167 deploy: dump' (!2260) from 7167-dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2260
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-04-05 08:32:07 +00:00
Alex Moreno 2f4cd2bc7b refs #7167 fix: acl mailAlias
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-05 10:05:51 +02:00
Alex Moreno ed95545de6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7167-dump 2024-04-05 10:00:34 +02:00
Javier Casado db618b819c Merge pull request 'refs #6816 remove tittle MicroSip' (!2248) from 6816-removeMicroSip into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2248
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-05 07:56:44 +00:00
Javier Casado 6f2b3ea059 Merge pull request 'refs #6324 remove column and dependencies' (!2255) from 6324-removePackageFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2255
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-05 07:55:46 +00:00
Pablo Natek 0004d1da23 test: commit 2024-04-05 09:34:10 +02:00
Pablo Natek a30cc3b660 feat: commit 2024-04-05 09:32:07 +02:00
Javier Casado bf3eb51bad Merge pull request '#7123 - creditRequestChange' (!2238) from 7123-creditRequestChange into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2238
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-05 07:29:43 +00:00
Pablo Natek 71a333786e commit 2024-04-05 09:08:20 +02:00
Pablo Natek d9a3cc9591 commit 2024-04-05 09:07:01 +02:00
Pablo Natek 9786c10e98 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6130-commitLint 2024-04-05 09:00:17 +02:00
Robert Ferrús 6fab793184 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 06:21:36 +00:00
Guillermo Bonet 16a6e3d8a6 feat: refs #6636 Requested change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 08:18:38 +02:00
Pablo Natek 4b4aaa9e10 feat: refs #6005 move logic from report to hook 2024-04-05 08:04:53 +02:00
Guillermo Bonet 0cd4013f5e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 07:51:19 +02:00
Guillermo Bonet f067adb6b9 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 07:50:46 +02:00
Guillermo Bonet 7ea917dc4d hotfix: #6875 packing DEFAULT 1
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 07:49:37 +02:00
Guillermo Bonet 1656c8db63 Merge branch '6636-pickup' of https://gitea.verdnatura.es/verdnatura/salix into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 07:42:04 +02:00
Guillermo Bonet 23db6a41be feat: refs #6636 Minor change 2024-04-05 07:42:03 +02:00
Guillermo Bonet ac658fb6af Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 05:29:26 +00:00
Carlos Andrés d18721f50d feat: bloquear facturas recibidas contabilizadas refs #7173
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-04 18:05:45 +02:00
Carlos Andrés fe0afe30bf fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 17:50:39 +02:00
Sergio De la torre cf10ed0f13 Merge pull request '#6964 _ itemOlder' (!2197) from 6964_itemOlder into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2197
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-04 14:18:19 +00:00
Sergio De la torre 2ed5237568 Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 13:45:20 +00:00
Carlos Andrés bd661befb6 feat: bloquear facturas recibidas contabilizadas refs #7173
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 15:04:23 +02:00
Alex Moreno a6e4bdd7ac refs #7167 deploy: dump
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-04 15:02:41 +02:00
jcasado 84e6e7f7bf refs #6641 test fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 14:53:26 +02:00
Carlos Andrés 9fcad457a7 fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 14:46:51 +02:00
Robert Ferrús efcb7a9d50 Merge pull request 'refs #169673 item_getSimilar' (!2252) from 169673-item_getSimilar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2252
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-04 12:43:26 +00:00
jcasado 1c6d913926 refs #6641 addFilterCollegues
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 14:28:39 +02:00
Carlos Andrés 75a4d6947f fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 14:20:55 +02:00
Guillermo Bonet fcb4fe92e8 Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 12:14:23 +00:00