Commit Graph

2089 Commits

Author SHA1 Message Date
Bernat Exposito Domenech d414db73de order index add buton and columns 2020-06-30 08:32:04 +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
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
Joan Sanchez 7c45858764 Sms dialog fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 12:59:37 +02:00
Joan Sanchez fa73911452 Added tests
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-18 12:43:33 +02:00
Bernat Exposito Domenech 9af33d1b96 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-18 11:23:35 +02:00
Bernat Exposito Domenech 84bacfd379 add message before delete a line on a claim
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 10:10:42 +02:00
Joan Sanchez 765d3c7553 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 07:19:57 +02:00
Joan Sanchez 43a48994e0 Image path fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 16:33:58 +02:00
Carlos Jimenez Ruiz edea60dd94 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-17 15:38:49 +02:00
Carlos Jimenez Ruiz 2abd45f498 setDelivered and open delivery notes and tests 2020-06-17 15:38:37 +02:00
Joan Sanchez fd97845979 Revert "Removed sms excluded tests"
This reverts commit 30912bd5e9.
2020-06-17 14:00:04 +02:00
Juan Ferrer 8e51104e1b Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:31:54 +02:00
Bernat Exposito Domenech f1b26133cf refactor order index
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:25:12 +02:00
Joan Sanchez 63ed592312 902 - Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 11:51:57 +02:00
Bernat Exposito Domenech ebcbd5068f add restrictions in ticket descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 09:49:14 +02:00
Carlos Jimenez Ruiz fb37e156d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note 2020-06-17 09:22:09 +02:00
Joan Sanchez 686203db18 Merge pull request '2275-claim_detail' (#311) from 2275-claim_detail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-17 05:44:17 +00:00
Bernat Exposito Domenech 930e167a8e fix test
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 07:25:05 +02:00
Joan Sanchez 30912bd5e9 Removed sms excluded tests
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 15:11:24 +02:00
Carlos Jimenez Ruiz 98300b2fec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note 2020-06-16 13:10:56 +02:00
Carlos Jimenez Ruiz b44942c7d7 open delivery notes on ticket index 2020-06-16 12:36:34 +02:00
Bernat Exposito Domenech d80d520fba fix claim.beggining
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 12:00:38 +02:00
Bernat Exposito Domenech b6d50f7d8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail 2020-06-16 11:36:06 +02:00
Javi Gallego 9e62fd78a2 hasta precio
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 10:57:18 +02:00
Javi Gallego 552828a1ba hasta precio
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 10:47:01 +02:00
Joan Sanchez 2f8fa59561 2332 - Fixed on load error
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 09:04:13 +02:00
Joan Sanchez 7fd77bdaef 2332 - Fixed on load error
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 08:50:59 +02:00
Bernat Exposito Domenech b33f42d05e add restrictions in claim detail
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 07:47:46 +02:00
Bernat Exposito Domenech 9d80ec11af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail 2020-06-15 09:54:46 +02:00
Joan Sanchez 279677bda9 Removed report from descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-15 09:07:13 +02:00