Commit Graph

18520 Commits

Author SHA1 Message Date
Jorge Penadés 6986ec1f8a Merge pull request '#6274 workerTimeControl' (!1858) from 6274-loginWorkerTimeControl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1858
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-01-03 11:31:48 +00:00
Alex Moreno ba26237998 refs #5914 refactor: getTaxBases
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 12:19:28 +01:00
Guillermo Bonet f73a447391 refs #6398 Hotfix 1/2
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 11:57:49 +01:00
Jorge Penadés 5dc49d226a refs #6274 fix locale
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 10:13:56 +01:00
Alex Moreno 121caee93a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice 2024-01-03 09:53:52 +01:00
Jorge Penadés 23854cb103 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 09:02:52 +01:00
Jorge Penadés b086da1936 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:57:46 +01:00
Carlos Satorres b70e2fc1a4 Merge pull request 'refs #6085 aclMail back' (!1869) from 6085-ACLsMail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1869
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-03 07:56:07 +00:00
Alex Moreno b7c53507f8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:38:28 +01:00
Alex Moreno 399ca694ab Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:38:01 +01:00
Alex Moreno f607719efe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2024-01-03 08:34:00 +01:00
Carlos Satorres 12165ab382 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:31:07 +01:00
Pablo Natek bc1edf8f04 Merge branch '6259-ticketSmsJoinClientSms' of https://gitea.verdnatura.es/verdnatura/salix into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 19:37:53 +01:00
Pablo Natek c116bc56c3 refactor(clientSms): refs #6259 redirect to lilium 2024-01-02 19:37:51 +01:00
Jorge Penadés 31c282ac0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 14:50:26 +01:00
Guillermo Bonet 2c35eae354 Merge pull request 'refactor: refs #6433 Deleted isPreviousPrepared* columns in model' (!1901) from 6433-sectorRefactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1901
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-01-02 13:14:51 +00:00
Guillermo Bonet 176cbe1537 Merge branch 'dev' into 6433-sectorRefactor
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 13:02:16 +00:00
Alex Moreno 1e3a7e5f91 refs #5914 refactor: invoiceTickets
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 13:17:10 +01:00
Jorge Penadés fad5e84329 Merge pull request '#6606 fix export csv button' (!1907) from 6606-fixExportBtn into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1907
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-02 11:49:05 +00:00
Guillermo Bonet 7cfcb17aff Merge branch 'dev' into 6433-sectorRefactor
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 10:50:00 +00:00
Jorge Penadés 6b8a4a512b adding filter: refs #6606
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 10:42:50 +01:00
Javier Segarra 4510f0a037 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 09:26:18 +00:00
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
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 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 bbf1bb50e9 refs #5525 fix sql supplier for sepacore
gitea/salix/pipeline/head This commit looks good Details
2023-12-28 13:27:38 +01:00
Carlos Satorres bfb31ad7c3 refs #5525 supplier
gitea/salix/pipeline/head This commit looks good Details
2023-12-28 11:46:34 +01:00
Carlos Satorres df1c9e3d9f refs #5525 suppliercif
gitea/salix/pipeline/head This commit looks good Details
2023-12-27 17:46:46 +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