Commit Graph

399 Commits

Author SHA1 Message Date
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