Commit Graph

223 Commits

Author SHA1 Message Date
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
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 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 3e70cb07e0 refs #6184 Changes
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 14:20:35 +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
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
Guillermo Bonet 56c1dbc096 Merge branch 'master' into 5995-getExternalCmrRouteFk
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 12:42:46 +00:00
Guillermo Bonet 6c34421413 refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 10:03:31 +02:00
Carlos Satorres 4918e3ccc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 14:02:53 +02:00
Guillermo Bonet 979315aa5e refs #5995 Implemented downloadCmrsZip
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 12:10:39 +02:00
Javi Gallego 92789ba3de refs #6173 fixed backTest 2023-08-31 10:04:28 +02:00
Carlos Satorres 0b9199688e refs #5843 userFk remove and vchange
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-30 12:48:57 +02:00
Javi Gallego b5b7770f3f refs #6146 fixes: muestra la agencia de la ruta 2023-08-24 10:41:28 +02:00
Carlos Satorres b1b6bd13ea refs #5843 change userFk
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:45:41 +02:00
Guillermo Bonet 86def6e212 refs #5995 Changed query getExternalCmrs
gitea/salix/pipeline/head This commit looks good Details
2023-08-21 08:47:28 +02:00
Guillermo Bonet b197109556 refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 10:14:22 +02:00
Guillermo Bonet d6b30271f2 refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 08:12:52 +02:00
Guillermo Bonet ed88a5b25f refs #5995 Minor change
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 07:54:49 +02:00
Guillermo Bonet 2f64a41f64 refs #5995 Added getExternalCmrs
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 14:16:47 +02:00
Guillermo Bonet 16353dfddc refs #5995 First commit
gitea/salix/pipeline/head This commit looks good Details
2023-08-02 07:35:40 +02:00
Sergio De la torre 639d5963a3 refs #6028 get_routes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-17 13:50:07 +02:00
Carlos Satorres b2b335326e Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 11:49:26 +00:00
Vicent Llopis 4369d275f8 refs #4770 feat: add test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-04 15:04:32 +02:00
Vicent Llopis e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 14:42:51 +02:00
Guillermo Bonet e54e0784bf Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:06:41 +02:00
Guillermo Bonet cc5021a75f refs #5684 Removed xxxLog.create and dependences
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-26 09:40:55 +02:00
Juan Ferrer e32a29fc09 refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 19:08:13 +02:00
Carlos Satorres fa10070675 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 14:04:38 +02:00
Alexandre Riera f9528b922c refs #5595 added userId in options
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 08:32:06 +02:00
Carlos Satorres dfebb3b307 refs #5066 sorted without CONCAT, order=false 2023-05-31 10:04:34 +02:00
Carlos Satorres 0661bf8fa9 refs #5066 remake sql without ROW_ORDER 2023-05-30 12:21:44 +02:00
Carlos Satorres 3423ce612c refs #5066 e2e fixs, change name sorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 13:49:32 +02:00
Carlos Satorres d8e7c2700a refs #5066 fix autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 12:42:27 +02:00
Carlos Satorres 237c83c6f5 refs #5066 getVehicleSorted small mod
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 10:20:15 +02:00
Carlos Satorres b45b0ff826 refs #5066 copy project from the other
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 08:23:46 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:33:14 +02:00
Alexandre Riera 4e5364dc0b refs #5036 fix tests logs
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 10:05:02 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 08:17:46 +01:00
Alex Moreno 8a50c56284 fix(updateWorkCenter): use vnNew()
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 14:52:40 +01:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Alex Moreno 00ffc82f8d use CURDATE() in rawSQL
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:34:14 +01:00
Alexandre Riera 77742d94d7 refs #5138 summary changed like route/tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 12:19:11 +01:00
Alex Moreno 4e65e88621 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 07:56:12 +01:00
Alex Moreno 0a096bc96f fix: updateWorkCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:29:01 +01:00
Vicent Llopis ea36c0deb5 feat: el pdf de las rutas se descarga en un zip
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-17 14:06:18 +01:00
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +01:00
Alex Moreno 4cb8d8c763 test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:11:45 +01:00
Pau 001c3ec2ac requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 12:06:13 +01:00
Pau 37a7a12f87 requested change
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 11:47:32 +01:00
Pau 0f17c082a3 refs #4557 @1h left join note only delivery
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 12:07:33 +01:00
Pau 65fd5e2c8f Possible change? 2022-11-18 08:51:17 +01:00
Pau 891cd6b474 Added requestes changes refs #4157 2022-11-10 07:23:08 +01:00
Pau d83972d3fa Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 12:07:32 +00:00
Pau ca53ec7c23 Changed the location of the function 2022-10-20 15:04:59 +02:00
Pau 28bd535e2b Implemented SMS to route clients 2022-10-20 15:04:25 +02:00
Alex Moreno 192e61a70d hotFix(route_index): fix driverRoutePdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 14:54:13 +02:00
Joan Sanchez 3dee50a796 Updated method accessType
gitea/salix/pipeline/head This commit looks good Details
2022-10-09 20:14:14 +02:00
Vicent Llopis 761563edc5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 13:38:17 +02:00
Joan Sanchez 85698410db Templates refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:07:45 +02:00
Vicent Llopis eb7bd3dc59 update brach
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 14:03:15 +02:00
Vicent Llopis d1e273d1d3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 13:56:01 +02:00
Vicent Llopis 318b688b67 fix: typo errors
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:40:41 +02:00
Vicent Llopis 28deb34047 refactor: update translation 2022-07-19 14:40:23 +02:00
Vicent Llopis 6f7a4fc5ff refactor title of test
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 12:08:16 +02:00
Vicent Llopis 979ee1d956 feat: add backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 10:19:22 +02:00
Vicent Llopis 51bd18ac37 feat: update commissionWorkCenterFk when create a route 2022-07-05 10:19:06 +02:00
Joan Sanchez 2381a5d09a Updated e2e tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-22 12:40:11 +02:00
Vicent Llopis 52e78db9ee feat: group by address in buscaman, delete priority by checked, show notes of tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-14 12:36:08 +02:00
Alex Moreno f786cdd33d fix pass dates
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 14:39:51 +02:00
Alex Moreno eb9bd66ddb prepare for static dates
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 13:33:01 +02:00
Alex Moreno 7eec9de0aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 07:47:03 +02:00
Carlos Jimenez Ruiz cce1d93dde jasmine reporters config for CI
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 11:43:41 +02:00
Carlos Jimenez Ruiz 833addcb75 gulp-jasmine replaced by jasmine
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 19:38:10 +02:00
Carlos Jimenez Ruiz 9d46b4c79c refactor(SuggestedTickets): added translations and descriptors
gitea/salix/pipeline/head This commit looks good Details
2022-04-22 11:26:16 +02:00
Alex Moreno a46b2113dc models
gitea/salix/pipeline/head This commit looks good Details
2022-04-22 07:39:47 +02:00
Alex Moreno d616367714 fix(test): use static dates
gitea/salix/pipeline/head This commit looks good Details
2022-04-05 07:46:49 +02:00
Alex Moreno c904bf0bdf feat(back): new Date mocked time
gitea/salix/pipeline/head This commit looks good Details
2022-04-01 13:55:45 +02:00
Alex Moreno eec1c1ff86 feat(db): static dates
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-30 12:45:01 +02:00
Vicent Llopis b72d26f214 fix: update backTest
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 13:40:52 +02:00
Vicent Llopis fd7afc962f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 12:53:33 +01:00
Vicent Llopis 920bff30c8 modify filter sql
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 12:02:17 +01:00
Vicent Llopis 894f95cb1f update consulte sql
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 15:05:13 +01:00
Vicent Llopis c3fe2dc52b update filter test 2022-03-17 09:54:08 +01:00
Vicent Llopis 14eacec0ff included test 2022-03-17 09:53:50 +01:00
Vicent Llopis 1094bbe92b correction panel-search
gitea/salix/pipeline/head This commit looks good Details
2022-03-16 14:42:19 +01:00
Vicent Llopis 26f77ca07e add panel-search
gitea/salix/pipeline/head This commit looks good Details
2022-03-16 13:02:48 +01:00
Vicent Llopis 97f856afcc corrected comment
gitea/salix/pipeline/head This commit looks good Details
2022-03-11 12:24:53 +01:00