Merge pull request #112 from ProzorroUKR/VAT

add_new_vat

@@ -153,7 +153,7 @@ Suite Teardown  Test Suite Teardown
   ...      ${contract_index}
   ...      ${contract_index}
   ...      value.amountNet
   ...      value.amountNet
   ...      ${amount_net}
   ...      ${amount_net}
-  Should Contain  ${value}  Value amountNet should be less or equal to amount
+  Should Contain  ${value}  Value amountNet should be less or equal to awarded amount
 
 
 
 
 Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону (закупівля з ПДВ)
 Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону (закупівля з ПДВ)
@@ -172,11 +172,14 @@ Suite Teardown  Test Suite Teardown
   ...      ${contract_index}
   ...      ${contract_index}
   ...      value.amount
   ...      value.amount
   ...      ${amount}
   ...      ${amount}
-  Should Contain  ${value}  Value amount should be less or equal to awarded amount
+  Run Keyword IF  '${MODE}' == 'open_esco'
+  ...  Should Contain  ${value}  Can't update amount for contract value
+  ...  ELSE
+  ...  Should Contain  ${value}  Value amount should be less or equal to awarded amount
 
 
 
 
 Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ)
 Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ)
-# contract:value:amountNet can be <= contract:value:amount but no more than on 20% of contract:value:amount value if valueAddedTaxIncluded=ture
+# contract:value:amountNet can be <= contract:value:amount but no more than on contract:value:amount/1.2 value if valueAddedTaxIncluded=ture
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
   ...      tender_owner
   ...      tender_owner
   ...      ${USERS.users['${tender_owner}'].broker}
   ...      ${USERS.users['${tender_owner}'].broker}

@@ -56,7 +56,7 @@ def create_fake_amount(award_amount, value_added_tax_included=False):
 
 
 
 
 def create_fake_amount_net(award_amount, value_added_tax_included=False):
 def create_fake_amount_net(award_amount, value_added_tax_included=False):
-    min_amount_net = award_amount - award_amount * 0.2
+    min_amount_net = award_amount / 1.2
     range_amount_net = award_amount - min_amount_net
     range_amount_net = award_amount - min_amount_net
     half_min_amount_net = min_amount_net + range_amount_net / 2
     half_min_amount_net = min_amount_net + range_amount_net / 2
     if value_added_tax_included:
     if value_added_tax_included:

@@ -23,12 +23,30 @@
 
 
 -i auction
 -i auction
 
 
+-i qualification_add_doc_to_first_award
 -i qualification_approve_first_award
 -i qualification_approve_first_award
+-i qualification_cancel_first_award_qualification
+-i qualification_add_doc_to_second_award
+-i qualification_approve_second_award
 
 
 -i contract_view
 -i contract_view
--i modify_contract_value
 -i modify_contract_amountNet_vat_false
 -i modify_contract_amountNet_vat_false
 -i modify_contract_amount_vat_false
 -i modify_contract_amount_vat_false
 -i modify_contract
 -i modify_contract
+  -i modify_contract_value
 -i add_doc_to_contract
 -i add_doc_to_contract
--i contract_sign
+  -i contract_doc_documentOf
+-i contract_sign
+-i contract_stand_still
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i contract_termination