Commit Graph

112 Commits

Author SHA1 Message Date
Juan Ferrer fa40bd9811 refs #5667 Style & translation fixes 2023-05-17 10:18:41 +02:00
Carlos Satorres 17425a627c Merge branch 'dev' into 5316-kkeoEntryNotes 2023-05-02 11:25:17 +00:00
Carlos Satorres af875dd67e Merge 2023-04-26 10:26:54 +02:00
Juan Ferrer 49368a837b refs #5517 Filter improved 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 60d3729b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes 2023-04-17 08:55:22 +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 2023-04-13 08:43:42 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests 2023-04-12 12:33:14 +02:00
Carlos Satorres 1ce2705869 refs #5316 last kkentry 2023-04-11 15:04:49 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-03-30 14:57:00 +02:00
Vicent Llopis 5784f05fd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community 2023-03-24 08:34:04 +01:00
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs 2023-03-22 10:37:57 +00:00
Alexandre Riera 59c3ef23de grabUser added 2023-03-22 11:03:13 +01:00
Vicent Llopis 6d04933fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community 2023-03-16 14:01:19 +01:00
Joan Sanchez e911f7a127 Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev
Reviewed-on: #1391
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:27:33 +00:00
Vicent Llopis 1b8ed05f71 refs #5395 feat: modificado orderBy, añadida columna importa y corregidos errores 2023-03-15 13:28:28 +01:00
Vicent Llopis 50ccb61728 refactor: el report llama directamente al filtro de extra-community 2023-03-14 09:59:29 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor 2023-03-14 08:17:46 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-03-03 07:44:31 +01:00
Joan Sanchez 3076123c04 Updated models relation 2023-01-24 09:05:50 +01:00
Alex Moreno e27a559416 refactor: replace all Date 2023-01-16 15:18:24 +01:00
Alex Moreno 8df7b91127 fix: entry ref 2022-11-30 15:24:33 +01:00
Joan Sanchez a065d77929 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2 2022-10-03 13:37:59 +02:00
Joan Sanchez fe5eb3e13d Changes 2022-09-29 07:35:20 +02:00
Javi Gallego a662bb90a2 Merge branch 'dev' into #4226-remove-density 2022-09-27 09:32:48 +02:00
Joan Sanchez 7f78286d6b Reports refactor 2022-09-26 13:33:27 +02:00
Alex Moreno 2b101cf7c1 refactor(travel_extra-community): use smart-table, fix scroll 2022-09-13 15:11:14 +02:00
Javi Gallego 5cf102c7fd sustituido density por weightByPiece 2022-08-24 14:13:26 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts 2022-08-10 12:13:31 +02:00
Vicent Llopis fdf6e04233 change travel.agencyFk by agencyModeFk 2022-07-13 14:36:03 +02:00
Alex Moreno eb9bd66ddb prepare for static dates 2022-06-09 13:33:01 +02:00
Alex Moreno 7eec9de0aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-06-09 07:47:03 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention 2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows 2022-05-16 07:23:08 +00:00
Carlos Jimenez Ruiz cce1d93dde jasmine reporters config for CI 2022-05-12 11:43:41 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types 2022-05-12 09:47:47 +02:00
Alex Moreno e00d63d7af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-04-20 14:30:23 +02:00
Alex Moreno 98755656dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph 2022-04-06 12:43:12 +02:00
Alex Moreno c904bf0bdf feat(back): new Date mocked time 2022-04-01 13:55:45 +02:00
Alex Moreno eec1c1ff86 feat(db): static dates 2022-03-30 12:45:01 +02:00
Vicent Llopis a5b3bdfa8d feat: add backTest 2022-03-28 13:24:11 +02:00
Vicent Llopis 1e587be2ed (fix): filter repaired 2022-03-28 11:57:19 +02:00
Vicent Llopis ad7bcd7cc2 delete two filter fields 2022-03-28 09:28:01 +02:00
Alex Moreno 79c74d92b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph 2022-03-25 13:22:04 +01:00
Alex Moreno 0a8153d44c feat(travel_search-panel): add continent filter 2022-01-26 10:09:47 +01:00
Alex Moreno 8e274f4f17 refactor(travel): deprecated travelThermograph.temperature 2021-12-24 10:10:28 +01:00
Carlos Jimenez Ruiz 580ba36357 refactor(jasmine): usage of done on async functions is deprecated 2021-10-15 14:45:41 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz 8bdb02c0fc refactor(createThermograph): endpoint rollsback only if transaction was created in it 2021-09-07 10:30:53 +02:00