Commit Graph

573 Commits

Author SHA1 Message Date
Carlos Satorres 908799adee refs #5660 deliveryAssit
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 14:58:28 +02:00
Alexandre Riera 81a96e7d82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 09:03:23 +02:00
Juan Ferrer 9a63ce86aa refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 23:54:27 +02:00
Alexandre Riera 7121b1e516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 08:50:53 +02:00
Carlos Satorres cc27d1fa97 refs #5066 fix vehicle res.data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-07 08:30:37 +02:00
Carlos Satorres 738b04af4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted 2023-06-07 08:15:50 +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 0ee8811c15 refs #5398 fix agencies, warehouses
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 07:52:21 +02:00
Carlos Satorres 967e07933d refs #5398 fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 14:46:19 +02:00
Carlos Satorres d18137bce0 refs #5066 not dense
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 10:20:13 +02:00
Carlos Satorres dfebb3b307 refs #5066 sorted without CONCAT, order=false 2023-05-31 10:04:34 +02:00
Carlos Satorres 2c3869d961 refs #5398 capital letters
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:48:09 +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 2e83d91006 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted 2023-05-29 10:24:19 +02:00
Carlos Satorres fa8fd8d5bc refs #5398 update from oldbranch
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:41:14 +02:00
Alex Moreno 53e55de605 refs #5579 fix(route_index): order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:15:31 +02:00
Juan Ferrer fa40bd9811 refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 10:18:41 +02:00
Juan Ferrer a48e197e46 refs #5517 E2E fixes 2023-05-05 08:12:38 +02:00
Juan Ferrer 49368a837b refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 19:10:04 +02:00
Juan Ferrer 6f1744baff Merge branch 'dev' into 5517-improveLogs+translations 2023-04-20 16:30:24 +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
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Vicent Llopis 3790e3457f refs #5517 añadidas más traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:43:42 +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
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +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
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:37:57 +00:00
Alexandre Riera 59c3ef23de grabUser added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 11:03:13 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 08:17:46 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Alexandre Riera d62fbab3f1 refs #5070 refactor and added tests
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 14:22:25 +01:00
Alexandre Riera 48da6403fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5070-route-tickets-link-maps
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-01 11:20:24 +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
Joan Sanchez 7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:23:17 +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
Pau 6709012e59 refs #5070 @2h refactor goToBuscaman method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 12:33:28 +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
Joan Sanchez 9bf4cd5cff Merge branch 'dev' into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 08:20:32 +00: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
Joan Sanchez 3076123c04 Updated models relation
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:05:50 +01:00
Vicent Llopis 7148da7b72 feat: cuando se descarga una sola factura, no descarga el zip
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:53:30 +01:00
Vicent Llopis 849f4e1a6d fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 14:24:04 +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
Pau 2678d59191 front test expected old value
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:57:20 +01:00
Pau b6de50848a refs #5081 fix sms faltas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:48:44 +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 65f82c8fc1 Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 06:05:05 +00: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 f56c226fba Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:32:32 +00:00
Pau 5c249dcbcc refs #4767 @1h30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:24:10 +01:00
Pau 891cd6b474 Added requestes changes refs #4157 2022-11-10 07:23:08 +01:00
Pau 6a5ba6a929 Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:36:46 +00:00
Alex Moreno 9891f7060d fix(smart-table): monitor only ticketFilter use url and add ?q in routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 09:40:09 +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 3cfa56d610 Add deliveryBoss ACL to the front
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 13:15:19 +02:00
Pau 5bf425d8e3 Front test and sms require client #4157 @1h30m
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 08:22:04 +02: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
Pau 8cbcb197bb fix downloadPDF wrong method 2022-10-20 08:14:11 +02:00
Pau 2c98563cfa Add buttons to bottom-right 2022-10-20 07:39:33 +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
Vicent Llopis 68e4f3a8bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 09:10:15 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Joan Sanchez 93f5bf089d Merge pull request '4291-fix(vnInputTime): quit new date(null)' (#1031) from 4291-vnInputTime into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1031
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-28 06:10:55 +00: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 f5bbe3a9ac fix: scope updated
gitea/salix/pipeline/head This commit is unstable Details
2022-09-15 11:55:07 +02:00
Vicent Llopis eb7bd3dc59 update brach
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 14:03:15 +02:00
Alex Moreno e72c0ae919 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 13:09:00 +02:00
Vicent Llopis 3bf5f5f86e fix: tfront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-13 13:47:54 +02:00
Vicent Llopis bddc998b86 feat: allow update route.isOk field
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 13:34:32 +02:00
Vicent Llopis 1e521f1a8b feat: delete link
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 14:12:53 +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
Alex Moreno d3852bac5d fix(vnInputTime): quit new date(null)
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-07-26 11:45:12 +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
Vicent Llopis 3e43bf2024 feat(route.index): can edit fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 14:14:13 +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 980ac50ba9 feat: add frontTets
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 14:03:58 +02:00
Vicent Llopis f69fb45b90 feat: it only sets the highest priority, in case that ticket doesn't already have the highest priority.
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-15 12:53:13 +02:00
Vicent Llopis e61784b6ba refactor: undo chages about drag&drop
gitea/salix/pipeline/head This commit looks good Details
2022-06-14 13:52:32 +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
Vicent Llopis 189e8dbab3 feat: order by column enabled 2022-06-14 12:34:32 +02:00
Vicent Llopis 931c4fb259 refactor: translate
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-14 08:03:46 +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
Vicent Llopis afd95872c8 feat: drag and drop
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-09 13:48:57 +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
Vicent Llopis 409e935cc7 feat: add fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-08 15:17:45 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:23:08 +00: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
Alex Moreno 5021315ed4 refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 09:47:47 +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 e00d63d7af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 14:30:23 +02:00
Carlos Jimenez Ruiz 6015050eed Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:12:14 +00:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:02:05 +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
Vicent Llopis a8f4192b4c feat: update salix fonts
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 14:15:55 +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 21198820fc refactor translate
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 09:54:19 +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 2f53733151 refactor translates
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 15:05:09 +01:00
Vicent Llopis 656efa2be9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 12:23:28 +01:00
Vicent Llopis 97f856afcc corrected comment
gitea/salix/pipeline/head This commit looks good Details
2022-03-11 12:24:53 +01:00
Alex Moreno 9c4d58fc1a refactor(ticket-popup): extends from dialog
gitea/salix/pipeline/head This commit looks good Details
2022-03-09 08:08:13 +01:00
Alex Moreno b11a6a7c5c feat(route): add ticket-popup and tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-08 15:17:18 +01:00
Vicent Llopis 97f2341ae0 pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-03-08 13:42:44 +01:00
Vicent Llopis 03c8ceffb2 refactor code
gitea/salix/pipeline/head This commit looks good Details
2022-03-07 13:54:18 +01:00
Vicent Llopis f88f60ef27 refactor code and icons
gitea/salix/pipeline/head This commit looks good Details
2022-03-07 12:43:05 +01:00
Vicent Llopis b58020978a fix: check cannot attach more than one file
gitea/salix/pipeline/head This commit looks good Details
2022-03-04 11:59:45 +01:00
Vicent Llopis d22be6620c feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-03-04 11:28:45 +01:00
Vicent Llopis cff1e6cfbf feat: check cannot attach more than one pdf 2022-03-04 11:28:26 +01:00
Vicent Llopis 2f87ac8c96 add test 2022-03-03 14:42:12 +01:00
Vicent Llopis 4811254ccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-02 15:07:38 +01:00
Vicent Llopis ade34c1e0a add section Autonomous
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-02 14:59:30 +01:00
Vicent Llopis 19887bdd16 feat: add section autonomous
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-24 14:52:32 +01:00
Carlos Jimenez Ruiz 9ba13f90d3 #3015 feat(unlink): tickets link to route can now be removed from the suggested tickets to route
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 16:12:29 +01:00
Joan Sanchez 872f5b488b Merge branch 'dev' into 3411-route_ticket_fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 09:40:34 +00:00
Carlos Jimenez Ruiz 8285a8a8e9 refactor(route.tickets): updated error description 2021-12-01 15:26:01 +01:00
Vicent Llopis ac3dc039fe feat: add fixtures of ticket and update test
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 12:49:53 +01:00
Vicent Llopis e13f2d4ae3 feat(route_ticket): add column province and change order other columns
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 10:06:13 +01:00
Vicent Llopis 74fbae6510 refactor(route_ticket): add style in a style.scss
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 15:15:51 +01:00
Vicent Llopis 6afc694f6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3377-modifyStyles
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 14:07:14 +01:00
Vicent Llopis a5ba02e2ec feat(route_tickets): update frontTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 13:28:12 +01:00
Vicent Llopis fb6e443f03 feat(routes_tickets): button up when add tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-22 12:52:02 +01:00
Vicent Llopis 98195bf7b0 fix(route_tickets): dialog show the name of clients
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 08:44:56 +01:00
Carlos Jimenez Ruiz 1d253fc53d definitions corrected for myOptions of endpoints 2021-11-18 11:17:30 +01:00
Carlos Jimenez Ruiz 580ba36357 refactor(jasmine): usage of done on async functions is deprecated 2021-10-15 14:45:41 +02:00
Carlos Jimenez Ruiz 3bfc08b117 route.summary order by priority
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 10:06:31 +02:00
Carlos Jimenez Ruiz 320c04b2d3 update volume is not called when add/remove tickets from route
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 09:54:07 +02:00
Carlos Jimenez Ruiz 7bf832079d route.tickets suggested tickets now shows both descriptors
gitea/salix/pipeline/head This commit looks good Details
2021-06-11 13:02:18 +02:00
Joan Sanchez be791d1f00 2951 - Added transaction to updateVolume() method
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 16:08:44 +02:00
Joan Sanchez 655380a52c Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 10:33:10 +02:00
Joan Sanchez 07026a68bb #2934 - HOTFIX: Route suggested tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 10:29:56 +02:00
Joan Sanchez 27cd54bef1 Updated icons title
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 11:41:45 +02:00
Carlos Jimenez Ruiz e848b94859 removed LEFT from join
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 09:42:48 +02:00
Carlos Jimenez Ruiz b902a4dd4a front unit test fix 2021-05-14 19:56:54 +02:00
Carlos Jimenez Ruiz 1e8ab4d348 added transactions to several endpoints 2021-05-14 19:21:04 +02:00
Carlos Jimenez Ruiz 2b83abeefd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor 2021-05-14 10:13:02 +02:00
Carlos Jimenez Ruiz 457d23dc16 reoute tickets order columns + endpoint refactor 2021-05-12 09:51:32 +02:00
Carlos Jimenez Ruiz d4eedc69e1 indentation on route filter 2021-05-11 12:53:08 +02:00
Joan Sanchez 6ae8b72268 Merge branch 'dev' into 2902-error-getSuggestedTickets
gitea/salix/pipeline/head This commit looks good Details
2021-05-11 09:52:42 +00:00
Carlos Jimenez Ruiz ac917b6115 mino changes on translations
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:46:17 +02:00
Carlos Jimenez Ruiz 58447c8168 transaltion changes
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:39:51 +02:00
Carlos Jimenez Ruiz 657896bce0 increased section width
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:32:00 +02:00
Javi Gallego 19b35f5f6c landed en lugar de shipped
gitea/salix/pipeline/head This commit looks good Details
2021-05-07 07:52:03 +02:00
Javi Gallego f1c30ca6d1 cambio landed por created
gitea/salix/pipeline/head This commit looks good Details
2021-05-06 08:13:17 +02:00
Carlos Jimenez Ruiz 245243aa14 routes without vehicle or vehicles without drop off now throw
gitea/salix/pipeline/head This commit looks good Details
2021-05-05 13:36:54 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz 75155c796d removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 15:59:30 +02:00
Carlos Jimenez Ruiz 70f6728c8f started to created date changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 09:55:51 +02:00
Carlos Jimenez Ruiz 409f56ec7f e2e path resurrected for route tickets
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 17:19:05 +01:00
Carlos Jimenez Ruiz a78a73486a updated routes fixtures and fixed tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 13:19:11 +01:00
Carlos Jimenez Ruiz 84378fd607 tickets already in route are no longer shown + tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 16:13:12 +01:00
Carlos Jimenez Ruiz fb418edc7b backend modifications for route tickets 2021-03-15 11:32:17 +01:00
Jorge Padawan aaf77677d1 Aligned title with column
gitea/salix/pipeline/head Build queued... Details
2021-02-16 15:50:48 +01:00
Jorge Padawan ac4a19841d Added shrink for date
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-16 15:40:20 +01:00
Carlos Jimenez Ruiz dd9e9bac9b removed unused character
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 14:02:57 +01:00
Carlos Jimenez Ruiz a77c5c5b66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 14:02:30 +01:00
Carlos Jimenez Ruiz a0d6e53dbb polutd test removed 2021-02-02 14:00:35 +01:00
Jorge Padawan 186e59c7ae .
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 13:18:17 +01:00
Jorge Padawan b57578f933 Remove parenthesis on expectedParams
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 13:12:54 +01:00
Jorge Padawan b576c0ad69 Remove parenthesis on expectedParams
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 13:11:17 +01:00
Jorge Padawan 1a87eb3085 Remove bad code
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 12:52:24 +01:00
Jorge Padawan 218a19d7da Removed bad code
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 12:37:00 +01:00
Jorge Padawan c7424997d5 Removed bad code 2021-02-02 12:22:18 +01:00
Jorge Padawan a1a3607d3c Remove bad code 2021-02-02 11:57:42 +01:00
Jorge Padawan 7b7571ae77 Fixed problems with default search 2021-02-02 10:26:10 +01:00
Jorge Padawan 9d96a4a6a1 Fixed problems test e2e 2021-02-02 10:17:13 +01:00
Jorge Padawan 3f963f2d99 changed message
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 13:19:26 +01:00
Jorge Padawan 4f644cb708 Changed name of value on scope days test
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 13:13:18 +01:00
Jorge Padawan 69e8dfc334 Merge branch '2692-add_advanced_search_engine2' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-28 16:10:23 +01:00
Jorge Padawan 797f96f4c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-28 14:14:22 +01:00
Jorge Padawan bef8fca529 Rework the test on main section 2021-01-28 14:14:14 +01:00
Bernat Exposito df073094f8 fix test updateVolume
gitea/salix/pipeline/head This commit looks good Details
2021-01-26 09:07:00 +01:00
Carlos Jimenez Ruiz 5ea222dc00 fixed translations
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 12:02:03 +01:00
Carlos Jimenez Ruiz c3ac7b671f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 11:32:35 +01:00
Jorge Padawan e205ebba72 Added main spec and fixed line on search-panel spec
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 14:49:06 +01:00
Carlos Jimenez Ruiz fcf60ac297 excluded failing test for future fixing 2021-01-20 14:40:32 +01:00
Jorge Padawan 91979f5d69 Add scopeDays to search bar on route 2021-01-20 13:19:28 +01:00
Jorge Padawan 509de4fa0a Fix for good practique code
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 10:11:37 +01:00
Jorge Padawan f45aa7937d Added conditionals with rols to display or not the icons with link 2021-01-12 07:39:12 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Jorge Padawan 5a30bf5fa4 2650 add links to edit on summaries 2021-01-08 15:43:33 +01:00
Joan Sanchez 94c8c115e5 Font hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 13:51:17 +01:00
Carlos Jimenez Ruiz e6106b1aa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2665-route_index_multi_clone
gitea/salix/pipeline/head This commit looks good Details
2020-12-24 11:31:27 +01:00
Carlos Jimenez Ruiz 8ede30398b clone feature for routes index 2020-12-24 11:31:20 +01:00
Bernat Exposito a21476e3df fix searchbar index
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 12:42:41 +01:00
Joan Sanchez 35dc2a533b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 14:52:08 +01:00
Joan Sanchez 1419acb8a7 2663 - Drag & drop ticket to route index
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 14:48:47 +01:00
Carlos Jimenez Ruiz 482cbd7195 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 12:39:26 +01:00
Carlos Jimenez Ruiz 369a79b79f route.tickets refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 12:37:36 +01:00
Jorge Padawan 2fe22efe36 filter vehicles by worehouse
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 15:12:52 +01:00
Carlos Jimenez Ruiz 2e9267a25e route module refactors 2020-12-16 10:21:35 +01:00
Bernat Exposito 96f603a44b refactor descriptors
gitea/salix/pipeline/head This commit looks good Details
2020-12-04 13:40:58 +01:00
Carlos Jimenez Ruiz fbb2fc3bdd Merge pull request '2607-preview_icon' (#464) from 2607-preview_icon into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #464
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-24 09:33:44 +00:00
Bernat Exposito 6a7568eb29 Merge branch 'dev' into 2493-route_ticket_drag_and_drop
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 07:36:52 +00:00
Joan Sanchez 80bae4de0a 2607 - Changed preview icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 08:22:54 +01:00
Joan Sanchez c654e14cfe 2611 - Summary go to entity
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 13:41:51 +01:00
Bernat Exposito 37ac312bd5 pr changes
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 13:05:24 +01:00
Bernat Exposito f64a566447 route.ticket drag and drop validation 2020-11-20 12:12:06 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 16:47:39 +01:00
Carlos Jimenez Ruiz c04b7a0657 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 10:31:06 +02:00
Bernat Exposito Domenech 8a58017597 fix route/ticket
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 08:50:47 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Bernat Exposito Domenech e5557be3dc route ticket fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-07 10:52:28 +02:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 08:17:12 +02:00
Carlos Jimenez Ruiz 87e4765a1c fixed ticket-weekly backend unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-22 16:53:47 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Joan Sanchez d0ac1b621c Merge branch 'dev' into 2385-worker_descriptor_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 09:06:11 +00:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Joan Sanchez a3382300f9 2402 - Added create entry section
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 14:08:56 +02:00
Joan Sanchez 9ef58cabd4 Removed console log
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 14:10:38 +02:00
Joan Sanchez 17497c3f2d Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 10:22:57 +02:00
Joan Sanchez cd74e9684a Download route PDF on route index
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 10:00:21 +02:00
Joan Sanchez 957c1c01b9 Html changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-24 07:54:30 +02:00
Carlos Jimenez Ruiz e2481366a2 removed on response if just accept
gitea/salix/pipeline/head This commit looks good Details
2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good Details
2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +02:00
Joan Sanchez d4c78b46c1 1368 - First sale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 13:40:49 +02:00
Joan Sanchez 25b1c6bd8f 2239 - Added services
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 14:28:29 +02:00
Joan Sanchez 4878c0dc46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-25 07:25:21 +02:00
Joan Sanchez e9e7ae08f2 Locale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-22 15:20:55 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00