Commit f131c9ea19bb2a3ee69380cef08415bbf8b35d42
Committed by
GitHub
Merge pull request #112 from ProzorroUKR/VAT
add_new_vat
Showing
3 changed files
with
27 additions
and
6 deletions
... | ... | @@ -153,7 +153,7 @@ Suite Teardown Test Suite Teardown |
153 | 153 | ... ${contract_index} |
154 | 154 | ... value.amountNet |
155 | 155 | ... ${amount_net} |
156 | - Should Contain ${value} Value amountNet should be less or equal to amount | |
156 | + Should Contain ${value} Value amountNet should be less or equal to awarded amount | |
157 | 157 | |
158 | 158 | |
159 | 159 | Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону (закупівля з ПДВ) |
... | ... | @@ -172,11 +172,14 @@ Suite Teardown Test Suite Teardown |
172 | 172 | ... ${contract_index} |
173 | 173 | ... value.amount |
174 | 174 | ... ${amount} |
175 | - Should Contain ${value} Value amount should be less or equal to awarded amount | |
175 | + Run Keyword IF '${MODE}' == 'open_esco' | |
176 | + ... Should Contain ${value} Can't update amount for contract value | |
177 | + ... ELSE | |
178 | + ... Should Contain ${value} Value amount should be less or equal to awarded amount | |
176 | 179 | |
177 | 180 | |
178 | 181 | Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ) |
179 | -# contract:value:amountNet can be <= contract:value:amount but no more than on 20% of contract:value:amount value if valueAddedTaxIncluded=ture | |
182 | +# contract:value:amountNet can be <= contract:value:amount but no more than on contract:value:amount/1.2 value if valueAddedTaxIncluded=ture | |
180 | 183 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди |
181 | 184 | ... tender_owner |
182 | 185 | ... ${USERS.users['${tender_owner}'].broker} | ... | ... |
... | ... | @@ -56,7 +56,7 @@ def create_fake_amount(award_amount, value_added_tax_included=False): |
56 | 56 | |
57 | 57 | |
58 | 58 | def create_fake_amount_net(award_amount, value_added_tax_included=False): |
59 | - min_amount_net = award_amount - award_amount * 0.2 | |
59 | + min_amount_net = award_amount / 1.2 | |
60 | 60 | range_amount_net = award_amount - min_amount_net |
61 | 61 | half_min_amount_net = min_amount_net + range_amount_net / 2 |
62 | 62 | if value_added_tax_included: | ... | ... |
... | ... | @@ -23,12 +23,30 @@ |
23 | 23 | |
24 | 24 | -i auction |
25 | 25 | |
26 | +-i qualification_add_doc_to_first_award | |
26 | 27 | -i qualification_approve_first_award |
28 | +-i qualification_cancel_first_award_qualification | |
29 | +-i qualification_add_doc_to_second_award | |
30 | +-i qualification_approve_second_award | |
27 | 31 | |
28 | 32 | -i contract_view |
29 | --i modify_contract_value | |
30 | 33 | -i modify_contract_amountNet_vat_false |
31 | 34 | -i modify_contract_amount_vat_false |
32 | 35 | -i modify_contract |
36 | + -i modify_contract_value | |
33 | 37 | -i add_doc_to_contract |
34 | --i contract_sign | |
\ No newline at end of file | ||
38 | + -i contract_doc_documentOf | |
39 | +-i contract_sign | |
40 | +-i contract_stand_still | |
41 | + | |
42 | +-i find_contract | |
43 | +-i access_contract | |
44 | +-i submit_change | |
45 | +-i view_change | |
46 | +-i upload_change_document | |
47 | +-i modify_change | |
48 | +-i apply_change | |
49 | +-i add_contract_doc | |
50 | +-i termination_reasons | |
51 | +-i amount_paid | |
52 | +-i contract_termination | |
\ No newline at end of file | ... | ... |
Please
register
or
login
to post a comment