Commit Graph

17882 Commits

Author SHA1 Message Date
Alex Moreno 83d1e5cb74 Merge pull request '6254-collection_getTickets' (!1769) from 6254-collection_getTickets into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1769
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-02 07:51:58 +00:00
Jorge Penadés 31220b8005 Merge branch '6119-addMicrosipLink' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 09:28:55 +02:00
Jorge Penadés 0489bdfdb8 Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 07:28:55 +00:00
Jorge Penadés 2eb9a97ece Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-10-02 09:28:41 +02:00
Jorge Penadés a04167f3f1 Merge pull request 'ref #6065 replace then by async/await' (!1766) from 6065-fixWorkerTimeControl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1766
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-02 07:28:20 +00:00
Sergio De la torre 3ba349b74a refs #5890 feat: itemShelvingSaleAsignado more calls
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 09:14:30 +02:00
Jorge Penadés a7128b8187 ref #5417 fix transactions
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 09:04:43 +02:00
Jorge Penadés b0575a81a0 Merge branch '5417-fixCustomerPayments' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 08:49:49 +02:00
Jorge Penadés cb2ac21349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments 2023-10-02 08:49:27 +02:00
Jorge Penadés 1cb2bec650 Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head Build queued... Details
2023-10-02 06:37:58 +00:00
Jorge Penadés 250cb3cb68 Merge branch 'dev' into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 06:35:15 +00:00
Jorge Penadés f73a6bdb66 Merge branch '6065-fixWorkerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 08:21:27 +02:00
Jorge Penadés 82fb294a8b Merge branch 'dev' into 6065-fixWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 06:21:42 +00:00
Jorge Penadés 5f93df26a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl 2023-10-02 08:21:09 +02:00
Alex Moreno 9d272373b4 Merge pull request 'refs #6033 feat(VnLog): can use accountDescriptor' (!1765) from 6033-vnLog_userDescriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1765
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-02 05:32:47 +00:00
Alex Moreno 3ec598f3f6 Merge pull request 'HOTFIX refs #5929 fix(isEditable): can edit if is weekly' (!1770) from 5929-hotFix_canEdit_weekly into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1770
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-02 05:16:05 +00:00
Alex Moreno d3706733e4 Merge branch 'master' into 5929-hotFix_canEdit_weekly
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 05:06:55 +00:00
Alex Moreno 7b8518ff5a Merge branch 'dev' into 6033-vnLog_userDescriptor
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 05:04:26 +00:00
Jorge Penadés 6f4a12e50f ref #5417 date filters added
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 14:42:47 +02:00
Jorge Penadés d112fd0e5b Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 12:35:22 +00:00
Carlos Andrés c469a221c7 refs #6254
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 14:16:35 +02:00
Carlos Andrés 0e5a7bbb85 refs #6254
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 14:11:11 +02:00
Carlos Andrés 17e6cffa3d refs #6254 collection getTickets
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 13:47:29 +02:00
Carlos Andrés 41ac907b05 refs #6254-collection_getTickets 2023-09-29 13:44:41 +02:00
Jorge Penadés b4fdde29b7 Merge branch 'dev' into 6065-fixWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-29 11:04:08 +00:00
Alex Moreno 5797398cf2 refs #5890 correct version 234201 in dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 12:41:23 +02:00
Alex Moreno 660a0381c6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-09-29 12:40:30 +02:00
Alex Moreno 1d440d5c02 refs #5890 correct version 234002
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 12:40:11 +02:00
Alex Moreno 10de00ea45 refs #5890 deploy: test to dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 12:37:53 +02:00
Alex Moreno 6e06d21f9e refs #5890 deploy: merge dev in test 234002
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 12:36:36 +02:00
Carlos Andrés 2820b0253f Merge branch 'test' into 6254-collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-29 10:31:14 +00:00
Jorge Penadés 3e9d01815a Merge branch 'dev' into 6065-fixWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-29 10:30:44 +00:00
Carlos Andrés 9a7cb3ef7b refs #6254 collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-29 12:30:05 +02:00
Alex Moreno 3966f6a53a Merge pull request 'refs #5890 feat: itemShelvingSaleAsignado' (!1767) from 5890--itemShelvingAsignado into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1767
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-09-29 10:28:19 +00:00
Alex Moreno a0d705683b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-09-29 12:22:42 +02:00
Alex Moreno 53ab694ad4 Merge branch 'dev' into 5890--itemShelvingAsignado
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:18:34 +00:00
Alex Moreno b33700abc9 refs #6216 feat(ticket_sale): open filtered ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 11:57:25 +02:00
Jorge Penadés 6691cbf32f ref #5914 changes moved
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 11:24:24 +02:00
Carlos Andrés 934b4c4b36 refs #5890
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:53:06 +02:00
Jorge Penadés 9536fdba58 ref #6119 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:10:58 +02:00
Alex Moreno a0a59b672f refs #6271 hotFix(email): clientCreditEmail → creditRequestEmail
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:04:57 +02:00
Pablo Natek 0fa56149d7 refs #6266 smsfix
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 09:47:22 +02:00
Alex Moreno 542119983b refs #5929 test: fix test after fix ticket_isEditable
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 09:28:23 +02:00
Jorge Penadés f1dc809147 Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 06:22:51 +00:00
Jorge Penadés 50eab23f39 Merge branch '6065-fixWorkerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 08:20:30 +02:00
Jorge Penadés 4d226d9a58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl 2023-09-29 08:20:16 +02:00
Jorge Penadés 5f4a07bb33 Merge branch 'dev' into 6065-fixWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 06:20:03 +00:00
Jorge Penadés 2506db69cb Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 08:20:00 +02:00
Jorge Penadés 19fc2a4523 Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 06:18:20 +00:00
Jorge Penadés d4e78ea889 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-29 08:16:12 +02:00