Commit Graph

8751 Commits

Author SHA1 Message Date
Joan Sanchez 71e29e747a Requested changes
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 14:45:39 +02:00
Javi Gallego 531bb6da25 quito copy
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 13:22:56 +02:00
Joan Sanchez 86025b88e3 Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 09:36:02 +00:00
Carlos Jimenez Ruiz 8b89bcfa11 Merge pull request 'Enabled loggable on calendar model' (#396) from 2451-loggable_calendar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #396
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-10-05 09:34:16 +00:00
Joan Sanchez cef2dc982f Updated sql
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 10:47:12 +02:00
Joan Sanchez d0ece57219 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 10:09:36 +02:00
Carlos Jimenez Ruiz 9c139b49aa enabled jasme random + indentations 2020-10-05 10:04:00 +02:00
Joan Sanchez ad11a92c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2451-loggable_calendar 2020-10-05 10:02:44 +02:00
Javi Gallego e95514d967 reorganiza campos
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 09:24:49 +02:00
Carlos Jimenez Ruiz eb731eb648 Merge pull request '2455 - Validate socialname when isDataChecked is changed' (#395) from 2455-socialname_validation into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #395
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-10-05 07:24:05 +00:00
Javi Gallego 0294d2a845 Merge branch 'dev' into 2443 2020-10-05 09:07:00 +02:00
Joan Sanchez 0dee59f66f Merge branch 'dev' into 2455-socialname_validation
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 07:01:11 +00:00
Joan Sanchez 4abef978a5 Merge pull request 'refactor getComponentSum' (#399) from 2489-ticket_component into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #399
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-10-05 06:58:01 +00:00
Joan Sanchez e3b14405b7 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 08:50:07 +02:00
Joan Sanchez cdde4d95d7 Added filter
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 07:53:03 +02:00
Bernat Exposito Domenech 161313ad15 refactor getComponentSum
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 13:58:48 +02:00
Joan Sanchez 420dfdbdff Send notification by email
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 12:23:48 +02:00
Carlos Jimenez Ruiz 9dca47be97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2484-Sale_priceDifference_test_fails 2020-10-02 09:40:15 +02:00
Carlos Jimenez Ruiz ff3b75267a priceDifference test fix + refactor 2020-10-02 09:39:58 +02:00
Javi Gallego 8b4d25d506 test arreglados windows
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 08:57:51 +02:00
Javi Gallego 8d1709ea51 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 16:46:33 +02:00
Javi Gallego 78e22df177 test e2e de expense ok
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 16:45:28 +02:00
Carlos Jimenez Ruiz a2232f659b Merge pull request 'refactor selectors' (#398) from 2485-refactor_selectors into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #398
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-10-01 09:28:26 +00:00
Bernat Exposito Domenech 5807f6ca38 delete selector
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 11:21:23 +02:00
Bernat Exposito Domenech a7bee03b3d refactor selectors
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 10:38:02 +02:00
Juan Ferrer 6d8b13423f SQL hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 10:02:19 +02:00
Bernat Exposito Domenech 998bfcd4df refactor selectors
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 08:53:31 +02:00
Bernat Exposito cdd71d00ec Merge pull request 'fix test and refactor transferlines' (#397) from 2480-transfer_line into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #397
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-30 12:19:57 +00:00
Javi Gallego 2714857227 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 14:07:38 +02:00
Javi Gallego 891a113326 package 2020-09-30 14:07:34 +02:00
Bernat Exposito Domenech 90e948aeda fix lastActiveTickets
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 13:35:37 +02:00
Bernat Exposito Domenech 1bff4e3c4e fix test and refactor transferlines
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 12:24:33 +02:00
Joan Sanchez 9423216616 Fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 11:19:52 +02:00
Joan Sanchez 503e1d0ed9 2455 - Validate socialname when isDataChecked is changed
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 09:31:01 +02:00
Joan Sanchez 58965a9687 Enabled loggable on calendar model
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 07:38:43 +02:00
Joan Sanchez eb99ce2f43 Disabled back tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 07:23:37 +02:00
Joan Sanchez 79a9363a83 Merge pull request 'fix backend unit test for ticket.weekly' (#393) from 2457-fix_regularizeClaim_unit_test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #393
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-09-29 12:32:55 +00:00
Joan Sanchez 5bdc67f96e Merge branch 'dev' into 2457-fix_regularizeClaim_unit_test
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 12:22:11 +00:00
Joan Sanchez aca6577f23 Merge pull request 'Added functions to call sql from def' (#389) from 1047-print_sql_def into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #389
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-29 12:21:50 +00:00
Joan Sanchez e0d78014c8 Merge branch 'dev' into 1047-print_sql_def
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 12:12:27 +00:00
Joan Sanchez 2ab7999816 Removed unused param dirname
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 14:10:13 +02:00
Carlos Jimenez Ruiz 6e6306a183 Merge branch 'dev' into 2457-fix_regularizeClaim_unit_test
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 12:03:16 +00:00
Carlos Jimenez Ruiz 4847e83fc3 Merge pull request '2462 - Prevent searchbarfocus on 'state' source' (#394) from 2462-focus_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #394
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-29 11:41:21 +00:00
Carlos Jimenez Ruiz a3c11b4e00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 13:33:34 +02:00
Carlos Jimenez Ruiz 1e55632b94 refactor & fix regularize claim and prices Diff
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 13:28:02 +02:00
Carlos Jimenez Ruiz 40abd68734 fix byWarehouse and ticket.filter tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 13:11:11 +02:00
Juan Ferrer 611aa9cafa SQL hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 10:55:04 +02:00
Carlos Jimenez Ruiz 0f557c5286 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test 2020-09-29 10:45:50 +02:00
Carlos Jimenez Ruiz d37a362756 Merge pull request 'Enabled back unit tests' (#390) from 2460-back_pool_closed into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #390
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-29 07:24:24 +00:00
Carlos Jimenez Ruiz 438a4b936e Merge branch 'dev' into 2460-back_pool_closed
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 07:14:49 +00:00