Commit d0bac2c48de8695ccf6d630887c3898ec70fbda9

Authored by alexdiatlov
Committed by GitHub
2 parents c10ed2c6 e0275167

Merge pull request #309 from ProzorroUKR/update_cancellation

Update cancellation
Showing 22 changed files with 122 additions and 78 deletions
... ... @@ -7,13 +7,15 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14 -i tender_view
13 15
14   --i make_bid_by_provider
15   --i make_bid_by_provider1
16   --i make_bid_by_provider2
  16 +-i make_bid_with_criteria_by_provider
  17 +-i make_bid_with_criteria_by_provider1
  18 +-i make_bid_with_criteria_by_provider2
17 19
18 20 -i wait_active_pre-qualification_start
19 21
... ... @@ -33,8 +35,8 @@
33 35
34 36 -i save_tender_second_stage
35 37
36   --i make_bid_by_provider_second_stage
37   --i make_bid_by_provider1_second_stage
  38 +-i make_bid_with_criteria_by_provider_second_stage
  39 +-i make_bid_with_criteria_by_provider1_second_stage
38 40
39 41 -i wait_active_pre-qualification_start_second_stage
40 42
... ...
... ... @@ -7,15 +7,17 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -v DIALOGUE_TYPE:UA
11 13
12 14 -i create_tender
13 15 -i find_tender
14 16 -i tender_view
15 17
16   --i make_bid_by_provider
17   --i make_bid_by_provider1
18   --i make_bid_by_provider2
  18 +-i make_bid_with_criteria_by_provider
  19 +-i make_bid_with_criteria_by_provider1
  20 +-i make_bid_with_criteria_by_provider2
19 21
20 22 -i pre-qualification_approve_first_bid
21 23 -i pre-qualification_approve_second_bid
... ... @@ -33,8 +35,8 @@
33 35
34 36 -i save_tender_second_stage
35 37
36   --i make_bid_by_provider_second_stage
37   --i make_bid_by_provider1_second_stage
  38 +-i make_bid_with_criteria_by_provider_second_stage
  39 +-i make_bid_with_criteria_by_provider1_second_stage
38 40
39 41 -i wait_active_qualification_start
40 42
... ...
... ... @@ -9,12 +9,14 @@
9 9
10 10 -v FUNDING_KIND:budget
11 11
  12 +-v ARTICLE_17:True
  13 +
12 14 -i create_tender
13 15 -i find_tender
14 16
15   --i make_bid_by_provider
16   --i make_bid_by_provider1
17   --i make_bid_by_provider2
  17 +-i make_bid_with_criteria_by_provider
  18 +-i make_bid_with_criteria_by_provider1
  19 +-i make_bid_with_criteria_by_provider2
18 20
19 21 -i tender_complaintPeriond_stand_still
20 22
... ...
... ... @@ -7,12 +7,14 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14
13   --i make_bid_by_provider
14   --i make_bid_by_provider1
15   --i make_bid_by_provider2
  15 +-i make_bid_with_criteria_by_provider
  16 +-i make_bid_with_criteria_by_provider1
  17 +-i make_bid_with_criteria_by_provider2
16 18
17 19 -i tender_complaintPeriond_stand_still
18 20
... ...
... ... @@ -7,12 +7,14 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14
13   --i make_bid_by_provider
14   --i make_bid_by_provider1
15   --i make_bid_by_provider2
  15 +-i make_bid_with_criteria_by_provider
  16 +-i make_bid_with_criteria_by_provider1
  17 +-i make_bid_with_criteria_by_provider2
16 18
17 19 -i tender_complaintPeriond_stand_still
18 20
... ...
... ... @@ -7,12 +7,14 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14
13   --i make_bid_by_provider
14   --i make_bid_by_provider1
15   --i make_bid_by_provider2
  15 +-i make_bid_with_criteria_by_provider
  16 +-i make_bid_with_criteria_by_provider1
  17 +-i make_bid_with_criteria_by_provider2
16 18
17 19 -i tender_complaintPeriond_stand_still
18 20
... ...
... ... @@ -7,13 +7,15 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14 -i tender_view
13 15
14   --i make_bid_by_provider
15   --i make_bid_by_provider1
16   --i make_bid_by_provider2
  16 +-i make_bid_with_criteria_by_provider
  17 +-i make_bid_with_criteria_by_provider1
  18 +-i make_bid_with_criteria_by_provider2
17 19
18 20 -i tender_complaintPeriond_stand_still
19 21
... ...
... ... @@ -7,13 +7,15 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14 -i tender_view
13 15
14   --i make_bid_by_provider
15   --i make_bid_by_provider1
16   --i make_bid_by_provider2
  16 +-i make_bid_with_criteria_by_provider
  17 +-i make_bid_with_criteria_by_provider1
  18 +-i make_bid_with_criteria_by_provider2
17 19
18 20 -i wait_active_pre-qualification_start
19 21
... ...
... ... @@ -7,15 +7,17 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -v DIALOGUE_TYPE:UA
11 13
12 14 -i create_tender
13 15 -i find_tender
14 16 -i tender_view
15 17
16   --i make_bid_by_provider
17   --i make_bid_by_provider1
18   --i make_bid_by_provider2
  18 +-i make_bid_with_criteria_by_provider
  19 +-i make_bid_with_criteria_by_provider1
  20 +-i make_bid_with_criteria_by_provider2
19 21
20 22 -i tender_complaintPeriond_stand_still
21 23
... ...
... ... @@ -9,12 +9,14 @@
9 9
10 10 -v FUNDING_KIND:budget
11 11
  12 +-v ARTICLE_17:True
  13 +
12 14 -i create_tender
13 15 -i find_tender
14 16
15   --i make_bid_by_provider
16   --i make_bid_by_provider1
17   --i make_bid_by_provider2
  17 +-i make_bid_with_criteria_by_provider
  18 +-i make_bid_with_criteria_by_provider1
  19 +-i make_bid_with_criteria_by_provider2
18 20
19 21 -i tender_complaintPeriond_stand_still
20 22
... ...
... ... @@ -7,12 +7,14 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14
13   --i make_bid_by_provider
14   --i make_bid_by_provider1
15   --i make_bid_by_provider2
  15 +-i make_bid_with_criteria_by_provider
  16 +-i make_bid_with_criteria_by_provider1
  17 +-i make_bid_with_criteria_by_provider2
16 18
17 19 -i tender_complaintPeriond_stand_still
18 20
... ...
... ... @@ -7,12 +7,14 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14
13   --i make_bid_by_provider
14   --i make_bid_by_provider1
15   --i make_bid_by_provider2
  15 +-i make_bid_with_criteria_by_provider
  16 +-i make_bid_with_criteria_by_provider1
  17 +-i make_bid_with_criteria_by_provider2
16 18
17 19 -i tender_complaintPeriond_stand_still
18 20
... ...
... ... @@ -7,13 +7,15 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14 -i tender_view
13 15
14   --i make_bid_by_provider
15   --i make_bid_by_provider1
16   --i make_bid_by_provider2
  16 +-i make_bid_with_criteria_by_provider
  17 +-i make_bid_with_criteria_by_provider1
  18 +-i make_bid_with_criteria_by_provider2
17 19
18 20 -i pre-qualification_approve_first_bid
19 21 -i pre-qualification_approve_second_bid
... ... @@ -31,8 +33,8 @@
31 33
32 34 -i save_tender_second_stage
33 35
34   --i make_bid_by_provider_second_stage
35   --i make_bid_by_provider1_second_stage
  36 +-i make_bid_with_criteria_by_provider_second_stage
  37 +-i make_bid_with_criteria_by_provider1_second_stage
36 38
37 39 -i pre-qualification_approve_first_bid_second_stage
38 40 -i pre-qualification_approve_second_bid_second_stage
... ...
... ... @@ -7,13 +7,15 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14 -i tender_view
13 15
14   --i make_bid_by_provider
15   --i make_bid_by_provider1
16   --i make_bid_by_provider2
  16 +-i make_bid_with_criteria_by_provider
  17 +-i make_bid_with_criteria_by_provider1
  18 +-i make_bid_with_criteria_by_provider2
17 19
18 20 -i wait_active_pre-qualification_start
19 21
... ... @@ -33,8 +35,8 @@
33 35
34 36 -i save_tender_second_stage
35 37
36   --i make_bid_by_provider_second_stage
37   --i make_bid_by_provider1_second_stage
  38 +-i make_bid_with_criteria_by_provider_second_stage
  39 +-i make_bid_with_criteria_by_provider1_second_stage
38 40
39 41 -i wait_active_pre-qualification_start_second_stage
40 42
... ...
... ... @@ -7,15 +7,17 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -v DIALOGUE_TYPE:UA
11 13
12 14 -i create_tender
13 15 -i find_tender
14 16 -i tender_view
15 17
16   --i make_bid_by_provider
17   --i make_bid_by_provider1
18   --i make_bid_by_provider2
  18 +-i make_bid_with_criteria_by_provider
  19 +-i make_bid_with_criteria_by_provider1
  20 +-i make_bid_with_criteria_by_provider2
19 21
20 22 -i pre-qualification_approve_first_bid
21 23 -i pre-qualification_approve_second_bid
... ... @@ -34,8 +36,8 @@
34 36 -i save_tender_second_stage
35 37
36 38
37   --i make_bid_by_provider_second_stage
38   --i make_bid_by_provider1_second_stage
  39 +-i make_bid_with_criteria_by_provider_second_stage
  40 +-i make_bid_with_criteria_by_provider1_second_stage
39 41
40 42 -i wait_active_qualification_start
41 43
... ...
... ... @@ -7,15 +7,17 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -v DIALOGUE_TYPE:UA
11 13
12 14 -i create_tender
13 15 -i find_tender
14 16 -i tender_view
15 17
16   --i make_bid_by_provider
17   --i make_bid_by_provider1
18   --i make_bid_by_provider2
  18 +-i make_bid_with_criteria_by_provider
  19 +-i make_bid_with_criteria_by_provider1
  20 +-i make_bid_with_criteria_by_provider2
19 21
20 22 -i pre-qualification_approve_first_bid
21 23 -i pre-qualification_approve_second_bid
... ... @@ -33,8 +35,8 @@
33 35
34 36 -i save_tender_second_stage
35 37
36   --i make_bid_by_provider_second_stage
37   --i make_bid_by_provider1_second_stage
  38 +-i make_bid_with_criteria_by_provider_second_stage
  39 +-i make_bid_with_criteria_by_provider1_second_stage
38 40
39 41 -i wait_active_qualification_start
40 42
... ...
... ... @@ -9,12 +9,14 @@
9 9
10 10 -v FUNDING_KIND:budget
11 11
  12 +-v ARTICLE_17:True
  13 +
12 14 -i create_tender
13 15 -i find_tender
14 16
15   --i make_bid_by_provider
16   --i make_bid_by_provider1
17   --i make_bid_by_provider2
  17 +-i make_bid_with_criteria_by_provider
  18 +-i make_bid_with_criteria_by_provider1
  19 +-i make_bid_with_criteria_by_provider2
18 20
19 21 -i tender_complaintPeriond_stand_still
20 22
... ...
... ... @@ -7,12 +7,14 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14
13   --i make_bid_by_provider
14   --i make_bid_by_provider1
15   --i make_bid_by_provider2
  15 +-i make_bid_with_criteria_by_provider
  16 +-i make_bid_with_criteria_by_provider1
  17 +-i make_bid_with_criteria_by_provider2
16 18
17 19 -i tender_complaintPeriond_stand_still
18 20
... ...
... ... @@ -7,12 +7,14 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14
13   --i make_bid_by_provider
14   --i make_bid_by_provider1
15   --i make_bid_by_provider2
  15 +-i make_bid_with_criteria_by_provider
  16 +-i make_bid_with_criteria_by_provider1
  17 +-i make_bid_with_criteria_by_provider2
16 18
17 19 -i tender_complaintPeriond_stand_still
18 20
... ...
... ... @@ -7,12 +7,14 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14
13   --i make_bid_by_provider
14   --i make_bid_by_provider1
15   --i make_bid_by_provider2
  15 +-i make_bid_with_criteria_by_provider
  16 +-i make_bid_with_criteria_by_provider1
  17 +-i make_bid_with_criteria_by_provider2
16 18
17 19 -i tender_complaintPeriond_stand_still
18 20
... ...
... ... @@ -7,13 +7,15 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -i create_tender
11 13 -i find_tender
12 14 -i tender_view
13 15
14   --i make_bid_by_provider
15   --i make_bid_by_provider1
16   --i make_bid_by_provider2
  16 +-i make_bid_with_criteria_by_provider
  17 +-i make_bid_with_criteria_by_provider1
  18 +-i make_bid_with_criteria_by_provider2
17 19
18 20 -i pre-qualification_approve_first_bid
19 21 -i pre-qualification_approve_second_bid
... ...
... ... @@ -7,15 +7,17 @@
7 7 -v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
  10 +-v ARTICLE_17:True
  11 +
10 12 -v DIALOGUE_TYPE:UA
11 13
12 14 -i create_tender
13 15 -i find_tender
14 16 -i tender_view
15 17
16   --i make_bid_by_provider
17   --i make_bid_by_provider1
18   --i make_bid_by_provider2
  18 +-i make_bid_with_criteria_by_provider
  19 +-i make_bid_with_criteria_by_provider1
  20 +-i make_bid_with_criteria_by_provider2
19 21
20 22 -i pre-qualification_approve_first_bid
21 23 -i pre-qualification_approve_second_bid
... ...
Please register or login to post a comment