Commit Graph

804 Commits

Author SHA1 Message Date
Guillermo Bonet 0ab79728b5 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:10:20 +02:00
Guillermo Bonet 7eb2e8f218 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:09:59 +02:00
Guillermo Bonet b926725021 hotfix: ticket#179915 Fix no worker exists
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:04:44 +02:00
Jon Elias 2b9bfb5d85 Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2364
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-30 10:19:29 +00:00
Guillermo Bonet f10ecf4f00 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:47:55 +02:00
Guillermo Bonet c987bb6e66 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:47:35 +02:00
Guillermo Bonet d44b8f7c9a hotfix: ticket #179514 ticket_close packaging fix
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:44:16 +02:00
Guillermo Bonet 110cae3171 Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2353
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-30 08:23:52 +00:00
Guillermo Bonet 80b44ccace Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2362
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-30 05:37:33 +00:00
Carlos Andrés e55658e6b3 Hotfix feat: new function to kill connections 2024-04-29 17:02:47 +02:00
Carlos Andrés 21a1e1eed3 Hotfix feat: new function to kill connections 2024-04-29 16:59:56 +02:00
Carlos Andrés 7b7afb05c5 hotfix collection_assign
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 15:01:20 +02:00
Carlos Andrés 51c8736da2 hotFix collection_assign
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-29 14:54:15 +02:00
Carlos Andrés dcb6f90ab3 hotfix collection_assign elimino vLockTime
gitea/salix/pipeline/head This commit looks good Details
2024-04-29 14:42:16 +02:00
Pako Natek 9aa6e3f80a hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-27 13:09:15 +02:00
Pako Natek 3440bb1725 hotFix
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-27 12:43:15 +02:00
Pako Natek 9e87b055b7 hotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-27 12:36:21 +02:00
Robert Ferrús c819b92141 fix: refs #177968 restore restriction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-26 09:09:22 +02:00
Pablo Natek 4693ba13fa Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-26 08:37:51 +02:00
Robert Ferrús 30a905f40b Merge branch 'dev' into 6223-ticketCalculateClon
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 05:08:26 +00:00
Jorge Penadés f7cdbd39f0 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:08:52 +02:00
Pablo Natek c5b02dc239 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 09:46:53 +02:00
Jorge Penadés 88b06ebef5 feat: refs #7211 check if there's available clockIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 08:49:22 +02:00
Sergio De la torre d4d31c6d9e refs #6312 hotFix fix:replaceItem
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-25 08:35:59 +02:00
Sergio De la torre 46f2d790db refs #6312 hotFix fix:replaceItem
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-25 08:01:32 +02:00
Guillermo Bonet 60a3ec99d0 Merge branch 'dev' into 7258-lastChangesMigrationVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 05:02:17 +00:00
Sergio De la torre 8bb2fa93a7 Merge branch 'dev' into 6574_itemGetBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 13:46:53 +00:00
Alex Moreno 917592cdad Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2366
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-24 12:34:46 +00:00
Alex Moreno 2638b93299 Merge branch '7225-hotFix_ticket_advanced_movable' of https://gitea.verdnatura.es/verdnatura/salix into 7225-hotFix_ticket_advanced_movable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-24 11:40:25 +02:00
Alex Moreno eced03f69b fix(ticket_getMovable): refs #7225 stock add ifnull 2024-04-24 11:40:24 +02:00
Guillermo Bonet 71e1e53ccd refactor: #7258 Fixes 2024-04-24 10:57:35 +02:00
Alex Moreno 2e1ad0c000 Merge branch 'master' into 7225-hotFix_ticket_advanced_movable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-24 08:42:26 +00:00
Jon Elias 6706974784 fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 10:31:26 +02:00
Guillermo Bonet f7ebd071bf refactor: #7258 Deleted all dependences of vn2008 schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 09:53:31 +02:00
Robert Ferrús ec7dc390b9 Merge branch 'dev' into 6223-ticketCalculateClon
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-24 06:05:03 +00:00
Robert Ferrús e36e997844 feat: refs #6223 ticketCalculateClon 2024-04-24 08:04:28 +02:00
Guillermo Bonet a6c57ef3df Merge branch 'dev' into 6997-eypbc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 05:09:44 +00:00
Juanjo Breso be8e55a905 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 05:03:19 +00:00
Carlos Andrés 26fd1ae6c9 Merge pull request 'test' (!2359) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2359
2024-04-23 15:53:13 +00:00
Carlos Andrés a7f1188975 Merge pull request 'master' (!2358) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2358
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-04-23 15:35:33 +00:00
Carlos Andrés 033bcf6b67 hotfix importErrorNotification refs #6189
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-23 17:24:47 +02:00
Alex Moreno cc06698214 hotFix(ticket): refs #7225 fix advanced and movable
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-23 15:37:04 +02:00
Juanjo Breso 9c306d4cc2 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:55:02 +00:00
Juanjo Breso 5efb6acafe feat: refs#6493 Cambios solicitados procedimientos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 14:55:05 +02:00
Guillermo Bonet e0393a6e72 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 14:43:19 +02:00
Guillermo Bonet f5844ff426 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 14:42:57 +02:00
Guillermo Bonet ec23cc7619 hotfix: entry_checkBooked
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 14:41:43 +02:00
Juanjo Breso 022264ffff 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-23 14:05:51 +02:00
Juanjo Breso d1c72a0be3 feat: refs#6493 Cambios solicitados procedimientos 2024-04-23 14:05:48 +02:00
Juanjo Breso 9b2bb4be0e Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:04:19 +00:00