Commit Graph

574 Commits

Author SHA1 Message Date
Jorge Penadés 40b2c32a00 feat: refs #6243 show all cmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 17:37:36 +02:00
Robert Ferrús 82ee8d2209 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 09:25:06 +00:00
Guillermo Bonet c987bb6e66 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:47:35 +02:00
Sergio De la torre a180f54390 refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 08:59:12 +02:00
Sergio De la torre f4767728bc refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-29 08:20:57 +02:00
Sergio De la torre f2225b49a7 refs #6275 hotFix fix:getExpeditionSummary 2024-04-29 08:19:18 +02:00
Robert Ferrús fd7dcf2781 fix: refs #7039 fixpr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 10:26:20 +02:00
Robert Ferrús 8153a526ce feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:35:21 +02:00
Alex Moreno 60d5b9e4aa test: refs #7173 fix sql, adding alias
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-23 08:47:52 +02:00
Sergio De la torre 23fa74a5ad Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 08:11:37 +00:00
Javier Segarra 322d91d814 feat(salix): refs #6930 Add DEFAULT scope 2024-04-19 10:49:57 +02:00
Sergio De la torre f4afda8cb2 Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 14:52:57 +00:00
Jon Elias 08ca1a302b Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!2323) from 7139-changeColumnsInRouteSummary into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #2323
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 12:55:58 +00:00
Sergio De la torre 279c300fbf Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 11:08:15 +00:00
Jon Elias f7a6d47c04 Merge pull request 'feat: #7130 added "served" field to RouteList table(Salix).' (!2219) from 7130-addFieldInRoutes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2219
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 09:34:35 +00:00
Jon Elias d42aab346f refactor: refs #7139 replace warehouse with ticket
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 08:17:43 +02:00
Sergio De la torre a3c8532661 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 13:27:00 +02:00
Javier Segarra 6214da2c42 feat(salix): refs #6930 Undo rollback salix-back 2024-04-17 09:52:53 +02:00
Sergio De la torre d24de61213 refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 08:29:39 +02:00
Sergio De la torre 4cb79956a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery 2024-04-15 13:03:47 +02:00
Sergio De la torre 9c373d9ef3 refs #6921 feat: getTicketsObservations
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-10 12:02:25 +02:00
Guillermo Bonet 1fe783cf0e hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-10 12:00:52 +02:00
Guillermo Bonet c685000b47 hotfix: refs #6930 Rollback tokenMultimedia
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 10:13:56 +02:00
Javier Segarra d30cac971f refs #6930 updates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 07:22:28 +01:00
Jon Elias 562dd4034f feat: #7130 added "served" field to RouteList table(Salix).
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 07:58:35 +01:00
Javier Segarra 6989299593 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 08:26:45 +00:00
Carlos Satorres 6627c7a16a refs #6913 routeKm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 08:25:01 +01:00
Javier Segarra a1a80259a2 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 06:41:17 +00:00
Guillermo Bonet a4419a2542 fix: refs #6184 saveSign
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-26 13:57:07 +01:00
Guillermo Bonet 413f7eb8c8 fix: refs #6184 saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-02-26 12:45:38 +01:00
Javier Segarra 04086e37ee refs #6930 feat: add accessScopes: ['read:multimedia'] forEarch method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 06:57:17 +01:00
Javier Segarra ae0ce8e49a refs #6930 feat: use tokenMultimedia intead tokenUser 2024-02-26 06:53:30 +01:00
Alex Moreno 625922275c 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-02-15 10:14:19 +01:00
Alex Moreno fddbf6451b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 07:52:08 +01:00
Alex Moreno b08dd95e92 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 07:30:42 +01:00
Jorge Penadés c8e13fa858 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6106-fixSignView
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:36:07 +01:00
Guillermo Bonet 97f02187e3 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:35:07 +01:00
Jorge Penadés 534b5bb05a fix: refs #6106 where filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 11:26:00 +01:00
Jorge Penadés d60a95feaa fix: refs #6379 await & locale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 08:34:25 +01:00
Jorge Penadés e0de498f65 fix: refs #6379 add Error & locale
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-09 13:04:27 +01:00
Jorge Penadés 4075375d6e fix: refs #6379 get mail 2024-02-09 12:12:10 +01:00
Carlos Satorres 7e18bd0a12 refs #6281 vehicles remove where
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-07 13:03:24 +01:00
Carlos Satorres 9ee0669903 hotfix kmMax
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-07 11:27:18 +01:00
Guillermo Bonet 2cab007f57 fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 12:12:45 +01:00
Guillermo Bonet f2946e4168 fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 08:04:19 +01:00
Guillermo Bonet d39d54a514 fix: #6184 Requested changes 2024-01-30 09:50:53 +01:00
Guillermo Bonet 1e56e741e2 fix: #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 09:44:10 +01:00
Guillermo Bonet 990e8ee249 Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 08:14:34 +01:00
Guillermo Bonet 7c80a7bdda fix: #6184 Minor changes 2024-01-29 08:14:33 +01:00
Guillermo Bonet 49a08a96da Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 11:56:43 +00:00
Guillermo Bonet 25fa154f60 feat: #6184 Minor changes
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 12:25:02 +01:00
Guillermo Bonet 5828fa9657 feat: #6184 Refactor saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 10:05:24 +01:00
Guillermo Bonet 9005975f1c feat: #6184 Modified email cmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 13:56:47 +01:00
Alex Moreno dec625d2df Merge branch 'master' into 6745-2404_testToMaster
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 06:23:29 +00:00
Sergio De la torre 48e4e21aa8 refs #6028 hotFix : getByWorker days to show
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 12:55:51 +01:00
Sergio De la torre fc53e98bb5 refs #6028 hotFix : getByWorker days to show
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 10:48:01 +01:00
Guillermo Bonet a676607e29 feat: #6184 Added email cmr 2024-01-23 14:13:40 +01:00
Guillermo Bonet 12bfb8ca77 feat: #6184 Added tests and process.env.IS_SPEC_RUNNING 2024-01-23 11:05:39 +01:00
Guillermo Bonet ce5a2ada62 feat: #6184 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-18 07:46:58 +01:00
Guillermo Bonet 85a0f8b323 feat: #6184 Minor change
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 14:30:58 +01:00
Guillermo Bonet 1a52e58eaa feat: #6184 Created generateCmrPdf
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 14:18:31 +01:00
Guillermo Bonet 45fd96cee6 feat: #6184 Modified uploadFile
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 13:07:26 +01:00
Guillermo Bonet f1b84ee7a0 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:44:00 +01:00
Guillermo Bonet 107e35001a fix: refs #6582 Solved log error
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 10:09:43 +01:00
Alex Moreno 199656afb8 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-01-12 12:41:52 +01:00
Guillermo Bonet 783436e8d2 fix: refs #6582 Traductions routesMonitor
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-09 15:02:58 +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
Guillermo Bonet 753c6e9ec5 feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 07:28:54 +01:00
Guillermo Bonet 516a3760a1 feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 07:27:13 +01:00
Sergio De la torre af83519ee6 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 15:12:39 +00:00
Javier Segarra 074bb2b980 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 06:30:14 +00:00
Sergio De la torre 435819cf3c refs #6275 feat:Silex_to_Salix test getExpeditionSummary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 07:24:13 +01:00
Sergio De la torre e22201c840 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 14:50:25 +00:00
Sergio De la torre 9937fbed5e REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 11:59:01 +01:00
Sergio De la torre fa65cc84a9 REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 11:39:22 +01:00
Sergio De la torre 0263d880ca refs #6028 add:email in ByWorker
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 08:00:17 +01:00
Sergio De la torre c9bcd672c9 refs #6028 add:email in ByWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 07:59:21 +01:00
Javi Gallego 7ff8ec93ff Merge pull request 'test' (!1879) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1879
2023-12-06 07:54:13 +00:00
Sergio De la torre 3692021b12 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 07:26:22 +00:00
Sergio De la torre 318f7e3c0d REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 08:20:55 +01:00
Javier Segarra 1d92bbf4a2 refs #5666 feat: replace base value and add mixins 2023-12-05 07:48:56 +01:00
Pablo Natek 3f22f48df7 fix(getFiltered): refs #3271 fix to event filter
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:13:12 +01:00
Guillermo Bonet 2be1639e9f refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 12:42:25 +01:00
Javi Gallego 4071c06b5f feat: refs #6275 getTickets con los campos de silex
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 08:15:39 +01:00
Javi Gallego aa0794e136 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 06:31:25 +01:00
Javi Gallego 5b145a57e6 error: refs 6028 test front quitado
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:29:53 +01:00
Javi Gallego f44424dbcf test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 09:44:47 +01:00
Javi Gallego e856de0cfd feat: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 15:54:38 +01:00
Javi Gallego e146c0ea46 Merge branch 'dev' into 6028_route_getRouteByWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 12:42:20 +01:00
Javi Gallego a0a9e299d9 feat: refs #6275 getTickets with phone
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 12:39:21 +01:00
Javi Gallego 3f7663da97 feat: refs #6275 crea back etExpeditionSummary
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 10:09:04 +01:00
Guillermo Bonet 64ca72b1f4 refactor refs #6184 Changed downloadCmrsZip
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 09:57:25 +01:00
Guillermo Bonet 05a7498219 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 13:14:21 +00:00
Guillermo Bonet 3e70cb07e0 refs #6184 Changes
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 14:20:35 +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
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
Carlos Satorres 1f1dfae7e3 refs #5843 changes models
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 12:50:07 +02:00
Carlos Satorres cd20a2d06d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 07:32:19 +02:00
Carlos Satorres f92acdfe6f Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 09:52:32 +00:00
Guillermo Bonet 4ccb09d057 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 08:18:03 +02:00