Merge pull request #119 from ProzorroUKR/VAT

CS-2813 VAT

Merge pull request #119 from ProzorroUKR/VAT
CS-2813 VAT
alexdiatlov · GitHub
2 parents e5cc4264 09200436
Showing 33 changed files with 967 additions and 111 deletions
op_robot_tests/tests_files/base_keywords.robot
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/complaints.robot
op_robot_tests/tests_files/contract_management.robot
op_robot_tests/tests_files/contract_signing.robot
op_robot_tests/tests_files/initial_data.py
op_robot_tests/tests_files/negotiation.quick.robot
op_robot_tests/tests_files/negotiation.robot
op_robot_tests/tests_files/qualification.robot
op_robot_tests/tests_files/reporting.robot
op_robot_tests/tests_files/service_keywords.py
robot_tests_arguments/below.txt
robot_tests_arguments/below_after_resolved_award_complaint.txt
robot_tests_arguments/below_funders_full.txt
robot_tests_arguments/below_simple.txt
robot_tests_arguments/below_vat_false_false.txt
robot_tests_arguments/below_vat_false_true.txt
robot_tests_arguments/below_vat_true_false.txt
robot_tests_arguments/below_vat_true_true.txt
robot_tests_arguments/competitive_dialogue_UA.txt
--- a/op_robot_tests/tests_files/base_keywords.robot
View file @f642807
+++ b/op_robot_tests/tests_files/base_keywords.robot
View file @f642807
@@ -835,8 +835,9 @@ Resource           resource.robot
 Вказати дійсно оплачену суму
   ${amount}=  Get variable value  ${USERS.users['${tender_owner}'].contract_data.data.value.amount}
+  ${amount_net}=  Get variable value  ${USERS.users['${tender_owner}'].contract_data.data.value.amountNet}
   ${valueAddedTaxIncluded}=  Get variable value  ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded}
-  ${amountPaid}=  Create Dictionary  amount=${amount}  valueAddedTaxIncluded=${valueAddedTaxIncluded}  currency=UAH
+  ${amountPaid}=  Create Dictionary  amount=${amount}  amountNet=${amount_net}  valueAddedTaxIncluded=${valueAddedTaxIncluded}  currency=UAH
   ${data}=  Create Dictionary  amountPaid=${amountPaid}
   ${data}=  Create Dictionary  data=${data}
   Set to dictionary  ${USERS.users['${tender_owner}']}  terminating_data=${data}
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @f642807
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @f642807
@@ -1794,6 +1794,34 @@ Library  openprocurement_client.utils
   Log  ${reply}
+Редагувати обидва поля вартості угоди
+  [Arguments]  ${username}  ${tender_uaid}  ${contract_index}  ${field_amount}  ${field_amountNet}  ${fieldvalue}
+  ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
+  ${contract}=  Create Dictionary  data=${tender.data.contracts[${contract_index}]}
+  Set_to_object  ${contract.data}  ${field_amount}  ${fieldvalue}
+  Set_to_object  ${contract.data}  ${field_amountNet}  ${fieldvalue}
+  ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_contract
+  ...      ${tender.data.id}
+  ...      ${contract}
+  ...      ${contract.data.id}
+  ...      access_token=${tender.access.token}
+  Log  ${reply}
+
+
+Змінити ознаку ПДВ на True
+  [Arguments]  ${username}  ${tender_uaid}  ${contract_index}  ${vat_fieldvalue}  ${field_amount}
+  ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
+  ${contract}=  Create Dictionary  data=${tender.data.contracts[${contract_index}]}
+  Set To Dictionary  ${contract.data.value}  valueAddedTaxIncluded=${vat_fieldvalue}
+  Set To Dictionary  ${contract.data.value}  amountNet=${field_amount}
+  ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_contract
+  ...      ${tender.data.id}
+  ...      ${contract}
+  ...      ${contract.data.id}
+  ...      access_token=${tender.access.token}
+  Log  ${reply}
+
+
 Встановити ціну за одиницю для контракту
   [Arguments]  ${username}  ${tender_uaid}  ${contract_data}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
@@ -1829,6 +1857,19 @@ Library  openprocurement_client.utils
   Log  ${reply}
+Змінити ознаку ПДВ
+  [Arguments]  ${username}  ${tender_uaid}  ${contract_index}  ${fieldvalue}
+  ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
+  ${contract}=  Create Dictionary  data=${tender.data.contracts[${contract_index}]}
+  Set To Dictionary  ${contract.data.value}  valueAddedTaxIncluded=${fieldvalue}
+  ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_contract
+  ...      ${tender.data.id}
+  ...      ${contract}
+  ...      ${contract.data.id}
+  ...      access_token=${tender.access.token}
+  Log  ${reply}
+
+
 Встановити дату підписання угоди
   [Arguments]  ${username}  ${tender_uaid}  ${contract_index}  ${fieldvalue}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
@@ -1986,6 +2027,17 @@ Library  openprocurement_client.utils
   Log  ${contract}
+Одночасно Редагувати два поля договору
+  [Arguments]  ${username}  ${contract_uaid}  ${first_fieldname}  ${first_fieldvalue}  ${second_fieldname}  ${second_fieldvalue}
+  ${internalid}=  openprocurement_client.Отримати internal id по UAid для договору  ${username}  ${contract_uaid}
+  ${contract}=  openprocurement_client.Пошук договору по ідентифікатору  ${username}  ${contract_uaid}
+  Set_To_Object  ${contract.data}  ${first_fieldname}  ${first_fieldvalue}
+  Set_To_Object  ${contract.data}  ${second_fieldname}  ${second_fieldvalue}
+  Log  ${contract}
+  ${contract}=  Call Method  ${USERS.users['${username}'].contracting_client}  patch_contract  ${internalid}  ${USERS.users['${username}'].contract_access_token}  ${contract}
+  Log  ${contract}
+
+
 Редагувати зміну
   [Arguments]  ${username}  ${contract_uaid}  ${fieldname}  ${fieldvalue}
   ${internalid}=  openprocurement_client.Отримати internal id по UAid для договору  ${username}  ${contract_uaid}
--- a/op_robot_tests/tests_files/complaints.robot
View file @f642807
+++ b/op_robot_tests/tests_files/complaints.robot
View file @f642807
@@ -740,6 +740,48 @@ ${award_index}      ${0}
   Дочекатись дати  ${standstillEnd}
+Можливість редагувати вартість угоди без урахування ПДВ
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      modify_contract_amount_net
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount_net}=  create_fake_amount_net  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount_net=${amount_net}
+  Run As  ${tender_owner}  Редагувати угоду
+  ...      ${TENDER['TENDER_UAID']}
+  ...      ${contract_index}
+  ...      value.amountNet
+  ...      ${amount_net}
+
+
+Можливість редагувати вартість угоди
+  ${viewer_data}=  Get From Dictionary  ${USERS.users}  ${viewer}
+  ${tender_owner_data}=  Get From Dictionary  ${USERS.users}  ${tender_owner}
+  [Tags]   ${tender_owner_data.broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${tender_owner_data.broker}
+  ...      modify_contract_value
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount}=  create_fake_amount  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount=${amount}
+  Run As  ${tender_owner}  Редагувати угоду
+  ...      ${TENDER['TENDER_UAID']}
+  ...      ${contract_index}
+  ...      value.amount
+  ...      ${amount}
+
+
 Можливість укласти угоду для закупівлі
   [Tags]  ${USERS.users['${tender_owner}'].broker}: Процес укладання угоди
   ...     tender_owner
--- a/op_robot_tests/tests_files/contract_management.robot
View file @f642807
+++ b/op_robot_tests/tests_files/contract_management.robot
View file @f642807
@@ -17,7 +17,8 @@ Suite Teardown  Test Suite Teardown
   Завантажити дані про тендер
   :FOR  ${username}  in  @{used_roles}
   \  Run As  ${${username}}  Пошук тендера по ідентифікатору  ${TENDER['TENDER_UAID']}
-  ${CONTRACT_UAID}=  Get variable value  ${USERS.users['${tender_owner}'].tender_data.data.contracts[1].contractID}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  ${CONTRACT_UAID}=  Get variable value  ${USERS.users['${tender_owner}'].tender_data.data.contracts[${contract_index}].contractID}
   Set Suite Variable  ${CONTRACT_UAID}
@@ -165,9 +166,13 @@ Suite Teardown  Test Suite Teardown
   [Tags]   ${USERS.users['${tender_owner}']}: Редагування договору
   ...      tender_owner
   ...      ${USERS.users['${tender_owner}']}
-  ...      modify_contract
+  ...      change_contract_amountNet
   [Teardown]  Оновити LAST_MODIFICATION_DATE
-  ${amount_net}=  create_fake_amount_net  ${USERS.users['${tender_owner}'].contract_data.data.value.amount}
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${amount_net}=  create_fake_amount_net
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.amount}
+  ...      ${award.value.valueAddedTaxIncluded}
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded}
   Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount_net=${amount_net}
   Run As  ${tender_owner}  Редагувати поле договору  ${CONTRACT_UAID}  value.amountNet  ${amount_net}
@@ -176,13 +181,33 @@ Suite Teardown  Test Suite Teardown
   [Tags]   ${USERS.users['${tender_owner}']}: Редагування договору
   ...      tender_owner
   ...      ${USERS.users['${tender_owner}']}
-  ...      modify_contract
+  ...      change_contract_amount
   [Teardown]  Оновити LAST_MODIFICATION_DATE
-  ${amount}=  create_fake_amount  ${USERS.users['${tender_owner}'].contract_data.data.value.amount}
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${amount}=  create_fake_amount
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.amount}
+  ...      ${award.value.valueAddedTaxIncluded}
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded}
   Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount=${amount}
   Run As  ${tender_owner}  Редагувати поле договору  ${CONTRACT_UAID}  value.amount  ${amount}
+Можливість одночасно редагувати вартість договору з/без ПДВ
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      change_contract_amount_and_amountNet
+  ...      critical
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${amount_both_fields}=  create_fake_amount
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.amount}
+  ...      ${award.value.valueAddedTaxIncluded}
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  amount=${amount_both_fields}
+  Run As  ${tender_owner}  Одночасно Редагувати два поля договору  ${CONTRACT_UAID}  value.amount  ${amount_both_fields}  value.amountNet  ${amount_both_fields}
+
+
 Можливість редагувати дату завершення дії договору
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування договору
   ...      tender_owner
@@ -260,7 +285,7 @@ Suite Teardown  Test Suite Teardown
   [Tags]   ${USERS.users['${tender_owner}']}: Редагування договору
   ...      viewer
   ...      ${USERS.users['${tender_owner}']}
-  ...      modify_contract
+  ...      modify_contract_view_new_amountNet
   Звірити поле договору із значенням
   ...      ${viewer}
   ...      ${CONTRACT_UAID}
@@ -272,7 +297,7 @@ Suite Teardown  Test Suite Teardown
   [Tags]   ${USERS.users['${tender_owner}']}: Редагування договору
   ...      viewer
   ...      ${USERS.users['${tender_owner}']}
-  ...      modify_contract
+  ...      modify_contract_view_new_amountNet
   Звірити поле договору із значенням
   ...      ${viewer}
   ...      ${CONTRACT_UAID}
@@ -280,6 +305,24 @@ Suite Teardown  Test Suite Teardown
   ...      value.amount
+Відображення одночасно відредагованої вартості договору з/без ПДВ
+  [Tags]   ${USERS.users['${tender_owner}']}: Редагування договору
+  ...      viewer
+  ...      ${USERS.users['${tender_owner}']}
+  ...      modify_contract_view_new_amount_amountNet
+  Звірити поле договору із значенням
+  ...      ${viewer}
+  ...      ${CONTRACT_UAID}
+  ...      ${USERS.users['${tender_owner}'].amount}
+  ...      value.amount
+  Звірити поле договору із значенням
+  ...      ${viewer}
+  ...      ${CONTRACT_UAID}
+  ...      ${USERS.users['${tender_owner}'].amount}
+  ...      value.amountNet
+
+
+
 Відображення відредагованої дати початку дії договору
   [Tags]   ${USERS.users['${viewer}'].broker}: Редагування договору
   ...      viewer
@@ -416,13 +459,30 @@ Suite Teardown  Test Suite Teardown
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування договору
   ...      tender_owner
   ...      ${USERS.users['${tender_owner}'].broker}
-  ...      amount_paid
+  ...      change_amount_paid
   [Teardown]  Оновити LAST_MODIFICATION_DATE
-  ${amountPaid.amount}=  create_fake_value_amount
+  ${amountPaid.amount}=  create_fake_amount_paid
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.amount}
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.amountNet}
   Set to dictionary  ${USERS.users['${tender_owner}']}  new_amountPaid_amount=${amountPaid.amount}
   Run As  ${tender_owner}  Редагувати поле договору  ${CONTRACT_UAID}  amountPaid.amount  ${amountPaid.amount}
+Можливість одночасно редагувати обсяг дійсно оплаченої суми з/без ПДВ
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування договору
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      change_amount_and_amountNet_paid
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${amountPaid.amount_both_fields}=  create_fake_amount
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.amount}
+  ...      ${award.value.valueAddedTaxIncluded}
+  ...      ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  new_amountPaid_amount=${amountPaid.amount_both_fields}
+  Run As  ${tender_owner}  Одночасно Редагувати два поля договору  ${CONTRACT_UAID}  amountPaid.amount  ${amountPaid.amount_both_fields}  amountPaid.amountNet  ${amountPaid.amount_both_fields}
+
+
 Відображення відредагованого обсягу дійсно оплаченої суми
   [Tags]   ${USERS.users['${viewer}'].broker}: Редагування договору
   ...      viewer
--- a/op_robot_tests/tests_files/contract_signing.robot
View file @f642807
+++ b/op_robot_tests/tests_files/contract_signing.robot
View file @f642807
@@ -47,7 +47,7 @@ Suite Teardown  Test Suite Teardown
 Відображення вартості угоди без урахування ПДВ
   [Tags]   ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
   ...      viewer
-  ...      ${viewer_data.broker}
+  ...      ${USERS.users['${viewer}'].broker}
   ...      contract_view
   ...      non-critical
   [Setup]  Дочекатись синхронізації з майданчиком  ${viewer}
@@ -59,16 +59,59 @@ Suite Teardown  Test Suite Teardown
   Звірити відображення поля ${amount_net_field} тендера із ${award_amount} для користувача ${viewer}
+Відображення вартості угоди
+  [Tags]   ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
+  ...      viewer
+  ...      ${USERS.users['${viewer}'].broker}
+  ...      contract_view
+  ...      non-critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${viewer}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  ${amount_field}=  Set Variable  contracts[${contract_index}].value.amount
+  Отримати дані із поля ${amount_field} тендера для користувача ${viewer}
+
+
+Можливість змінити ознаку контракту на без ПДВ
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      modify_contract_vat_to_false
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  valueAddedTaxIncluded=${False}
+  Run As  ${tender_owner}  Змінити ознаку ПДВ  ${TENDER['TENDER_UAID']}  ${contract_index}  ${False}
+
+
+Можливість змінити ознаку контракту на з ПДВ
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      modify_contract_vat_to_true
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount_net}=  create_fake_amount_net  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  valueAddedTaxIncluded=${True}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  amountNet=${amount_net}
+  Run As  ${tender_owner}  Змінити ознаку ПДВ на True  ${TENDER['TENDER_UAID']}  ${contract_index}  ${True}  ${amount_net}
+
+
 Можливість редагувати вартість угоди без урахування ПДВ
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
   ...      tender_owner
   ...      ${USERS.users['${tender_owner}'].broker}
-  ...      modify_contract
+  ...      modify_contract_amount_net
   ...      critical
   [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
   [Teardown]  Оновити LAST_MODIFICATION_DATE
   ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
-  ${amount_net}=  create_fake_amount_net  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount_net}=  create_fake_amount_net  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
   ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
   Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount_net=${amount_net}
   Run As  ${tender_owner}  Редагувати угоду
@@ -78,31 +121,6 @@ Suite Teardown  Test Suite Teardown
   ...      ${amount_net}
-Відображення відредагованої вартості угоди без урахування ПДВ
-  [Tags]   ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
-  ...      viewer
-  ...      ${USERS.users['${viewer}'].broker}  ${USERS.users['${tender_owner}'].broker}
-  ...      contract_view
-  ...      non-critical
-  [Setup]  Дочекатись синхронізації з майданчиком  ${viewer}
-  ${amount_net}=  Get Variable Value  ${USERS.users['${tender_owner}'].new_amount_net}
-  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
-  ${amount_net_field}=  Set Variable  contracts[${contract_index}].value.amountNet
-  Звірити відображення поля ${amount_net_field} тендера із ${amount_net} для користувача ${viewer}
-
-
-Відображення вартості угоди
-  [Tags]   ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
-  ...      viewer
-  ...      ${USERS.users['${viewer}'].broker}
-  ...      contract_view
-  ...      non-critical
-  [Setup]  Дочекатись синхронізації з майданчиком  ${viewer}
-  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
-  ${amount_field}=  Set Variable  contracts[${contract_index}].value.amount
-  Отримати дані із поля ${amount_field} тендера для користувача ${viewer}
-
-
 Можливість редагувати вартість угоди
   ${viewer_data}=  Get From Dictionary  ${USERS.users}  ${viewer}
   ${tender_owner_data}=  Get From Dictionary  ${USERS.users}  ${tender_owner}
@@ -114,7 +132,8 @@ Suite Teardown  Test Suite Teardown
   [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
   [Teardown]  Оновити LAST_MODIFICATION_DATE
   ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
-  ${amount}=  create_fake_amount  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount}=  create_fake_amount  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
   ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
   Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount=${amount}
   Run As  ${tender_owner}  Редагувати угоду
@@ -124,11 +143,45 @@ Suite Teardown  Test Suite Teardown
   ...      ${amount}
+Можливість змінити значення вартості угоду з/без ПДВ
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      modify_contract_amount_and_amountNet
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount_both_fields}=  create_fake_amount  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  amount_both_fields=${amount_both_fields}
+  Run As  ${tender_owner}  Редагувати обидва поля вартості угоди
+  ...      ${TENDER['TENDER_UAID']}
+  ...      ${contract_index}
+  ...      value.amount
+  ...      value.amountNet
+  ...      ${amount_both_fields}
+
+
+Відображення відредагованої вартості угоди без урахування ПДВ
+  [Tags]   ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
+  ...      viewer
+  ...      ${USERS.users['${viewer}'].broker}  ${USERS.users['${tender_owner}'].broker}
+  ...      contract_view_new_amountNet
+  ...      non-critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${viewer}
+  ${amount_net}=  Get Variable Value  ${USERS.users['${tender_owner}'].new_amount_net}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  ${amount_net_field}=  Set Variable  contracts[${contract_index}].value.amountNet
+  Звірити відображення поля ${amount_net_field} тендера із ${amount_net} для користувача ${viewer}
+
+
 Відображення відредагованої вартості угоди
   [Tags]   ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
   ...      viewer
   ...      ${USERS.users['${viewer}'].broker} ${USERS.users['${tender_owner}'].broker}
-  ...      modify_contract_value
+  ...      contract_view_new_amount
   ...      non-critical
   [Setup]  Дочекатись синхронізації з майданчиком  ${viewer}
   ${amount}=  Get Variable Value  ${USERS.users['${tender_owner}'].new_amount}
@@ -137,15 +190,34 @@ Suite Teardown  Test Suite Teardown
   Звірити відображення поля ${amount_field} тендера із ${amount} для користувача ${viewer}
-Неможливість вказати ціну договору без ПДВ більше ніж результат проведення аукціону (закупівля без ПДВ)
+Відображення одночасно відредагованої вартості угоди з/без ПДВ
+  [Tags]   ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
+  ...      viewer
+  ...      ${USERS.users['${viewer}'].broker}  ${USERS.users['${tender_owner}'].broker}.
+  ...      contract_view_new_amount_and_amountNet
+  ...      non-critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${viewer}
+  ${amount_both_fields}=  Get Variable Value  ${USERS.users['${tender_owner}'].amount_both_fields}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  ${amount_net_field}=  Set Variable  contracts[${contract_index}].value.amountNet
+  ${amount_field}=  Set Variable  contracts[${contract_index}].value.amount
+  Звірити відображення поля ${amount_net_field} тендера із ${amount_both_fields} для користувача ${viewer}
+  Звірити відображення поля ${amount_field} тендера із ${amount_both_fields} для користувача ${viewer}
+
+
+Неможливість вказати ціну договору без ПДВ більше ніж результат проведення аукціону
 # contract:value:amountNet should be <= award.value.amount if valueAddedTaxIncluded=false
+# lots:value:valueAddedTaxIncluded:false - contract:value:valueAddedTaxIncluded:true
+# lots:value:valueAddedTaxIncluded:true - contract:value:valueAddedTaxIncluded:false
+# lots:value:valueAddedTaxIncluded:false - contract:value:valueAddedTaxIncluded:false
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
   ...      tender_owner
   ...      ${USERS.users['${tender_owner}'].broker}
-  ...      modify_contract_amountNet_vat_false
+  ...      modify_contract_invalid_amountNet
   ...      critical
   [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
   ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
   ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
   ${amount_net}=  Evaluate  ${award.value.amount} * 2
   ${value}=  Require Failure  ${tender_owner}  Редагувати угоду
@@ -153,18 +225,27 @@ Suite Teardown  Test Suite Teardown
   ...      ${contract_index}
   ...      value.amountNet
   ...      ${amount_net}
-  Should Contain  ${value}  Value amountNet should be less or equal to awarded amount
+  Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${False}' and '${contract.value.valueAddedTaxIncluded}' == '${True}'
+  ...      Should Contain  ${value}  AmountNet should be less or equal to awarded amount
+  Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${True}' and '${contract.value.valueAddedTaxIncluded}' == '${False}'
+  ...      Should Contain  ${value}  Amount and amountNet should be equal
+  Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${False}' and '${contract.value.valueAddedTaxIncluded}' == '${False}'
+  ...      Should Contain  ${value}  Amount and amountNet should be equal
-Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону (закупівля з ПДВ)
+Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону
 # contract:value:amount should be <= award.value.amount if valueAddedTaxIncluded=ture
+# lots:value:valueAddedTaxIncluded:true - contract:value:valueAddedTaxIncluded:true
+# lots:value:valueAddedTaxIncluded:true - contract:value:valueAddedTaxIncluded:false
+# lots:value:valueAddedTaxIncluded:false - contract:value:valueAddedTaxIncluded:false
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
   ...      tender_owner
   ...      ${USERS.users['${tender_owner}'].broker}
-  ...      modify_contract_amount_vat_true
+  ...      modify_contract_invalid_amount
   ...      critical
   [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
   ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
   ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
   ${amount}=  Evaluate  ${award.value.amount} * 2
   ${value}=  Require Failure  ${tender_owner}  Редагувати угоду
@@ -172,36 +253,45 @@ Suite Teardown  Test Suite Teardown
   ...      ${contract_index}
   ...      value.amount
   ...      ${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
+  Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${True}' and '${contract.value.valueAddedTaxIncluded}' == '${True}' and '${MODE}' == 'open_esco'
+  ...      Should Contain  ${value}  Can't update amount for contract value
+  ...      ELSE
+  ...      Should Contain  ${value}  Amount should be less or equal to awarded amount
+  #Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${True}' and '${contract.value.valueAddedTaxIncluded}' == '${True}'
+  #...      Should Contain  ${value}  Amount should be less or equal to awarded amount
+  Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${True}' and '${contract.value.valueAddedTaxIncluded}' == '${False}'
+  ...      Should Contain  ${value}  Amount should be less or equal to awarded amount
+  Run Keyword IF  '${award.value.valueAddedTaxIncluded}' == '${False}' and '${contract.value.valueAddedTaxIncluded}' == '${False}'
+  ...      Should Contain  ${value}  Amount should be less or equal to awarded amount
 Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ)
-# contract:value:amountNet can be <= contract:value:amount but no more than on contract:value:amount/1.2 value if valueAddedTaxIncluded=ture
+# contract:value:amountNet can be <= contract:value:amount but no more than on contract:value:amount/1.2 if valueAddedTaxIncluded=ture
+# lots:value:valueAddedTaxIncluded:true - contract:value:valueAddedTaxIncluded:true
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
   ...      tender_owner
   ...      ${USERS.users['${tender_owner}'].broker}
-  ...      modify_contract_amountNet_vat_true
+  ...      modify_contract_invalid_amountNet_tender_vat_true
   ...      critical
   [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
   ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
   ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  ${invalid_amountNet}=  Evaluate  ${award.value.amount} / 2
   ${value}=  Require Failure  ${tender_owner}  Редагувати угоду
   ...      ${TENDER['TENDER_UAID']}
   ...      ${contract_index}
   ...      value.amountNet
-  ...      0
-  Should Contain  ${value}  for 20.0%
+  ...      ${invalid_amountNet}
+  Should Contain  ${value}  Amount should be greater than amountNet and differ by no more than 20.0%
 Неможливість збільшити ціну договору з ПДВ на суму більшу за 20% від ціни договору без ПДВ (закупівля без ПДВ)
 # contract:value:amount can be >= contract:value:amountNet  but no more than on 20% of contract:value:amountNet value if valueAddedTaxIncluded=false
+# lots:value:valueAddedTaxIncluded:false - contract:value:valueAddedTaxIncluded:true
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
   ...      tender_owner
   ...      ${USERS.users['${tender_owner}'].broker}
-  ...      modify_contract_amount_vat_false
+  ...      modify_contract_invalid_amount_tender_vat_false
   ...      critical
   [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
   ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
@@ -212,7 +302,7 @@ Suite Teardown  Test Suite Teardown
   ...      ${contract_index}
   ...      value.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%"
 Можливість встановити дату підписання угоди
--- a/op_robot_tests/tests_files/initial_data.py
View file @f642807
+++ b/op_robot_tests/tests_files/initial_data.py
View file @f642807
@@ -44,25 +44,41 @@ def get_fake_funder_scheme():
     return fake.funder_scheme()
-def create_fake_amount(award_amount, value_added_tax_included=False):
-    min_amount_net = award_amount - award_amount * 0.2
+def create_fake_amount(award_amount, tender_value_added_tax_included, contract_value_added_tax_included):
+    min_amount_net = award_amount / 1.2
     range_amount_net = award_amount - min_amount_net
     half_min_amount_net = min_amount_net + range_amount_net / 2
     half_max_amount_net = half_min_amount_net + range_amount_net
-    if value_added_tax_included:
+    if tender_value_added_tax_included == True and contract_value_added_tax_included == True:
         return round(random.uniform(half_min_amount_net, award_amount), 2)
-    else:
+    if tender_value_added_tax_included == False and contract_value_added_tax_included == True:
         return round(random.uniform(award_amount, half_max_amount_net), 2)
+    if tender_value_added_tax_included == True and contract_value_added_tax_included == False:
+        return round(random.uniform(half_min_amount_net, award_amount), 2)
+    if tender_value_added_tax_included == False and contract_value_added_tax_included == False:
+        return round(random.uniform(half_min_amount_net, award_amount), 2)
-def create_fake_amount_net(award_amount, value_added_tax_included=False):
+def create_fake_amount_net(award_amount, tender_value_added_tax_included, contract_value_added_tax_included):
     min_amount_net = award_amount / 1.2
     range_amount_net = award_amount - min_amount_net
     half_min_amount_net = min_amount_net + range_amount_net / 2
-    if value_added_tax_included:
+    if tender_value_added_tax_included == True and contract_value_added_tax_included == True:
         return round(random.uniform(min_amount_net, half_min_amount_net), 2)
-    else:
+    if tender_value_added_tax_included == False and contract_value_added_tax_included == True:
         return round(random.uniform(half_min_amount_net, award_amount), 2)
+    if tender_value_added_tax_included == True and contract_value_added_tax_included == False:
+        return round(random.uniform(half_min_amount_net, award_amount), 2)
+    if tender_value_added_tax_included == False and contract_value_added_tax_included == False:
+        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):
--- a/op_robot_tests/tests_files/negotiation.quick.robot
View file @f642807
+++ b/op_robot_tests/tests_files/negotiation.quick.robot
View file @f642807
@@ -669,6 +669,48 @@ ${VAT_INCLUDED}     ${True}
   Звірити відображення поля contracts[0].status тендера із pending для користувача ${viewer}
+Можливість редагувати вартість угоди без урахування ПДВ
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      modify_contract_amount_net
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount_net}=  create_fake_amount_net  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount_net=${amount_net}
+  Run As  ${tender_owner}  Редагувати угоду
+  ...      ${TENDER['TENDER_UAID']}
+  ...      ${contract_index}
+  ...      value.amountNet
+  ...      ${amount_net}
+
+
+Можливість редагувати вартість угоди
+  ${viewer_data}=  Get From Dictionary  ${USERS.users}  ${viewer}
+  ${tender_owner_data}=  Get From Dictionary  ${USERS.users}  ${tender_owner}
+  [Tags]   ${tender_owner_data.broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${tender_owner_data.broker}
+  ...      modify_contract_value
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount}=  create_fake_amount  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount=${amount}
+  Run As  ${tender_owner}  Редагувати угоду
+  ...      ${TENDER['TENDER_UAID']}
+  ...      ${contract_index}
+  ...      value.amount
+  ...      ${amount}
+
+
 Можливість укласти угоду для переговорної процедури за нагальною потребою
   [Tags]  ${USERS.users['${tender_owner}'].broker}: Можливість укласти угоду для процедури
   ...  ${tender_owner}
--- a/op_robot_tests/tests_files/negotiation.robot
View file @f642807
+++ b/op_robot_tests/tests_files/negotiation.robot
View file @f642807
@@ -742,6 +742,48 @@ ${VAT_INCLUDED}     ${True}
   \  Отримати дані із тендера  ${username}  ${TENDER['TENDER_UAID']}  awards[0].complaintPeriod.endDate
+Можливість редагувати вартість угоди без урахування ПДВ
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      modify_contract_amount_net
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount_net}=  create_fake_amount_net  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount_net=${amount_net}
+  Run As  ${tender_owner}  Редагувати угоду
+  ...      ${TENDER['TENDER_UAID']}
+  ...      ${contract_index}
+  ...      value.amountNet
+  ...      ${amount_net}
+
+
+Можливість редагувати вартість угоди
+  ${viewer_data}=  Get From Dictionary  ${USERS.users}  ${viewer}
+  ${tender_owner_data}=  Get From Dictionary  ${USERS.users}  ${tender_owner}
+  [Tags]   ${tender_owner_data.broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${tender_owner_data.broker}
+  ...      modify_contract_value
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount}=  create_fake_amount  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount=${amount}
+  Run As  ${tender_owner}  Редагувати угоду
+  ...      ${TENDER['TENDER_UAID']}
+  ...      ${contract_index}
+  ...      value.amount
+  ...      ${amount}
+
+
 Можливість укласти угоду для переговорної процедури
   [Tags]  ${USERS.users['${tender_owner}'].broker}: Можливість укласти угоду для процедури
   ...  ${tender_owner}
--- a/op_robot_tests/tests_files/qualification.robot
View file @f642807
+++ b/op_robot_tests/tests_files/qualification.robot
View file @f642807
@@ -238,6 +238,7 @@ ${award_index}      ${0}
   ...  ${USERS.users['${tender_owner}'].broker}
   ...  qualification_approve_first_award
   ...  critical
+  [Setup]  Дочекатись дати початку періоду кваліфікації  ${tender_owner}  ${TENDER['TENDER_UAID']}
   Run As  ${tender_owner}  Підтвердити постачальника  ${TENDER['TENDER_UAID']}  0
--- a/op_robot_tests/tests_files/reporting.robot
View file @f642807
+++ b/op_robot_tests/tests_files/reporting.robot
View file @f642807
@@ -55,6 +55,48 @@ ${VAT_INCLUDED}     ${True}
   Можливість зареєструвати, додати документацію і підтвердити першого постачальника до закупівлі
+Можливість редагувати вартість угоди без урахування ПДВ
+  [Tags]   ${USERS.users['${tender_owner}'].broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${USERS.users['${tender_owner}'].broker}
+  ...      modify_contract_amount_net
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount_net}=  create_fake_amount_net  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount_net=${amount_net}
+  Run As  ${tender_owner}  Редагувати угоду
+  ...      ${TENDER['TENDER_UAID']}
+  ...      ${contract_index}
+  ...      value.amountNet
+  ...      ${amount_net}
+
+
+Можливість редагувати вартість угоди
+  ${viewer_data}=  Get From Dictionary  ${USERS.users}  ${viewer}
+  ${tender_owner_data}=  Get From Dictionary  ${USERS.users}  ${tender_owner}
+  [Tags]   ${tender_owner_data.broker}: Редагування угоди
+  ...      tender_owner
+  ...      ${tender_owner_data.broker}
+  ...      modify_contract_value
+  ...      critical
+  [Setup]  Дочекатись синхронізації з майданчиком  ${tender_owner}
+  [Teardown]  Оновити LAST_MODIFICATION_DATE
+  ${award}=  Отримати останній элемент  awards  ${tender_owner}  ${viewer}
+  ${contract}=  Отримати останній элемент  contracts  ${tender_owner}  ${viewer}
+  ${amount}=  create_fake_amount  ${award.value.amount}  ${award.value.valueAddedTaxIncluded}  ${contract.value.valueAddedTaxIncluded}
+  ${contract_index}=  Отримати останній індекс  contracts  ${tender_owner}  ${viewer}
+  Set to dictionary  ${USERS.users['${tender_owner}']}  new_amount=${amount}
+  Run As  ${tender_owner}  Редагувати угоду
+  ...      ${TENDER['TENDER_UAID']}
+  ...      ${contract_index}
+  ...      value.amount
+  ...      ${amount}
+
+
 Можливість укласти угоду для звіту про укладений договір
   [Tags]  ${USERS.users['${tender_owner}'].broker}: Можливість укласти угоду для процедури
   ...  ${tender_owner}
--- a/op_robot_tests/tests_files/service_keywords.py
View file @f642807
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @f642807
@@ -21,6 +21,7 @@ from .initial_data import (
     create_fake_sentence,
     create_fake_amount,
     create_fake_amount_net,
+    create_fake_amount_paid,
     create_fake_number,
     create_fake_number_float,
     create_fake_date,
--- a/robot_tests_arguments/below.txt
View file @f642807
+++ b/robot_tests_arguments/below.txt
View file @f642807
@@ -74,15 +74,21 @@
 -i qualification_add_doc_to_second_award
 -i qualification_approve_second_award
+-i contract_stand_still
 -i contract_view
--i modify_contract_amount_vat_true
--i modify_contract_amountNet_vat_true
+
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+
+-i modify_contract_amount_net
+-i modify_contract_value
+
 -i modify_contract
-  -i modify_contract_value
+
 -i add_doc_to_contract
-  -i contract_doc_documentOf
+-i contract_doc_documentOf
+
 -i contract_sign
--i contract_stand_still
 -i find_contract
 -i access_contract
@@ -90,8 +96,11 @@
 -i view_change
 -i upload_change_document
 -i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
 -i apply_change
 -i add_contract_doc
 -i termination_reasons
 -i amount_paid
+-i change_amount_paid
 -i contract_termination
--- a/robot_tests_arguments/below_after_resolved_award_complaint.txt
View file @f642807
+++ b/robot_tests_arguments/below_after_resolved_award_complaint.txt
View file @f642807
@@ -11,4 +11,6 @@
 -i qualification_approve_first_award
 -i award_complaint
+-i modify_contract_amount_net
+-i modify_contract_value
 -i below_award_complaint
--- a/robot_tests_arguments/below_funders_full.txt
View file @f642807
+++ b/robot_tests_arguments/below_funders_full.txt
View file @f642807
@@ -43,5 +43,28 @@
 -i qualification_add_doc_to_second_award
 -i qualification_approve_second_award
+-i contract_stand_still
+-i contract_view
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
+-i modify_contract
+-i add_doc_to_contract
+-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 change_contract_amountNet
+-i change_contract_amount
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
--- a/robot_tests_arguments/below_simple.txt
View file @f642807
+++ b/robot_tests_arguments/below_simple.txt
View file @f642807
@@ -32,4 +32,23 @@
 -i qualification_approve_first_award
 -i contract_sign
--i contract_stand_still
+-i contract_stand_still
+
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-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
--- a/robot_tests_arguments/below_vat_false_false.txt 0 → 100644
View file @f642807
+++ b/robot_tests_arguments/below_vat_false_false.txt 0 → 100644
View file @f642807
+-v MODE:belowThreshold
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+
+-v TENDER_MEAT:True
+-v ITEM_MEAT:True
+-v LOT_MEAT:True
+
+-v VAT_INCLUDED: False
+
+-i create_tender
+-i find_tender
+-i tender_view
+
+-i make_bid_by_provider
+-i make_bid_by_provider1
+
+-i qualification_approve_first_award
+
+-i contract_stand_still
+-i contract_view
+
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet
+
+-i modify_contract_amount_and_amountNet
+
+-i contract_view_new_amount_and_amountNet
+
+-i modify_contract
+
+-i add_doc_to_contract
+-i contract_doc_documentOf
+
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amount_and_amountNet
+-i modify_contract_view_new_amount_amountNet
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_and_amountNet_paid
+-i contract_termination
--- a/robot_tests_arguments/below_vat_false_true.txt 0 → 100644
View file @f642807
+++ b/robot_tests_arguments/below_vat_false_true.txt 0 → 100644
View file @f642807
+-v MODE:belowThreshold
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+
+-v TENDER_MEAT:True
+-v ITEM_MEAT:True
+-v LOT_MEAT:True
+
+-v VAT_INCLUDED: False
+
+-i create_tender
+-i find_tender
+-i tender_view
+
+-i make_bid_by_provider
+-i make_bid_by_provider1
+
+-i qualification_approve_first_award
+
+-i contract_stand_still
+-i contract_view
+
+-i modify_contract_vat_to_true
+
+-i modify_contract_amount_net
+-i modify_contract_value
+
+-i modify_contract_invalid_amountNet
+-i modify_contract_invalid_amount_tender_vat_false
+
+-i modify_contract
+
+-i add_doc_to_contract
+-i contract_doc_documentOf
+
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
--- a/robot_tests_arguments/below_vat_true_false.txt 0 → 100644
View file @f642807
+++ b/robot_tests_arguments/below_vat_true_false.txt 0 → 100644
View file @f642807
+-v MODE:belowThreshold
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+
+-v TENDER_MEAT:True
+-v ITEM_MEAT:True
+-v LOT_MEAT:True
+
+
+-i create_tender
+-i find_tender
+-i tender_view
+
+-i make_bid_by_provider
+-i make_bid_by_provider1
+
+-i qualification_approve_first_award
+
+-i contract_stand_still
+-i contract_view
+
+-i modify_contract_vat_to_false
+
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet
+
+-i modify_contract_amount_and_amountNet
+
+-i modify_contract
+
+-i add_doc_to_contract
+-i contract_doc_documentOf
+
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amount_and_amountNet
+-i modify_contract_view_new_amount_amountNet
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_and_amountNet_paid
+-i contract_termination
+
+
--- a/robot_tests_arguments/below_vat_true_true.txt 0 → 100644
View file @f642807
+++ b/robot_tests_arguments/below_vat_true_true.txt 0 → 100644
View file @f642807
+-v MODE:belowThreshold
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+
+-v TENDER_MEAT:True
+-v ITEM_MEAT:True
+-v LOT_MEAT:True
+
+
+-i create_tender
+-i find_tender
+-i tender_view
+
+-i make_bid_by_provider
+-i make_bid_by_provider1
+
+-i qualification_approve_first_award
+
+-i contract_stand_still
+-i contract_view
+
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+
+-i modify_contract_amount_net
+-i modify_contract_value
+
+-i modify_contract
+
+-i add_doc_to_contract
+-i contract_doc_documentOf
+
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
+
+
--- a/robot_tests_arguments/competitive_dialogue_UA.txt
View file @f642807
+++ b/robot_tests_arguments/competitive_dialogue_UA.txt
View file @f642807
@@ -62,10 +62,28 @@
 -i qualification_add_doc_to_second_award
 -i qualification_approve_second_award
--i contract_sign
 -i contract_stand_still
 -i contract_view
--i modify_contract_amount_vat_true
--i modify_contract_amountNet_vat_true
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
 -i modify_contract
-  -i modify_contract_value
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
--- a/robot_tests_arguments/competitive_dialogue_simple.txt
View file @f642807
+++ b/robot_tests_arguments/competitive_dialogue_simple.txt
View file @f642807
@@ -62,4 +62,23 @@
 -i qualification_approve_first_award
 -i contract_sign
--i contract_stand_still
+-i contract_stand_still
+
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-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
--- a/robot_tests_arguments/competitive_dialogue_simple_UA.txt 0 → 100644
View file @f642807
+++ b/robot_tests_arguments/competitive_dialogue_simple_UA.txt 0 → 100644
View file @f642807
+-v MODE:open_competitive_dialogue
+
+-v DIALOGUE_TYPE:UA
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:False
+-v ITEM_MEAT:False
+-v LOT_MEAT:False
+
+
+-i create_tender
+-i find_tender
+-i tender_view
+-i tender_view_milestone
+-i tender_view_value
+-i tender_view_minimalStep
+-i tender_view_deliveryDate
+-i tender_view_quantity
+-i tender_view_unit_name
+-i tender_view_unit_code
+-i tender_view_coordinates
+-i lot_view
+-i lot_view_value
+-i lot_view_minimalStep
+
+-i make_bid_by_provider
+-i make_bid_by_provider1
+-i make_bid_by_provider2
+
+-i open_tender_view
+
+#-i pre-qualifications_check_by_edrpou
+
+-i pre-qualification_approve_first_bid
+-i pre-qualification_approve_second_bid
+-i pre-qualification_approve_third_bid
+
+-i pre-qualification_approve_qualifications
+
+-i stage2_pending_status_view
+
+-i wait_bridge_for_work
+
+-i get_second_stage
+
+-i compare_stages
+
+-i save_tender_second_stage
+
+-i activate_second_stage
+
+-i make_bid_by_provider_second_stage
+-i make_bid_by_provider1_second_stage
+
+-i auction
+
+-i qualification_approve_first_award
+
+-i contract_sign
+-i contract_stand_still
+
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-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
--- a/robot_tests_arguments/esco_testing.txt
View file @f642807
+++ b/robot_tests_arguments/esco_testing.txt
View file @f642807
@@ -76,10 +76,12 @@
 -i qualification_approve_third_award
--i contract_view
 -i contract_stand_still
--i modify_contract_amount_vat_true
--i modify_contract_amountNet_vat_true
+-i contract_view
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
 -i modify_contract
 -i add_doc_to_contract
+-i contract_doc_documentOf
 -i contract_sign
--- a/robot_tests_arguments/framework_selection.txt
View file @f642807
+++ b/robot_tests_arguments/framework_selection.txt
View file @f642807
@@ -47,9 +47,12 @@
 -i qualification_add_doc_to_second_award
 -i qualification_approve_second_award
+
 -i contract_view
--i modify_contract_amount_vat_true
--i modify_contract_amountNet_vat_true
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
 -i modify_contract
 -i add_doc_to_contract
 -i contract_sign
@@ -60,8 +63,11 @@
 -i view_change
 -i upload_change_document
 -i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
 -i apply_change
 -i add_contract_doc
 -i termination_reasons
 -i amount_paid
+-i change_amount_paid
 -i contract_termination
--- a/robot_tests_arguments/mnn_1.txt
View file @f642807
+++ b/robot_tests_arguments/mnn_1.txt
View file @f642807
@@ -80,15 +80,16 @@
 -i qualification_add_doc_to_second_award
 -i qualification_approve_second_award
+-i contract_stand_still
 -i contract_view
--i modify_contract_amount_vat_true
--i modify_contract_amountNet_vat_true
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
 -i modify_contract
-  -i modify_contract_value
 -i add_doc_to_contract
-  -i contract_doc_documentOf
+-i contract_doc_documentOf
 -i contract_sign
--i contract_stand_still
 -i find_contract
 -i access_contract
@@ -96,10 +97,13 @@
 -i view_change
 -i upload_change_document
 -i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
 -i apply_change
 -i add_contract_doc
 -i termination_reasons
 -i amount_paid
+-i change_amount_paid
 -i contract_termination
--- a/robot_tests_arguments/mnn_2.txt
View file @f642807
+++ b/robot_tests_arguments/mnn_2.txt
View file @f642807
@@ -80,15 +80,16 @@
 -i qualification_add_doc_to_second_award
 -i qualification_approve_second_award
+-i contract_stand_still
 -i contract_view
--i modify_contract_amount_vat_true
--i modify_contract_amountNet_vat_true
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
 -i modify_contract
-  -i modify_contract_value
 -i add_doc_to_contract
-  -i contract_doc_documentOf
+-i contract_doc_documentOf
 -i contract_sign
--i contract_stand_still
 -i find_contract
 -i access_contract
@@ -96,8 +97,11 @@
 -i view_change
 -i upload_change_document
 -i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
 -i apply_change
 -i add_contract_doc
 -i termination_reasons
 -i amount_paid
+-i change_amount_paid
 -i contract_termination
--- a/robot_tests_arguments/mnn_3.txt
View file @f642807
+++ b/robot_tests_arguments/mnn_3.txt
View file @f642807
@@ -74,15 +74,16 @@
 -i qualification_add_doc_to_second_award
 -i qualification_approve_second_award
+-i contract_stand_still
 -i contract_view
--i modify_contract_amount_vat_true
--i modify_contract_amountNet_vat_true
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
 -i modify_contract
-  -i modify_contract_value
 -i add_doc_to_contract
-  -i contract_doc_documentOf
+-i contract_doc_documentOf
 -i contract_sign
--i contract_stand_still
 -i find_contract
 -i access_contract
@@ -90,8 +91,11 @@
 -i view_change
 -i upload_change_document
 -i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
 -i apply_change
 -i add_contract_doc
 -i termination_reasons
 -i amount_paid
+-i change_amount_paid
 -i contract_termination
--- a/robot_tests_arguments/openUAdefense_one_bid.txt
View file @f642807
+++ b/robot_tests_arguments/openUAdefense_one_bid.txt
View file @f642807
@@ -64,10 +64,28 @@
 -i qualification_add_doc_to_first_award
 -i qualification_approve_first_award
--i contract_sign
 -i contract_stand_still
--i modify_contract_amount_vat_true
--i modify_contract_amountNet_vat_true
+-i contract_view
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
 -i modify_contract
-  -i modify_contract_value
--i contract_view
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-i find_contract
+-i access_contract
+-i submit_change
+-i view_change
+-i upload_change_document
+-i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
+-i apply_change
+-i add_contract_doc
+-i termination_reasons
+-i amount_paid
+-i change_amount_paid
+-i contract_termination
--- a/robot_tests_arguments/openeu.txt
View file @f642807
+++ b/robot_tests_arguments/openeu.txt
View file @f642807
@@ -103,15 +103,16 @@
 -i qualification_add_doc_to_second_award
 -i qualification_approve_second_award
+-i contract_stand_still
 -i contract_view
--i modify_contract_amount_vat_true
--i modify_contract_amountNet_vat_true
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
 -i modify_contract
-  -i modify_contract_value
 -i add_doc_to_contract
-  -i contract_doc_documentOf
+-i contract_doc_documentOf
 -i contract_sign
--i contract_stand_still
 -i find_contract
 -i access_contract
@@ -119,8 +120,11 @@
 -i view_change
 -i upload_change_document
 -i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
 -i apply_change
 -i add_contract_doc
 -i termination_reasons
 -i amount_paid
+-i change_amount_paid
 -i contract_termination
--- a/robot_tests_arguments/openeu_simple.txt
View file @f642807
+++ b/robot_tests_arguments/openeu_simple.txt
View file @f642807
@@ -40,4 +40,23 @@
 -i qualification_approve_first_award
 -i contract_sign
--i contract_stand_still
+-i contract_stand_still
+
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-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
--- a/robot_tests_arguments/openua.txt
View file @f642807
+++ b/robot_tests_arguments/openua.txt
View file @f642807
@@ -79,15 +79,16 @@
 -i qualification_add_doc_to_second_award
 -i qualification_approve_second_award
+-i contract_stand_still
 -i contract_view
--i modify_contract_amount_vat_true
--i modify_contract_amountNet_vat_true
+-i modify_contract_invalid_amount
+-i modify_contract_invalid_amountNet_tender_vat_true
+-i modify_contract_amount_net
+-i modify_contract_value
 -i modify_contract
-  -i modify_contract_value
 -i add_doc_to_contract
-  -i contract_doc_documentOf
+-i contract_doc_documentOf
 -i contract_sign
--i contract_stand_still
 -i find_contract
 -i access_contract
@@ -95,8 +96,11 @@
 -i view_change
 -i upload_change_document
 -i modify_change
+-i change_contract_amountNet
+-i change_contract_amount
 -i apply_change
 -i add_contract_doc
 -i termination_reasons
 -i amount_paid
+-i change_amount_paid
 -i contract_termination
--- a/robot_tests_arguments/openua_simple.txt
View file @f642807
+++ b/robot_tests_arguments/openua_simple.txt
View file @f642807
@@ -32,4 +32,23 @@
 -i qualification_approve_first_award
 -i contract_sign
--i contract_stand_still
+-i contract_stand_still
+
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
+
+-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
--- a/robot_tests_arguments/single_item_tender.txt
View file @f642807
+++ b/robot_tests_arguments/single_item_tender.txt
View file @f642807
@@ -48,3 +48,5 @@
 -i contract_sign
 -i contract_stand_still
+-i modify_contract_amount_net
+-i modify_contract_value