Commit Graph

311 Commits

Author SHA1 Message Date
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
Vicent Llopis 6d04933fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 13:28:28 +01:00
Vicent Llopis 1047ac0b64 refs #4980 fix: la sección no estaba filtrando por el filtro por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 10:18:59 +01:00
Vicent Llopis 50ccb61728 refactor: el report llama directamente al filtro de extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:59:29 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 08:17:46 +01:00
Alexandre Riera 874fd0656c refs #5206 url gets params
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 10:05:16 +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 ed5208c9e4 refs #5206 implemented general search, missing tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 15:10:17 +01:00
Alexandre Riera dbe42e3bf4 refs #5206 version with plane added, needs to implement general search
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 13:55:47 +01:00
Alexandre Riera be1993cf8b refs #5206 version with top-searcher and two fields for reference and id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 11:33:55 +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
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
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Vicent Llopis 7261415e16 fix: añadido length
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 09:36:31 +01:00
Vicent Llopis e616835600 delete: hasDateRange()
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:40:28 +01:00
Vicent Llopis f7a97a8139 fix: siempre muestra el botón si hay datos
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:31:56 +01:00
Alex Moreno 8df7b91127 fix: entry ref
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 15:24:33 +01:00
Alex Moreno e497ddd664 fix: add td-editable
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 09:21:14 +02:00
Alex Moreno 18cd34bccb fix(travel_extraCommunity): css
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 08:57:41 +02:00
Alex Moreno 00d5876f88 hotFix(travel_extraCommunity): fix css
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-07 14:35:16 +02:00
Joan Sanchez a065d77929 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-10-03 13:37:59 +02:00
Joan Sanchez fe5eb3e13d Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 07:35:20 +02:00
Javi Gallego a662bb90a2 Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 09:32:48 +02:00
Joan Sanchez 7f78286d6b Reports refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 13:33:27 +02:00
Alex Moreno 06eab58b3d is agency
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 12:45:40 +02:00
Alex Moreno 49a7a05310 feat(travel_extra-community): add vn-anchor
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 08:08:07 +02:00
Alex Moreno 2b101cf7c1 refactor(travel_extra-community): use smart-table, fix scroll
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 15:11:14 +02:00
Javi Gallego 5cf102c7fd sustituido density por weightByPiece
gitea/salix/pipeline/head This commit is unstable Details
2022-08-24 14:13:26 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
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
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 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
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
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 98755656dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 12:43:12 +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 8c744a0135 refacto: translate corrected
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 10:17:26 +02:00
Vicent Llopis 64ae7ee8ea feat: modify filter
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 13:24:26 +02:00
Vicent Llopis a5b3bdfa8d feat: add backTest 2022-03-28 13:24:11 +02:00
Vicent Llopis 1e587be2ed (fix): filter repaired
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 11:57:19 +02:00
Vicent Llopis ad7bcd7cc2 delete two filter fields
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 09:28:01 +02:00
Alex Moreno 79c74d92b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-03-25 13:22:04 +01:00
Carlos Jimenez Ruiz abd758721e Merge branch 'dev' into 3553-travel_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-27 09:36:22 +00:00
Alex Moreno 65c32c9ed3 fix(travel_summary): vn-check change value to ng-model
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 11:40:44 +01:00
Alex Moreno 0a8153d44c feat(travel_search-panel): add continent filter
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 10:09:47 +01:00
Alex Moreno 8e274f4f17 refactor(travel): deprecated travelThermograph.temperature
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 10:10:28 +01:00
Carlos Jimenez Ruiz 5be2eb974f refactor(test): adapted the new thermograph front unit test to expect thermograph data to be defined 2021-10-19 11:08:03 +02:00
Carlos Jimenez Ruiz e3942c0bb9 refactor(thermograph): empty fields handler added and correct usage of thermograph.code 2021-10-19 10:58:58 +02: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 6cf1737c0d refactor(thermograph): temperature column now displays the correct data 2021-09-28 11:59:04 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz c7558dfb0b refactor(temperatures): added crudmodel autoload for temperatures 2021-09-07 11:54:53 +02:00
Carlos Jimenez Ruiz 8bdb02c0fc refactor(createThermograph): endpoint rollsback only if transaction was created in it
gitea/salix/pipeline/head This commit looks good Details
2021-09-07 10:30:53 +02:00
Carlos Jimenez Ruiz c4e51146fd refactor(thermograph): temperatures source updated on frontend
gitea/salix/pipeline/head This commit looks good Details
2021-09-06 16:39:44 +02:00
Carlos Jimenez Ruiz 56276783db test(thermograph): e2e and unit tests for the backend of thermograph 2021-09-06 16:39:04 +02:00
Carlos Jimenez Ruiz 1f0bcb63f1 refactor(thermograph): added temperature model + updated thermographs models and endpoints 2021-09-06 16:38:27 +02:00
Carlos Jimenez Ruiz f2f81442d9 fix(cloneWithEntries): endpoint was broken due to production changes 2021-09-02 14:17:35 +02:00
Javi Gallego bb764e206a test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:36:18 +02:00
Joan Sanchez ae091a3b11 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 14:41:45 +02:00
Joan Sanchez 35e3c8ce65 HOTFIX: 3009 - Unlock report button
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 14:35:24 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz 34e0d0b7cf translations update
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:50:32 +02:00
Carlos Jimenez Ruiz 8aa3d269ea Travel descriptor now shows delete option if there are no entries 2021-06-15 16:41:01 +02:00
Carlos Jimenez Ruiz c776d34cdf invoiceIn basic data and summary added some fields
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 17:08:21 +02:00
Joan Sanchez 2e7d56cc26 Test fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 12:11:27 +02:00
Joan Sanchez ab755e29c7 Merge branch 'dev' into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 14:01:04 +00:00
Joan Sanchez e50dcf467f Requested changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-03 12:21:04 +01:00
Joan Sanchez 718021cff8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index 2021-03-01 11:49:31 +01:00
jorgebl 3af50dfc80 QA refactor
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 11:32:31 +01:00
jorgebl 7895af8a54 Fixed test
gitea/salix/pipeline/head This commit looks good Details
2021-02-23 17:00:31 +01:00
jorgebl 71eeaadb43 Removed focus on test
gitea/salix/pipeline/head This commit looks good Details
2021-02-23 14:54:07 +01:00
jorgebl 5692b5f07e Added conditional and test 2021-02-22 09:53:03 +01:00
Jorge Padawan 0732ff38b1 Quit clogs
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-17 11:04:46 +01:00
Jorge Padawan b71b959b49 Formated sql and tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-17 11:01:50 +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
Jorge Padawan dad3e7c155 Requested changes realized
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 11:27:24 +01:00
Joan Sanchez c270ec6207 Contextmenu fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-11 15:06:41 +01:00
Jorge Padawan 31e5d3fd1e Created test and optimized sql query 2021-02-11 08:32:16 +01:00
Jorge Padawan bb02a0de6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-10 16:59:29 +01:00
Jorge Padawan 1c6bddbfb6 Added functionality to autocomplete the inputs 2021-02-10 08:47:58 +01:00
Jorge Padawan 1adaeca615 Added controller with sql 2021-02-08 08:41:26 +01:00
Carlos Jimenez Ruiz a0d6e53dbb polutd test removed 2021-02-02 14:00:35 +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 218a19d7da Removed bad code
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 12:37:00 +01:00
Jorge Padawan 60015178a6 Remove bad code 2021-02-02 11:49:42 +01:00
Jorge Padawan e1db173185 Changed scope days value to a correct sentence 2021-02-01 13:29:12 +01:00
Jorge Padawan b600c18950 Add scope days on travel
gitea/salix/pipeline/head This commit looks good Details
2021-01-29 11:45:35 +01:00
Joan Sanchez 7bd89009cb Requested changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 07:26:35 +01:00
Joan Sanchez 257b61d256 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 07:25:02 +01:00
Joan Sanchez 4d1c2ff8ee Requested changed
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 12:57:21 +01:00
Joan Sanchez d26505d25e Requested changed
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 12:56:46 +01:00