Commit Graph

9756 Commits

Author SHA1 Message Date
Joan Sanchez 5962a68d15 HOTFIX: Sort by zone hour
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 12:40:27 +02:00
Joan Sanchez d6dd39d447 Updated ticketGetProblems()
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 11:40:39 +02:00
Joan Sanchez e2ec78461a HOTFIX: Update production starred modules data
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 13:45:18 +02:00
Joan Sanchez 9ae91e1470 Merge pull request '2834-sort-starred-modules' (#636) from 2834-sort-starred-modules into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #636
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-02 10:01:13 +00:00
Joan Sanchez 346ef98645 Merge branch 'dev' into 2834-sort-starred-modules
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 09:47:51 +00:00
Carlos Jimenez Ruiz 611907f4dd Merge pull request '#2934 - HOTFIX: Route suggested tickets' (#635) from 2934-suggested_tickets into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #635
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-06-02 09:28:12 +00:00
Joan Sanchez 655380a52c Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 10:33:10 +02:00
Carlos Jimenez Ruiz 3b7455ab24 semantics and tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 10:31:53 +02:00
Carlos Jimenez Ruiz df4ebbd775 minor refactor to use better semantics 2021-06-02 10:31:26 +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
Carlos Jimenez Ruiz a6883585af translatations 2021-06-02 09:57:37 +02:00
Carlos Jimenez Ruiz 9746da70d7 first left arrow and las right arrow now hidden 2021-06-02 09:55:29 +02:00
Carlos Jimenez Ruiz 9f00fd11d2 favorite modules positions 2021-06-01 22:18:13 +02:00
Joan Sanchez a594e63566 Chip color
gitea/salix/pipeline/head This commit looks good Details
2021-06-01 11:39:40 +02:00
Joan Sanchez 7feb3df05d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-31 07:50:41 +02:00
Joan Sanchez 8c09adb51a HOTFIX: Inserted module "Monitors"
gitea/salix/pipeline/head This commit looks good Details
2021-05-31 07:50:24 +02:00
Carlos Jimenez Ruiz 38ec2415fd Merge pull request '2891 - Get ticket problems for every sale' (#629) from 2891-ticket_sale_problems into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #629
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-05-27 09:49:41 +00:00
Joan Sanchez a24cfe0087 Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 09:42:27 +00:00
Joan Sanchez 27cd54bef1 Updated icons title
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 11:41:45 +02:00
Joan Sanchez 81654167d0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 10:50:39 +02:00
Joan Sanchez 83071d163f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 10:50:22 +02:00
Joan Sanchez c533973398 HOTFIX: Invoice regeneration error
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 10:49:19 +02:00
Joan Sanchez b4d8e25fd3 Merge pull request '2801_ticket_sale_restrictions' (#634) from 2801_ticket_sale_restrictions into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #634
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-05-26 12:19:09 +00:00
Joan Sanchez 920e7b1daf E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 13:05:58 +02:00
Carlos Jimenez Ruiz 3f167de10f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 09:14:30 +02:00
Carlos Jimenez Ruiz d6ef5352a2 sale module now has canEdit endpoint to check arrays of sales 2021-05-26 09:14:18 +02:00
Joan Sanchez 099ff657e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 14:08:02 +02:00
Carlos Jimenez Ruiz cc9a6a7d54 Merge pull request '2925 - Exported production database' (#633) from 2925-export_db into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #633
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-05-25 12:07:00 +00:00
Joan Sanchez f6a0bcb12c Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 13:33:17 +02:00
Carlos Jimenez Ruiz 60b0488a47 Merge branch 'dev' into 2925-export_db
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 09:23:05 +00:00
Joan Sanchez f5ffdd6995 Merge pull request 'getUserConfig now gets default company and warehouse with dynamic code' (#632) from 2923_getUserConfig_default_warehouse_and_company into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #632
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-05-25 09:15:25 +00:00
Joan Sanchez f7487c76a6 2925 - Exported production database
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 11:13:08 +02:00
Joan Sanchez 26cc3a3dec 2891 - Show problems on tickets sales
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 10:01:18 +02:00
Carlos Jimenez Ruiz ec86e908e1 get user config test updated
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 09:25:22 +02:00
Carlos Jimenez Ruiz 18f22fa350 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 09:17:51 +02:00
Carlos Jimenez Ruiz d440a631c8 getUserConfig now gets default company and warehouse with dynamic code
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 17:41:22 +02:00
Joan Sanchez b02d7b3a3b Merge pull request 'fixed getSummary unit test' (#631) from back_unit_test_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #631
2021-05-24 10:08:59 +00:00
Carlos Jimenez Ruiz e418d6239b fixed getSummary unit test
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 11:28:23 +02:00
Joan Sanchez ec7cc169f5 Merge pull request '2920-item_descriptor_user_warehouse' (#630) from 2920-item_descriptor_user_warehouse into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #630
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-05-24 09:23:33 +00:00
Carlos Jimenez Ruiz 2a4ff5a97b fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz 025766857f e2e path fixed for worker calendar
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 18:09:10 +02:00
Carlos Jimenez Ruiz 9a1b6e4653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 15:33:23 +02:00
Carlos Jimenez Ruiz 5c18c5c94c ticket module descriptor now takes warehouseFk from the ticket 2021-05-21 15:31:28 +02:00
Carlos Jimenez Ruiz 1bfe537186 claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig 2021-05-21 15:31:05 +02:00
Joan Sanchez a0b512e3c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 14:24:31 +02:00
Joan Sanchez a376ca32df Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 14:23:50 +02:00
Joan Sanchez 95073183e9 Email rollback
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 14:19:39 +02:00
Joan Sanchez 60185bdf34 Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 07:24:34 +00:00
Joan Sanchez e661fccf40 Merge pull request '2620-mostrar-disponible' (#628) from 2620-mostrar-disponible into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #628
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-05-21 07:18:02 +00:00
Joan Sanchez a103c8d7fc 2891 - Get ticket problems for every sale
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 08:49:32 +02:00