Commit Graph

2992 Commits

Author SHA1 Message Date
Jon Elias 3139d99130 Merge branch 'dev' into 7010-AddPackingField
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-18 07:30:43 +00:00
Jon Elias 46993ad103 refactor: refs #7010 deleted distinct
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-18 09:29:01 +02:00
Jon Elias f68584b3fa Merge branch 'dev' into Fix-ItemRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-18 06:53:38 +00:00
Javi Gallego 681f82a3ae feat: refs #7744 test back ok
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-16 16:09:53 +02:00
Jorge Penadés 8ca097d4a9 chore: refs #7919 change var name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-16 09:23:39 +02:00
Javi Gallego c6e764b478 feat: refs #7348 hasDailyInvoice from client
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-16 08:32:10 +02:00
Jorge Penadés d57f4fc44a chore: refs #7919 refactor, drop relation on back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-15 17:24:14 +02:00
Jorge Penadés 6f8a005726 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-15 17:01:29 +02:00
Javi Gallego 4a88ba5078 feat: refs #7744 closeAll Test 2024-10-15 15:43:12 +02:00
Jon Elias e334152acc refactor: deleted comment
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-15 09:03:15 +02:00
Javi Gallego 976e50b566 feat: refs #8098 identation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-15 08:25:53 +02:00
Javi Gallego 4526873bbe feat: refs #8098 without Date 2024-10-15 08:24:13 +02:00
Javi Gallego f2d1aa5f16 feat: refs #8098 closureDaysAgo 2024-10-15 08:17:03 +02:00
Jorge Penadés 6d4c71d465 feat: refs #7919 test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-14 17:14:40 +02:00
Jorge Penadés a35208d903 feat: refs #7919 test 2024-10-14 17:14:01 +02:00
Jorge Penadés ccf9dbde8e feat: refs #7919 test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-14 17:11:12 +02:00
Jon Elias 07849ebeb8 fix: myTeam param
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-14 13:25:09 +02:00
Jon Elias 4ee6a46bd5 feat: added new filter param
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-14 11:29:49 +02:00
Alex Moreno d8e0c1debe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-14 07:27:19 +02:00
Alex Moreno 040304d04f fix: merge
gitea/salix/pipeline/head This commit looks good Details
2024-10-08 17:10:19 +02:00
Alex Moreno 0c6541372e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-10-08 17:09:26 +02:00
Alex Moreno 3cf7591206 fix(closeAll): not use transaction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-08 17:03:27 +02:00
Carlos Andrés d497ffc781 Actualizar modules/ticket/back/methods/ticket/closure.js
gitea/salix/pipeline/head This commit looks good Details
2024-10-08 13:32:57 +00:00
Jon Elias cbc8cc6210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7010-AddPackingField 2024-10-03 09:14:16 +02:00
Javi Gallego 1cf14035d5 feat: existingRefund without ticketRefund
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 15:51:30 +02:00
Javi Gallego 40512ca67e feat: existingRefund without ticketRefunds
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 15:49:51 +02:00
Alex Moreno 61f806b0c9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-30 14:40:35 +02:00
Alex Moreno 75d0c298a1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-30 14:38:17 +02:00
Jon Elias b55db4bdc0 feat: refs #7010 added subquery to avoid using group by in sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-30 14:09:57 +02:00
Jon Elias b547858820 perf: refs #7010 showing field correctly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-27 08:28:12 +02:00
Jon Elias 4ebda1a06f feat: refs #7010 added filter fields to show packing type field in ticket list
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-26 14:06:45 +02:00
Sergio De la torre 8f63118550 fix: refs #6861 updateAvailable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-25 12:24:00 +02:00
Jon Elias d221611382 Merge branch 'dev' into 7356-FixTicketWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-24 09:33:47 +00:00
Jon Elias fa4f75fbb9 Merge branch '7356-FixTicketWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 7356-FixTicketWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-19 13:14:24 +02:00
Jon Elias b642147d82 feat: refs #7356 added new filter field 2024-09-19 13:14:22 +02:00
Alex Moreno ccb60eee87 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-19 12:42:12 +02:00
Jorge Penadés 529be86d84 fix: refs #7524 too records error
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-17 11:44:09 +02:00
Javi Gallego e5e14878b8 feat: refs #3505 remove return
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 07:57:00 +02:00
Javi Gallego f43fa32d36 feat: refs #3505 fdescribe
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 13:26:53 +02:00
Javi Gallego e4a74ba0e9 feat: refs #3505 testBack closure 2024-09-16 13:24:33 +02:00
Guillermo Bonet 6b5f59a09b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 12:54:27 +02:00
Guillermo Bonet 4c6aba96e5 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 12:54:16 +02:00
Pablo Natek 842c98edfc Merge branch 'dev' into 6156-advanceTicketsNewField
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:22:24 +00:00
Jorge Penadés 2ee0c93e24 chore: refs #7663 fix test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 09:35:26 +02:00
Jorge Penadés 558ab6eba2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight 2024-09-11 09:30:18 +02:00
Carlos Satorres 838b8f541f fix: setDeleted
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 08:45:00 +02:00
Carlos Satorres ccaf56f842 fix: setDeleted
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 08:35:19 +02:00
Jorge Penadés 91abf2eefe refactor: refs #7663 accurate error
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-10 09:50:02 +02:00
Jorge Penadés e2ef3472b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 09:41:46 +02:00
Javier Segarra 89c2d2705c feat(salix): refs #5938 #5938 change value-field 2024-09-09 14:21:59 +02:00
Javier Segarra f15b33778c feat(salix): refs #5938 #5938 replace variables 2024-09-09 14:21:42 +02:00
Jon Elias 662ede981b Merge branch 'dev' into 7356-FixTicketWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 11:59:42 +00:00
Jon Elias 97b07ea561 fix: refs #7356 ticket weekly filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 13:56:30 +02:00
Javier Segarra 2fef104954 Merge branch 'dev' into 6156-advanceTicketsNewField 2024-09-09 10:48:20 +00:00
Guillermo Bonet daf3dfd2ee Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:35:28 +02:00
Guillermo Bonet 723ec2b453 fix: refs #7844 Filter monitor
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:34:42 +02:00
Javier Segarra 378ee1119f Merge branch 'dev' of https: refs #6156//gitea.verdnatura.es/verdnatura/salix into 6156-advanceTicketsNewField 2024-09-09 10:18:10 +02:00
Alex Moreno 632d3190b1 feat: refs #7938 remove unnecessary insert in clientLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 07:49:22 +02:00
Jorge Penadés 99ce158632 chore: refs #7663 return correct type
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 11:33:15 +02:00
Jorge Penadés 26d47b3f38 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 11:29:53 +02:00
Javi Gallego 40a1b24403 Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2904
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 09:07:24 +00:00
Guillermo Bonet 6df817ea5d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-05 09:25:00 +02:00
Guillermo Bonet 95d4c706d4 fix: refs #7346 multiple to quick in closure.js
gitea/salix/pipeline/head This commit looks good Details
2024-09-05 09:23:58 +02:00
Jorge Penadés 998d3865a3 chore: refs #7663 fix test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 08:56:15 +02:00
Robert Ferrús 4c96d57491 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 06:06:22 +00:00
Guillermo Bonet 2bb73af47d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 14:12:50 +02:00
Guillermo Bonet 80839100c7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 14:10:33 +02:00
Guillermo Bonet 212e8d1a03 fix: refs #7346 invoiceSerial 2024-09-04 14:09:31 +02:00
Jorge Penadés 8311795fd8 refactor: refs #7524 dynamic fetch
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 12:16:42 +02:00
Jorge Penadés df5961a2a2 feat: refs #7663 wip test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-04 11:41:47 +02:00
Jorge Penadés 544ddb0f15 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-04 10:39:46 +02:00
Guillermo Bonet c5521ea021 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 07:06:22 +02:00
Jorge Penadés 9797d5e219 feat: refs #7663 return created invoice ids
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 17:33:44 +02:00
Javier Segarra d54361a0bc Merge branch 'dev' into 7277-RefundInvoices
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 13:38:03 +00:00
Guillermo Bonet 3cc19549e4 fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-09-03 15:03:09 +02:00
Guillermo Bonet 790a44c62a fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems 2024-09-03 13:29:01 +02:00
Jorge Penadés 4c5f5c8324 fix: refs #7663 conflicts
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 17:08:23 +02:00
Jorge Penadés b83e548feb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-02 17:02:00 +02:00
Guillermo Bonet 6fc8b9b821 feat: ticket 215005 Changed acl show transferClient
gitea/salix/pipeline/head This commit looks good Details
2024-09-02 14:41:02 +02:00
Robert Ferrús 48bf5004a6 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 08:09:43 +00:00
Javi Gallego 51535bfa6b feat: refs #7277 refundInvoices 2024-08-30 13:50:51 +02:00
Javi Gallego a8ee92f891 Merge branch 'dev' into 6760-transferClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-28 10:36:17 +00:00
Guillermo Bonet 79e2424a41 Merge branch 'dev' into 7844-changeProblemsCalc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 08:04:21 +00:00
Jorge Penadés 4a3faebe7d Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-26 16:59:40 +02:00
Javi Gallego 5f06ae5cf4 feat: refs #6760 refs #actualiza campo nickname
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-26 15:57:39 +02:00
Javi Gallego 32d36cda21 feat: refs #7710 pr revision
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 14:28:25 +02:00
Javi Gallego 340515968b feat: refs #7710 test fixed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 10:57:35 +02:00
Javi Gallego 7f543e8d3a Merge branch 'dev' into 7346 2024-08-14 10:32:32 +02:00
Jorge Penadés 6c9676ce9c chore: refs #7663 fix logic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 14:52:26 +02:00
Jorge Penadés 52d62710e6 chore: refs #7663 fix logic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 13:49:00 +02:00
Jorge Penadés c742f6f79d Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 16:59:28 +02:00
Alex Moreno c768fa113e test: fix ticket redirect to lilium
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-08 08:20:26 +02:00
Guillermo Bonet 09a0459a7b refs #7844 Fix tests part 2/2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-07 13:52:41 +02:00
Guillermo Bonet 4cbea3bf7b refs #7844 Fix tests part 2/2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 13:51:00 +02:00
Guillermo Bonet 8aa06e12b3 refs #7844 Fix tests part 1/2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 12:39:18 +02:00
Alex Moreno 4e831dc1bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 11:17:09 +02:00
Alex Moreno 6fb78e1599 test: hotFix saveSign
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 08:59:20 +02:00
Guillermo Bonet d6e09fcfc9 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 12:59:37 +02:00
Guillermo Bonet 91253cc807 fix: refs #7835 transferSales
gitea/salix/pipeline/head This commit looks good Details
2024-08-05 12:57:38 +02:00
Jorge Penadés 57f6c6d9a1 chore: refs #7663 WIP setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 10:43:55 +02:00