Commit Graph

18503 Commits

Author SHA1 Message Date
Jorge Penadés 7fd27cd7a5 Merge pull request 'fix query: refs #6369' (!1906) from 6369-fixGetNegativeBasesInvoices into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1906
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-01-02 09:00:20 +00:00
Jorge Penadés 68ef193a19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 09:58:30 +01:00
Robert Ferrús 4b5cf4a28d Merge pull request 'refs #5854 itemShelving traducciones' (!1862) from 5854-itemShelvingTraduciones into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1862
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-02 08:48:26 +00:00
Jorge Penadés 3bd14095fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6369-fixGetNegativeBasesInvoices
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 09:45:44 +01:00
Jorge Penadés 92b4908b35 fix conflicts: refs #6276 2024-01-02 09:42:41 +01:00
Jorge Penadés 767894b128 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-01-02 09:41:47 +01:00
Jorge Penadés 763af7da2d fix test: refs #6274
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:58:41 +01:00
Jorge Penadés 801037da64 fix changes: refs #6274
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 08:47:12 +01:00
Jorge Penadés cd701ccd9e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:42:06 +01:00
Alex Moreno 81634e6684 Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 07:17:07 +00:00
Alex Moreno 0101dcda3a refs #5925 fix: add options
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:12:45 +01:00
Alex Moreno ed1764ff30 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 07:12:45 +00:00
Alex Moreno 318761185b refs #6434 fix: remove console.log
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:07:16 +01:00
Alex Moreno dd02a932ef Merge branch 'test' into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 06:40:18 +00:00
Robert Ferrús f7a28eea58 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 06:27:08 +00:00
Jorge Penadés 15ec91ec79 fix query: refs #6369
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 14:05:01 +01:00
Pablo Natek ccf5387e04 refactor(state): refs #6366 unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 12:44:24 +01:00
Jorge Penadés 1b8461034e using hasAnyNegative: refs #6515
gitea/salix/pipeline/head This commit looks good Details
2023-12-29 12:40:48 +01:00
Pablo Natek f7ec64f3c1 merge(dev): refs #6366 merge dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-28 16:00:23 +01:00
Carlos Satorres c77715d865 refs #6291 validation original
gitea/salix/pipeline/head This commit looks good Details
2023-12-26 15:03:10 +01:00
Pablo Natek 323c7adcdd Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good Details
2023-12-26 07:20:58 +00:00
Pablo Natek 5a1c4ddea0 refactor(ticketSms): refs #6259 ticketSmsToClientSms
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-26 08:20:13 +01:00
Jorge Penadés 2e1715a968 refactor renewToken & replace ACL: refs #6274
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 15:19:45 +01:00
Jorge Penadés 89fda361bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-22 11:04:43 +01:00
Jorge Penadés 86db5a931d arrange test suites: refs #6274
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-22 10:44:21 +01:00
Javier Segarra 4d2cf87f49 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 09:37:53 +00:00
Javier Segarra 703e16ffcd Merge pull request '#6434 - signIn_issue' (!1892) from 6434-signIn_issue into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1892
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-12-22 09:36:29 +00:00
Javier Segarra 8d08adca21 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 09:36:02 +00:00
Javier Segarra ec1befcfb0 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 09:25:57 +00:00
Jorge Penadés e1888bd154 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-22 08:35:50 +01:00
Pablo Natek 35750bc93f merge(dev): refs #6259 merge dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 18:46:12 +01:00
Pablo Natek 27a369bef4 refactor(ticketSms): refs #6259 merge ticksms to clientsms
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 18:34:22 +01:00
Carlos Satorres c4ff4c1984 refs #6291 tin valid
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 15:07:03 +01:00
Carlos Satorres 36698c1ace Merge pull request 'refs #5925 models table docuware' (!1889) from 5925-docuwareTablet into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1889
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-12-21 13:20:01 +00:00
Jorge Penadés 0998b5bf2c add locale and refactor: refs #6274
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 13:58:33 +01:00
Javier Segarra 6b37f23349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 13:06:52 +01:00
Carlos Satorres 73d1c1698b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI 2023-12-21 12:38:58 +01:00
Alex Moreno 9951e911ae refs #5925 feat(docuware_upload): use userConfig.tabletFk
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 10:39:46 +01:00
Javier Segarra dc661f298b refs #6434 test: update tests
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 09:10:18 +00:00
Guillermo Bonet 0f20f95dc5 refactor: refs #6433 Deleted isPreviousPrepared* columns in model
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 10:08:17 +01:00
Alex Moreno d30dcd7d70 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5925-docuwareTablet 2023-12-21 09:22:49 +01:00
Javier Segarra 0feb8e5a16 Merge branch '6434-signIn_issue' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 09:01:07 +01:00
Javier Segarra daef9ee59a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue 2023-12-21 09:01:02 +01:00
Jorge Penadés f384616d69 move changes: refs #6274
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 08:57:46 +01:00
Jorge Penadés f5cc2cd75b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 08:38:33 +01:00
Alex Moreno 38279b0786 refs #6594 deploy: init version 24.02
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 08:37:30 +01:00
Alex Moreno f4489a7b56 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-12-21 08:34:44 +01:00
Alex Moreno 7b0c5fe0a0 refs #5739 fix: sql
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 08:33:50 +01:00
Javier Segarra 3c8ff346e2 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 06:58:09 +00:00
Alex Moreno 7b65ebb58b Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 06:50:45 +00:00