Commit Graph

2966 Commits

Author SHA1 Message Date
Sergio De la torre a8cc417fb4 Merge branch 'dev' into 7922-scanOrder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-29 06:32:32 +00:00
Sergio De la torre 93feb74949 Merge branch 'dev' of https: refs #7921//gitea.verdnatura.es/verdnatura/salix into 7921-sendExpeditionLost
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 10:22:23 +01:00
Sergio De la torre 6efc2c340c feat: refs #7921 refs#7921 sendLostExpedition
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-28 08:57:22 +01:00
Guillermo Bonet 765d125219 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-28 07:11:21 +01:00
Sergio De la torre e775e56120 feat: refs #7921 refs#7921 sendLostExpedition
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-25 13:48:27 +02:00
Guillermo Bonet 69e1df2504 fix: refs #235425 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-25 08:47:43 +02:00
Guillermo Bonet 111480f7b7 fix: refs #235425 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-25 07:22:36 +02:00
Sergio De la torre 11e13fdb20 feat: refs #7922 refs #792 scanOrder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-25 06:40:06 +02:00
Guillermo Bonet 4da11c65bb fix: refs #235425 sale priceFixed update
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-24 12:26:03 +02:00
Javier Segarra 070a5640df fix: recalculatePrice not working with all ids
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-24 08:16:04 +00:00
Alex Moreno 4660118211 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-24 07:47:41 +02:00
Jorge Penadés 43f8b22593 feat: refs #8083 add field
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-23 16:10:00 +02:00
Alex Moreno f47043cae4 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-dev This commit looks good Details
2024-10-22 15:07:24 +02:00
Jorge Penadés a543fca01a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8083-hotfix-changeState
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-22 14:23:53 +02:00
Jorge Penadés 1c5e4f40ce feat: refs #8083 add prop
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-22 12:39:51 +02:00
Jorge Penadés ee0c0996f6 feat: refs #7524 add e2e
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-22 12:16:26 +02:00
Jorge Penadés 1efe258ea0 fix: refs #7524 filter by department
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-21 14:30:45 +02:00
Jorge Penadés 2f77359892 Merge branch 'dev' into 7919-deleteTicketRefund
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-21 11:00:31 +00:00
Jon Elias 158f701f1e Merge branch 'dev' into Fix-ItemRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-21 09:31:29 +00:00
Jorge Penadés cb4e8355ba feat: refs #7524 myteam filter
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-21 10:58:36 +02:00
Jorge Penadés 288dc1c598 feat: refs #7524 myteam filter wip
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-21 10:05:58 +02:00
Javi Gallego be9f711cc1 Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3110
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-21 06:31:17 +00:00
Javi Gallego da772cf504 Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3114
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-21 06:29:17 +00:00
Jon Elias 9e9773578a Merge branch 'dev' into Fix-ItemRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-18 11:22:35 +00:00
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