Merge pull request #118 from ProzorroUKR/VAT

fix_vat_false_true

@@ -461,11 +461,9 @@ Suite Teardown  Test Suite Teardown
   ...      ${USERS.users['${tender_owner}'].broker}
   ...      ${USERS.users['${tender_owner}'].broker}
   ...      change_amount_paid
   ...      change_amount_paid
   [Teardown]  Оновити LAST_MODIFICATION_DATE
   [Teardown]  Оновити LAST_MODIFICATION_DATE
-  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
-  ${amountPaid.amount}=  create_fake_amount
+  ${amountPaid.amount}=  create_fake_amount_paid
   ...      ${USERS.users['${tender_owner}'].contract_data.data.value.amount}
   ...      ${USERS.users['${tender_owner}'].contract_data.data.value.amount}
-  ...      ${award.value.valueAddedTaxIncluded}
-  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded}
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.amountNet}
   Set to dictionary  ${USERS.users['${tender_owner}']}  new_amountPaid_amount=${amountPaid.amount}
   Set to dictionary  ${USERS.users['${tender_owner}']}  new_amountPaid_amount=${amountPaid.amount}
   Run As  ${tender_owner}  Редагувати поле договору  ${CONTRACT_UAID}  amountPaid.amount  ${amountPaid.amount}
   Run As  ${tender_owner}  Редагувати поле договору  ${CONTRACT_UAID}  amountPaid.amount  ${amountPaid.amount}
 
 

@@ -226,7 +226,7 @@ Suite Teardown  Test Suite Teardown
   ...      value.amountNet
   ...      value.amountNet
   ...      ${amount_net}
   ...      ${amount_net}
   Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${False}' and '${contract.value.valueAddedTaxIncluded}' == '${True}'
   Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${False}' and '${contract.value.valueAddedTaxIncluded}' == '${True}'
-  ...      Should Contain  ${value}  Amount and amountNet should be equal
+  ...      Should Contain  ${value}  AmountNet should be less or equal to awarded amount
   Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${True}' and '${contract.value.valueAddedTaxIncluded}' == '${False}'
   Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${True}' and '${contract.value.valueAddedTaxIncluded}' == '${False}'
   ...      Should Contain  ${value}  Amount and amountNet should be equal
   ...      Should Contain  ${value}  Amount and amountNet should be equal
   Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${False}' and '${contract.value.valueAddedTaxIncluded}' == '${False}'
   Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${False}' and '${contract.value.valueAddedTaxIncluded}' == '${False}'
@@ -302,7 +302,7 @@ Suite Teardown  Test Suite Teardown
   ...      ${contract_index}
   ...      ${contract_index}
   ...      value.amount
   ...      value.amount
   ...      ${amount}
   ...      ${amount}
-  Should Contain  ${value}  Value amount can't be greater than amountNet
+  Should Contain  ${value}  Amount should be greater than amountNet and differ by no more than 20.0%"
 
 
 
 
 Можливість встановити дату підписання угоди
 Можливість встановити дату підписання угоди

@@ -73,6 +73,14 @@ def create_fake_amount_net(award_amount, tender_value_added_tax_included, contra
         return round(random.uniform(half_min_amount_net, award_amount), 2)
         return round(random.uniform(half_min_amount_net, award_amount), 2)
 
 
 
 
+def create_fake_amount_paid(contract_amount, contract_amountNet):
+    minimum = contract_amountNet
+    maximum = contract_amount
+    range = maximum - minimum
+    half_min_range = minimum + range / 2
+    return round(random.uniform(minimum, half_min_range), 2)
+
+
 def create_fake_number(min_number, max_number):
 def create_fake_number(min_number, max_number):
     return random.randint(int(min_number), int(max_number))
     return random.randint(int(min_number), int(max_number))
 
 

@@ -21,6 +21,7 @@ from .initial_data import (
     create_fake_sentence,
     create_fake_sentence,
     create_fake_amount,
     create_fake_amount,
     create_fake_amount_net,
     create_fake_amount_net,
+    create_fake_amount_paid,
     create_fake_number,
     create_fake_number,
     create_fake_number_float,
     create_fake_number_float,
     create_fake_date,
     create_fake_date,

@@ -27,8 +27,8 @@
 -i modify_contract_amount_net
 -i modify_contract_amount_net
 -i modify_contract_value
 -i modify_contract_value
 
 
--i modify_contract_invalid_amount
--i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_invalid_amountNet
+-i modify_contract_invalid_amount_tender_vat_false
 
 
 -i modify_contract
 -i modify_contract