Commit Graph

2117 Commits

Author SHA1 Message Date
Joan Sanchez 91e739547b Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-11 18:30:27 +02:00
Joan Sánchez 01b32d2b89 Calendar changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-08 15:05:56 +02:00
Joan Sánchez dd8e03dd0f Added absence selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-07 14:29:57 +02:00
Joan Sanchez 53d672152b Merge branch 'dev' into 2343-exportar_produccion
gitea/salix/pipeline/head This commit looks good Details
2020-07-07 06:19:12 +00:00
Carlos Jimenez Ruiz 663b5fb9aa descriptor can now have 4 quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-07-03 13:28:49 +02:00
Carlos Jimenez Ruiz 36f4998e75 e2e nad canCreateTicket unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-02 09:35:52 +02:00
Joan Sanchez 23664dd3c5 Refresh total on sale changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 15:00:48 +02:00
Carlos Jimenez Ruiz c801d8a969 Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 14:45:53 +02:00
Carlos Jimenez Ruiz 354123dc86 e2e toolkit 2.0 + refactors 2020-07-01 14:45:48 +02:00
Joan Sanchez b40e09a6cb Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 14:28:05 +02:00
Joan Sanchez 78ee6f1aff Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 12:53:56 +02:00
Joan Sanchez 0a327087ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 11:57:16 +02:00
Joan Sanchez defe7e7a17 Added front unit tests 2020-07-01 11:57:01 +02:00
Javi Gallego f57e332503 Merge branch 'dev' into #2344-ticket-sale--descuento--al-usuario
gitea/salix/pipeline/head This commit looks good Details
2020-06-30 13:25:33 +02:00
Carlos Jimenez Ruiz 1dfd0c26ef Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor 2020-06-30 11:15:28 +02:00
Carlos Jimenez Ruiz b451b400bf e2e toolkit 2020-06-30 11:15:20 +02:00
Javi Gallego 039eec7d26 test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 10:16:22 +02:00
Joan Sanchez a0f625d019 Changed methods order, minor fixes 2020-06-30 10:01:30 +02:00
Joan Sanchez c9d94ca814 Reset watcher changes if there's no new data to save
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 09:37:09 +02:00
Bernat Exposito Domenech e7a866553c fix test
gitea/salix/pipeline/head This commit looks good Details
2020-06-30 09:15:08 +02:00
Bernat Exposito Domenech d77297941f fix date in a front test
gitea/salix/pipeline/head This commit looks good Details
2020-06-30 09:08:08 +02:00
Javi Gallego db06626675 refactor
gitea/salix/pipeline/head This commit has test failures Details
2020-06-29 14:26:27 +02:00
Joan Sanchez 2c23f3417a Sale selection fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 11:43:53 +02:00
Joan Sanchez 789769ad7d Destroy edit prop fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 09:38:42 +02:00
Javi Gallego 87de2bd2fb Merge branch 'dev' into #2344-ticket-sale--descuento--al-usuario
gitea/salix/pipeline/head This commit has test failures Details
2020-06-29 07:37:27 +02:00
Bernat Exposito Domenech ea1eb16060 export structure
gitea/salix/pipeline/head This commit looks good Details
2020-06-29 07:32:08 +02:00
Javi Gallego 962436b8bb 2344 ticket sale descuento usuario
gitea/salix/pipeline/head This commit has test failures Details
2020-06-25 17:12:53 +02:00
Joan Sanchez a8377950f5 Fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 16:39:20 +02:00
Carlos Jimenez Ruiz 9d88b9359a removed unused column
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 16:07:07 +02:00
Carlos Jimenez Ruiz 984e8fd794 added total price of services
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 14:53:41 +02:00
Carlos Jimenez Ruiz 31b1599f2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2335-zone_descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 13:49:15 +02:00
Joan Sanchez d4c78b46c1 1368 - First sale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 13:40:49 +02:00
Carlos Jimenez Ruiz ec6a3e00f7 removed unused argument in test
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 13:26:21 +02:00
Carlos Jimenez Ruiz bc9ab1a837 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2328-claim_detail
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 13:10:12 +02:00
Bernat Exposito Domenech 2275541bb1 change on-response for on-accept
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 12:46:24 +02:00
Carlos Jimenez Ruiz 7c72cd8f2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2322-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 12:33:16 +02:00
Carlos Jimenez Ruiz 1b683f5dc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 902-zone_unit_tests
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 11:41:18 +02:00
Bernat Exposito Domenech ee2a4771ff delete coment code
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 11:22:33 +02:00
Bernat Exposito Domenech 6a021b5767 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2061-ticket_descriptor 2020-06-23 10:00:50 +02:00
Bernat Exposito Domenech e96df49622 refactor delete zone
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 07:38:36 +02:00
Joan Sanchez 356c1a7b45 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-06-22 11:54:50 +02:00
Joan Sanchez 4ad3334de6 Allow change to discount 0%
gitea/salix/pipeline/head This commit looks good Details
2020-06-22 11:49:44 +02:00
Joan Sanchez 3cb783740f Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-06-22 10:01:55 +02:00
Joan Sanchez 8729d1c765 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-19 10:35:57 +02:00
Joan Sanchez 2930b60adc Entitlement rate
gitea/salix/pipeline/head This commit looks good Details
2020-06-19 10:28:08 +02:00
Joan Sanchez 41eeaeef0b Entitlement rate
gitea/salix/pipeline/head This commit looks good Details
2020-06-19 09:58:09 +02:00
Carlos Jimenez Ruiz e6a72d0f09 clean code refactor
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz 3c2a392cb8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 13:51:00 +02:00
Carlos Jimenez Ruiz 4d97357213 update estate without model.refresh() 2020-06-18 13:50:52 +02:00
Joan Sanchez 322085ffd7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-18 13:15:45 +02:00