Commit Graph

24001 Commits

Author SHA1 Message Date
Jorge Penadés d4a8dc7731 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7165-fixEmptySheet
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 08:58:24 +02:00
Alex Moreno fa982df610 Merge branch 'master' into 7268-hotFix_getChanges_datestring
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-02 06:55:57 +00:00
Alex Moreno 71f8e18b46 Merge pull request 'hotFix(getBalance): date setHours to 0' (!2390) from hotFix_getBalance into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2390
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-02 06:27:55 +00:00
Robert Ferrús a00dd82f14 hotFix(getBalance): if null
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-02 08:21:39 +02:00
Robert Ferrús 54499ae4dc Merge branch 'master' into hotFix_getBalance
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-02 06:10:58 +00:00
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
Robert Ferrús 77a1b4bb57 hotFix(getBalance): simplify
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-02 08:02:17 +02:00
Robert Ferrús b8b055b86c hotFix(getBalance): date setHours to 0
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-02 08:00:44 +02:00
Jorge Penadés a9bdfd8821 feat: refs #7165 add changeLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 16:55:41 +02:00
Jorge Penadés d26692aceb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7165-fixEmptySheet
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 16:26:26 +02:00
Jorge Penadés cc4081d25f fix: refs #7165 css
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 16:17:29 +02:00
Carlos Andrés a67f603990 Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 15:50:13 +02:00
Carlos Andrés a40545264b fix: descuentos en bs.ventas refs #6974
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-30 15:46:24 +02:00
Ivan Mas de5e43fb05 Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 12:41:54 +00:00
Ivan Mas 3167bdcdd0 refs #7191 message modification
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 14:37:06 +02:00
Carlos Satorres b66111a032 refs #6895 remove tfront
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 13:33:46 +02:00
Carlos Satorres b0b8f12ca9 refs #6895 remove code 2024-04-30 13:17:19 +02:00
Carlos Satorres e546a13e5d refs #6895 redirect lilium 2024-04-30 12:41:29 +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
Alex Moreno d18f08e676 hotFix(addSaleByCode) add userId
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 12:15:27 +02:00
Robert Ferrús 5ea57ce728 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 10:04:40 +00:00
Robert Ferrús 83e9756692 fear: refs #7296 expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 12:02:19 +02:00
Robert Ferrús e7be1e2efe feat: refs #7296 expeditionTruck to roadmapStop
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-30 11:48:18 +02: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
Javier Segarra 426c5de1b8 Merge branch '7272_bug_redirectToLogin' of https://gitea.verdnatura.es/verdnatura/salix into 7272_bug_redirectToLogin
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-30 11:45:39 +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
Javier Segarra 5b4ed62a36 Merge branch 'dev' into 7272_bug_redirectToLogin 2024-04-30 11:35:51 +02:00
Javier Segarra be3ee43b06 fix(salix): refs #7272 #7272 Back validateToken endpoint 2024-04-30 11:35:30 +02:00
Javier Segarra b4284889e1 fix(salix): refs #7272 #7272 Front retry calls 2024-04-30 11:35:07 +02:00
Javier Segarra 43cedef259 fix(salix): refs #7272 #7272 Call validateToken 2024-04-30 11:26:31 +02:00
Javier Segarra 6277c3da09 fix(salix): refs #7272 #7272 Remove aclService from auth.js 2024-04-30 11:26:12 +02:00
Javier Segarra 596c0f78d0 fix(salix): refs #7272 #7272 Add aclService in routes.js 2024-04-30 11:24:36 +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
Carlos Andrés 2b6d4198ad Merge pull request 'Hotfix-create-proc-to-kill-connection' (!2385) from Hotfix-create-proc-to-kill-connection into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2385
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-04-30 07:06:43 +00:00
Javier Segarra 60634fc308 Merge branch 'dev' into 7272_bug_redirectToLogin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 05:58:03 +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
Ivan Mas a33cbb0a7c Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 17:46:26 +00:00
Ivan Mas 30f6a9324d refs #7191 SQL conventions mod
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 19:40:43 +02:00
Carlos Andrés e934b47e98 Hotfix feat: new function to kill connections
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 17:09:51 +02: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
Jorge Penadés 9802f0066c fix: refs #5919 unique key & unassigned locker 2024-04-29 16:05:36 +02:00
Carlos Andrés 8c7f8a43a7 Merge pull request 'hotFix collection_assign' (!2384) from hotfix-eliminar-vLockTime-collection_assign into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2384
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-29 13:02:56 +00: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
Javier Segarra cf800ae6b4 Merge branch 'dev' into 7272_bug_redirectToLogin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 12:50:31 +02:00