Showing
17 changed files
with
597 additions
and
92 deletions
@@ -835,8 +835,9 @@ Resource resource.robot | @@ -835,8 +835,9 @@ Resource resource.robot | ||
835 | 835 | ||
836 | Вказати дійсно оплачену суму | 836 | Вказати дійсно оплачену суму |
837 | ${amount}= Get variable value ${USERS.users['${tender_owner}'].contract_data.data.value.amount} | 837 | ${amount}= Get variable value ${USERS.users['${tender_owner}'].contract_data.data.value.amount} |
838 | + ${amount_net}= Get variable value ${USERS.users['${tender_owner}'].contract_data.data.value.amountNet} | ||
838 | ${valueAddedTaxIncluded}= Get variable value ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded} | 839 | ${valueAddedTaxIncluded}= Get variable value ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded} |
839 | - ${amountPaid}= Create Dictionary amount=${amount} valueAddedTaxIncluded=${valueAddedTaxIncluded} currency=UAH | 840 | + ${amountPaid}= Create Dictionary amount=${amount} amountNet=${amount_net} valueAddedTaxIncluded=${valueAddedTaxIncluded} currency=UAH |
840 | ${data}= Create Dictionary amountPaid=${amountPaid} | 841 | ${data}= Create Dictionary amountPaid=${amountPaid} |
841 | ${data}= Create Dictionary data=${data} | 842 | ${data}= Create Dictionary data=${data} |
842 | Set to dictionary ${USERS.users['${tender_owner}']} terminating_data=${data} | 843 | Set to dictionary ${USERS.users['${tender_owner}']} terminating_data=${data} |
@@ -1794,6 +1794,34 @@ Library openprocurement_client.utils | @@ -1794,6 +1794,34 @@ Library openprocurement_client.utils | ||
1794 | Log ${reply} | 1794 | Log ${reply} |
1795 | 1795 | ||
1796 | 1796 | ||
1797 | +Редагувати обидва поля вартості угоди | ||
1798 | + [Arguments] ${username} ${tender_uaid} ${contract_index} ${field_amount} ${field_amountNet} ${fieldvalue} | ||
1799 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | ||
1800 | + ${contract}= Create Dictionary data=${tender.data.contracts[${contract_index}]} | ||
1801 | + Set_to_object ${contract.data} ${field_amount} ${fieldvalue} | ||
1802 | + Set_to_object ${contract.data} ${field_amountNet} ${fieldvalue} | ||
1803 | + ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract | ||
1804 | + ... ${tender.data.id} | ||
1805 | + ... ${contract} | ||
1806 | + ... ${contract.data.id} | ||
1807 | + ... access_token=${tender.access.token} | ||
1808 | + Log ${reply} | ||
1809 | + | ||
1810 | + | ||
1811 | +Змінити ознаку ПДВ на True | ||
1812 | + [Arguments] ${username} ${tender_uaid} ${contract_index} ${vat_fieldvalue} ${field_amount} | ||
1813 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | ||
1814 | + ${contract}= Create Dictionary data=${tender.data.contracts[${contract_index}]} | ||
1815 | + Set To Dictionary ${contract.data.value} valueAddedTaxIncluded=${vat_fieldvalue} | ||
1816 | + Set To Dictionary ${contract.data.value} amountNet=${field_amount} | ||
1817 | + ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract | ||
1818 | + ... ${tender.data.id} | ||
1819 | + ... ${contract} | ||
1820 | + ... ${contract.data.id} | ||
1821 | + ... access_token=${tender.access.token} | ||
1822 | + Log ${reply} | ||
1823 | + | ||
1824 | + | ||
1797 | Встановити ціну за одиницю для контракту | 1825 | Встановити ціну за одиницю для контракту |
1798 | [Arguments] ${username} ${tender_uaid} ${contract_data} | 1826 | [Arguments] ${username} ${tender_uaid} ${contract_data} |
1799 | ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | 1827 | ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} |
@@ -1829,6 +1857,19 @@ Library openprocurement_client.utils | @@ -1829,6 +1857,19 @@ Library openprocurement_client.utils | ||
1829 | Log ${reply} | 1857 | Log ${reply} |
1830 | 1858 | ||
1831 | 1859 | ||
1860 | +Змінити ознаку ПДВ | ||
1861 | + [Arguments] ${username} ${tender_uaid} ${contract_index} ${fieldvalue} | ||
1862 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | ||
1863 | + ${contract}= Create Dictionary data=${tender.data.contracts[${contract_index}]} | ||
1864 | + Set To Dictionary ${contract.data.value} valueAddedTaxIncluded=${fieldvalue} | ||
1865 | + ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract | ||
1866 | + ... ${tender.data.id} | ||
1867 | + ... ${contract} | ||
1868 | + ... ${contract.data.id} | ||
1869 | + ... access_token=${tender.access.token} | ||
1870 | + Log ${reply} | ||
1871 | + | ||
1872 | + | ||
1832 | Встановити дату підписання угоди | 1873 | Встановити дату підписання угоди |
1833 | [Arguments] ${username} ${tender_uaid} ${contract_index} ${fieldvalue} | 1874 | [Arguments] ${username} ${tender_uaid} ${contract_index} ${fieldvalue} |
1834 | ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | 1875 | ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} |
@@ -1986,6 +2027,17 @@ Library openprocurement_client.utils | @@ -1986,6 +2027,17 @@ Library openprocurement_client.utils | ||
1986 | Log ${contract} | 2027 | Log ${contract} |
1987 | 2028 | ||
1988 | 2029 | ||
2030 | +Одночасно Редагувати два поля договору | ||
2031 | + [Arguments] ${username} ${contract_uaid} ${first_fieldname} ${first_fieldvalue} ${second_fieldname} ${second_fieldvalue} | ||
2032 | + ${internalid}= openprocurement_client.Отримати internal id по UAid для договору ${username} ${contract_uaid} | ||
2033 | + ${contract}= openprocurement_client.Пошук договору по ідентифікатору ${username} ${contract_uaid} | ||
2034 | + Set_To_Object ${contract.data} ${first_fieldname} ${first_fieldvalue} | ||
2035 | + Set_To_Object ${contract.data} ${second_fieldname} ${second_fieldvalue} | ||
2036 | + Log ${contract} | ||
2037 | + ${contract}= Call Method ${USERS.users['${username}'].contracting_client} patch_contract ${internalid} ${USERS.users['${username}'].contract_access_token} ${contract} | ||
2038 | + Log ${contract} | ||
2039 | + | ||
2040 | + | ||
1989 | Редагувати зміну | 2041 | Редагувати зміну |
1990 | [Arguments] ${username} ${contract_uaid} ${fieldname} ${fieldvalue} | 2042 | [Arguments] ${username} ${contract_uaid} ${fieldname} ${fieldvalue} |
1991 | ${internalid}= openprocurement_client.Отримати internal id по UAid для договору ${username} ${contract_uaid} | 2043 | ${internalid}= openprocurement_client.Отримати internal id по UAid для договору ${username} ${contract_uaid} |
@@ -17,7 +17,8 @@ Suite Teardown Test Suite Teardown | @@ -17,7 +17,8 @@ Suite Teardown Test Suite Teardown | ||
17 | Завантажити дані про тендер | 17 | Завантажити дані про тендер |
18 | :FOR ${username} in @{used_roles} | 18 | :FOR ${username} in @{used_roles} |
19 | \ Run As ${${username}} Пошук тендера по ідентифікатору ${TENDER['TENDER_UAID']} | 19 | \ Run As ${${username}} Пошук тендера по ідентифікатору ${TENDER['TENDER_UAID']} |
20 | - ${CONTRACT_UAID}= Get variable value ${USERS.users['${tender_owner}'].tender_data.data.contracts[1].contractID} | 20 | + ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} |
21 | + ${CONTRACT_UAID}= Get variable value ${USERS.users['${tender_owner}'].tender_data.data.contracts[${contract_index}].contractID} | ||
21 | Set Suite Variable ${CONTRACT_UAID} | 22 | Set Suite Variable ${CONTRACT_UAID} |
22 | 23 | ||
23 | 24 | ||
@@ -165,9 +166,13 @@ Suite Teardown Test Suite Teardown | @@ -165,9 +166,13 @@ Suite Teardown Test Suite Teardown | ||
165 | [Tags] ${USERS.users['${tender_owner}']}: Редагування договору | 166 | [Tags] ${USERS.users['${tender_owner}']}: Редагування договору |
166 | ... tender_owner | 167 | ... tender_owner |
167 | ... ${USERS.users['${tender_owner}']} | 168 | ... ${USERS.users['${tender_owner}']} |
168 | - ... modify_contract | 169 | + ... change_contract_amountNet |
169 | [Teardown] Оновити LAST_MODIFICATION_DATE | 170 | [Teardown] Оновити LAST_MODIFICATION_DATE |
170 | - ${amount_net}= create_fake_amount_net ${USERS.users['${tender_owner}'].contract_data.data.value.amount} | 171 | + ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} |
172 | + ${amount_net}= create_fake_amount_net | ||
173 | + ... ${USERS.users['${tender_owner}'].contract_data.data.value.amount} | ||
174 | + ... ${award.value.valueAddedTaxIncluded} | ||
175 | + ... ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded} | ||
171 | Set to dictionary ${USERS.users['${tender_owner}']} new_amount_net=${amount_net} | 176 | Set to dictionary ${USERS.users['${tender_owner}']} new_amount_net=${amount_net} |
172 | Run As ${tender_owner} Редагувати поле договору ${CONTRACT_UAID} value.amountNet ${amount_net} | 177 | Run As ${tender_owner} Редагувати поле договору ${CONTRACT_UAID} value.amountNet ${amount_net} |
173 | 178 | ||
@@ -176,13 +181,33 @@ Suite Teardown Test Suite Teardown | @@ -176,13 +181,33 @@ Suite Teardown Test Suite Teardown | ||
176 | [Tags] ${USERS.users['${tender_owner}']}: Редагування договору | 181 | [Tags] ${USERS.users['${tender_owner}']}: Редагування договору |
177 | ... tender_owner | 182 | ... tender_owner |
178 | ... ${USERS.users['${tender_owner}']} | 183 | ... ${USERS.users['${tender_owner}']} |
179 | - ... modify_contract | 184 | + ... change_contract_amount |
180 | [Teardown] Оновити LAST_MODIFICATION_DATE | 185 | [Teardown] Оновити LAST_MODIFICATION_DATE |
181 | - ${amount}= create_fake_amount ${USERS.users['${tender_owner}'].contract_data.data.value.amount} | 186 | + ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} |
187 | + ${amount}= create_fake_amount | ||
188 | + ... ${USERS.users['${tender_owner}'].contract_data.data.value.amount} | ||
189 | + ... ${award.value.valueAddedTaxIncluded} | ||
190 | + ... ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded} | ||
182 | Set to dictionary ${USERS.users['${tender_owner}']} new_amount=${amount} | 191 | Set to dictionary ${USERS.users['${tender_owner}']} new_amount=${amount} |
183 | Run As ${tender_owner} Редагувати поле договору ${CONTRACT_UAID} value.amount ${amount} | 192 | Run As ${tender_owner} Редагувати поле договору ${CONTRACT_UAID} value.amount ${amount} |
184 | 193 | ||
185 | 194 | ||
195 | +Можливість одночасно редагувати вартість договору з/без ПДВ | ||
196 | + [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди | ||
197 | + ... tender_owner | ||
198 | + ... ${USERS.users['${tender_owner}'].broker} | ||
199 | + ... change_contract_amount_and_amountNet | ||
200 | + ... critical | ||
201 | + [Teardown] Оновити LAST_MODIFICATION_DATE | ||
202 | + ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} | ||
203 | + ${amount_both_fields}= create_fake_amount | ||
204 | + ... ${USERS.users['${tender_owner}'].contract_data.data.value.amount} | ||
205 | + ... ${award.value.valueAddedTaxIncluded} | ||
206 | + ... ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded} | ||
207 | + Set to dictionary ${USERS.users['${tender_owner}']} amount=${amount_both_fields} | ||
208 | + Run As ${tender_owner} Одночасно Редагувати два поля договору ${CONTRACT_UAID} value.amount ${amount_both_fields} value.amountNet ${amount_both_fields} | ||
209 | + | ||
210 | + | ||
186 | Можливість редагувати дату завершення дії договору | 211 | Можливість редагувати дату завершення дії договору |
187 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування договору | 212 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування договору |
188 | ... tender_owner | 213 | ... tender_owner |
@@ -260,7 +285,7 @@ Suite Teardown Test Suite Teardown | @@ -260,7 +285,7 @@ Suite Teardown Test Suite Teardown | ||
260 | [Tags] ${USERS.users['${tender_owner}']}: Редагування договору | 285 | [Tags] ${USERS.users['${tender_owner}']}: Редагування договору |
261 | ... viewer | 286 | ... viewer |
262 | ... ${USERS.users['${tender_owner}']} | 287 | ... ${USERS.users['${tender_owner}']} |
263 | - ... modify_contract | 288 | + ... modify_contract_view_new_amountNet |
264 | Звірити поле договору із значенням | 289 | Звірити поле договору із значенням |
265 | ... ${viewer} | 290 | ... ${viewer} |
266 | ... ${CONTRACT_UAID} | 291 | ... ${CONTRACT_UAID} |
@@ -272,7 +297,7 @@ Suite Teardown Test Suite Teardown | @@ -272,7 +297,7 @@ Suite Teardown Test Suite Teardown | ||
272 | [Tags] ${USERS.users['${tender_owner}']}: Редагування договору | 297 | [Tags] ${USERS.users['${tender_owner}']}: Редагування договору |
273 | ... viewer | 298 | ... viewer |
274 | ... ${USERS.users['${tender_owner}']} | 299 | ... ${USERS.users['${tender_owner}']} |
275 | - ... modify_contract | 300 | + ... modify_contract_view_new_amountNet |
276 | Звірити поле договору із значенням | 301 | Звірити поле договору із значенням |
277 | ... ${viewer} | 302 | ... ${viewer} |
278 | ... ${CONTRACT_UAID} | 303 | ... ${CONTRACT_UAID} |
@@ -280,6 +305,24 @@ Suite Teardown Test Suite Teardown | @@ -280,6 +305,24 @@ Suite Teardown Test Suite Teardown | ||
280 | ... value.amount | 305 | ... value.amount |
281 | 306 | ||
282 | 307 | ||
308 | +Відображення одночасно відредагованої вартості договору з/без ПДВ | ||
309 | + [Tags] ${USERS.users['${tender_owner}']}: Редагування договору | ||
310 | + ... viewer | ||
311 | + ... ${USERS.users['${tender_owner}']} | ||
312 | + ... modify_contract_view_new_amount_amountNet | ||
313 | + Звірити поле договору із значенням | ||
314 | + ... ${viewer} | ||
315 | + ... ${CONTRACT_UAID} | ||
316 | + ... ${USERS.users['${tender_owner}'].amount} | ||
317 | + ... value.amount | ||
318 | + Звірити поле договору із значенням | ||
319 | + ... ${viewer} | ||
320 | + ... ${CONTRACT_UAID} | ||
321 | + ... ${USERS.users['${tender_owner}'].amount} | ||
322 | + ... value.amountNet | ||
323 | + | ||
324 | + | ||
325 | + | ||
283 | Відображення відредагованої дати початку дії договору | 326 | Відображення відредагованої дати початку дії договору |
284 | [Tags] ${USERS.users['${viewer}'].broker}: Редагування договору | 327 | [Tags] ${USERS.users['${viewer}'].broker}: Редагування договору |
285 | ... viewer | 328 | ... viewer |
@@ -416,13 +459,32 @@ Suite Teardown Test Suite Teardown | @@ -416,13 +459,32 @@ Suite Teardown Test Suite Teardown | ||
416 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування договору | 459 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування договору |
417 | ... tender_owner | 460 | ... tender_owner |
418 | ... ${USERS.users['${tender_owner}'].broker} | 461 | ... ${USERS.users['${tender_owner}'].broker} |
419 | - ... amount_paid | 462 | + ... change_amount_paid |
420 | [Teardown] Оновити LAST_MODIFICATION_DATE | 463 | [Teardown] Оновити LAST_MODIFICATION_DATE |
421 | - ${amountPaid.amount}= create_fake_value_amount | 464 | + ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} |
465 | + ${amountPaid.amount}= create_fake_amount | ||
466 | + ... ${USERS.users['${tender_owner}'].contract_data.data.value.amount} | ||
467 | + ... ${award.value.valueAddedTaxIncluded} | ||
468 | + ... ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded} | ||
422 | Set to dictionary ${USERS.users['${tender_owner}']} new_amountPaid_amount=${amountPaid.amount} | 469 | Set to dictionary ${USERS.users['${tender_owner}']} new_amountPaid_amount=${amountPaid.amount} |
423 | Run As ${tender_owner} Редагувати поле договору ${CONTRACT_UAID} amountPaid.amount ${amountPaid.amount} | 470 | Run As ${tender_owner} Редагувати поле договору ${CONTRACT_UAID} amountPaid.amount ${amountPaid.amount} |
424 | 471 | ||
425 | 472 | ||
473 | +Можливість одночасно редагувати обсяг дійсно оплаченої суми з/без ПДВ | ||
474 | + [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування договору | ||
475 | + ... tender_owner | ||
476 | + ... ${USERS.users['${tender_owner}'].broker} | ||
477 | + ... change_amount_and_amountNet_paid | ||
478 | + [Teardown] Оновити LAST_MODIFICATION_DATE | ||
479 | + ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} | ||
480 | + ${amountPaid.amount_both_fields}= create_fake_amount | ||
481 | + ... ${USERS.users['${tender_owner}'].contract_data.data.value.amount} | ||
482 | + ... ${award.value.valueAddedTaxIncluded} | ||
483 | + ... ${USERS.users['${tender_owner}'].contract_data.data.value.valueAddedTaxIncluded} | ||
484 | + Set to dictionary ${USERS.users['${tender_owner}']} new_amountPaid_amount=${amountPaid.amount_both_fields} | ||
485 | + Run As ${tender_owner} Одночасно Редагувати два поля договору ${CONTRACT_UAID} amountPaid.amount ${amountPaid.amount_both_fields} amountPaid.amountNet ${amountPaid.amount_both_fields} | ||
486 | + | ||
487 | + | ||
426 | Відображення відредагованого обсягу дійсно оплаченої суми | 488 | Відображення відредагованого обсягу дійсно оплаченої суми |
427 | [Tags] ${USERS.users['${viewer}'].broker}: Редагування договору | 489 | [Tags] ${USERS.users['${viewer}'].broker}: Редагування договору |
428 | ... viewer | 490 | ... viewer |
@@ -47,7 +47,7 @@ Suite Teardown Test Suite Teardown | @@ -47,7 +47,7 @@ Suite Teardown Test Suite Teardown | ||
47 | Відображення вартості угоди без урахування ПДВ | 47 | Відображення вартості угоди без урахування ПДВ |
48 | [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди | 48 | [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди |
49 | ... viewer | 49 | ... viewer |
50 | - ... ${viewer_data.broker} | 50 | + ... ${USERS.users['${viewer}'].broker} |
51 | ... contract_view | 51 | ... contract_view |
52 | ... non-critical | 52 | ... non-critical |
53 | [Setup] Дочекатись синхронізації з майданчиком ${viewer} | 53 | [Setup] Дочекатись синхронізації з майданчиком ${viewer} |
@@ -59,16 +59,59 @@ Suite Teardown Test Suite Teardown | @@ -59,16 +59,59 @@ Suite Teardown Test Suite Teardown | ||
59 | Звірити відображення поля ${amount_net_field} тендера із ${award_amount} для користувача ${viewer} | 59 | Звірити відображення поля ${amount_net_field} тендера із ${award_amount} для користувача ${viewer} |
60 | 60 | ||
61 | 61 | ||
62 | +Відображення вартості угоди | ||
63 | + [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди | ||
64 | + ... viewer | ||
65 | + ... ${USERS.users['${viewer}'].broker} | ||
66 | + ... contract_view | ||
67 | + ... non-critical | ||
68 | + [Setup] Дочекатись синхронізації з майданчиком ${viewer} | ||
69 | + ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | ||
70 | + ${amount_field}= Set Variable contracts[${contract_index}].value.amount | ||
71 | + Отримати дані із поля ${amount_field} тендера для користувача ${viewer} | ||
72 | + | ||
73 | + | ||
74 | +Можливість змінити ознаку контракту на без ПДВ | ||
75 | + [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди | ||
76 | + ... tender_owner | ||
77 | + ... ${USERS.users['${tender_owner}'].broker} | ||
78 | + ... modify_contract_vat_to_false | ||
79 | + ... critical | ||
80 | + [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} | ||
81 | + [Teardown] Оновити LAST_MODIFICATION_DATE | ||
82 | + ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | ||
83 | + Set to dictionary ${USERS.users['${tender_owner}']} valueAddedTaxIncluded=${False} | ||
84 | + Run As ${tender_owner} Змінити ознаку ПДВ ${TENDER['TENDER_UAID']} ${contract_index} ${False} | ||
85 | + | ||
86 | + | ||
87 | +Можливість змінити ознаку контракту на з ПДВ | ||
88 | + [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди | ||
89 | + ... tender_owner | ||
90 | + ... ${USERS.users['${tender_owner}'].broker} | ||
91 | + ... modify_contract_vat_to_true | ||
92 | + ... critical | ||
93 | + [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} | ||
94 | + [Teardown] Оновити LAST_MODIFICATION_DATE | ||
95 | + ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | ||
96 | + ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} | ||
97 | + ${contract}= Отримати останній элемент contracts ${tender_owner} ${viewer} | ||
98 | + ${amount_net}= create_fake_amount_net ${award.value.amount} ${award.value.valueAddedTaxIncluded} ${contract.value.valueAddedTaxIncluded} | ||
99 | + Set to dictionary ${USERS.users['${tender_owner}']} valueAddedTaxIncluded=${True} | ||
100 | + Set to dictionary ${USERS.users['${tender_owner}']} amountNet=${amount_net} | ||
101 | + Run As ${tender_owner} Змінити ознаку ПДВ на True ${TENDER['TENDER_UAID']} ${contract_index} ${True} ${amount_net} | ||
102 | + | ||
103 | + | ||
62 | Можливість редагувати вартість угоди без урахування ПДВ | 104 | Можливість редагувати вартість угоди без урахування ПДВ |
63 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди | 105 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди |
64 | ... tender_owner | 106 | ... tender_owner |
65 | ... ${USERS.users['${tender_owner}'].broker} | 107 | ... ${USERS.users['${tender_owner}'].broker} |
66 | - ... modify_contract | 108 | + ... modify_contract_amount_net |
67 | ... critical | 109 | ... critical |
68 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} | 110 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} |
69 | [Teardown] Оновити LAST_MODIFICATION_DATE | 111 | [Teardown] Оновити LAST_MODIFICATION_DATE |
70 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} | 112 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} |
71 | - ${amount_net}= create_fake_amount_net ${award.value.amount} ${award.value.valueAddedTaxIncluded} | 113 | + ${contract}= Отримати останній элемент contracts ${tender_owner} ${viewer} |
114 | + ${amount_net}= create_fake_amount_net ${award.value.amount} ${award.value.valueAddedTaxIncluded} ${contract.value.valueAddedTaxIncluded} | ||
72 | ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | 115 | ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} |
73 | Set to dictionary ${USERS.users['${tender_owner}']} new_amount_net=${amount_net} | 116 | Set to dictionary ${USERS.users['${tender_owner}']} new_amount_net=${amount_net} |
74 | Run As ${tender_owner} Редагувати угоду | 117 | Run As ${tender_owner} Редагувати угоду |
@@ -78,31 +121,6 @@ Suite Teardown Test Suite Teardown | @@ -78,31 +121,6 @@ Suite Teardown Test Suite Teardown | ||
78 | ... ${amount_net} | 121 | ... ${amount_net} |
79 | 122 | ||
80 | 123 | ||
81 | -Відображення відредагованої вартості угоди без урахування ПДВ | ||
82 | - [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди | ||
83 | - ... viewer | ||
84 | - ... ${USERS.users['${viewer}'].broker} ${USERS.users['${tender_owner}'].broker} | ||
85 | - ... contract_view | ||
86 | - ... non-critical | ||
87 | - [Setup] Дочекатись синхронізації з майданчиком ${viewer} | ||
88 | - ${amount_net}= Get Variable Value ${USERS.users['${tender_owner}'].new_amount_net} | ||
89 | - ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | ||
90 | - ${amount_net_field}= Set Variable contracts[${contract_index}].value.amountNet | ||
91 | - Звірити відображення поля ${amount_net_field} тендера із ${amount_net} для користувача ${viewer} | ||
92 | - | ||
93 | - | ||
94 | -Відображення вартості угоди | ||
95 | - [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди | ||
96 | - ... viewer | ||
97 | - ... ${USERS.users['${viewer}'].broker} | ||
98 | - ... contract_view | ||
99 | - ... non-critical | ||
100 | - [Setup] Дочекатись синхронізації з майданчиком ${viewer} | ||
101 | - ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | ||
102 | - ${amount_field}= Set Variable contracts[${contract_index}].value.amount | ||
103 | - Отримати дані із поля ${amount_field} тендера для користувача ${viewer} | ||
104 | - | ||
105 | - | ||
106 | Можливість редагувати вартість угоди | 124 | Можливість редагувати вартість угоди |
107 | ${viewer_data}= Get From Dictionary ${USERS.users} ${viewer} | 125 | ${viewer_data}= Get From Dictionary ${USERS.users} ${viewer} |
108 | ${tender_owner_data}= Get From Dictionary ${USERS.users} ${tender_owner} | 126 | ${tender_owner_data}= Get From Dictionary ${USERS.users} ${tender_owner} |
@@ -114,7 +132,8 @@ Suite Teardown Test Suite Teardown | @@ -114,7 +132,8 @@ Suite Teardown Test Suite Teardown | ||
114 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} | 132 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} |
115 | [Teardown] Оновити LAST_MODIFICATION_DATE | 133 | [Teardown] Оновити LAST_MODIFICATION_DATE |
116 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} | 134 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} |
117 | - ${amount}= create_fake_amount ${award.value.amount} ${award.value.valueAddedTaxIncluded} | 135 | + ${contract}= Отримати останній элемент contracts ${tender_owner} ${viewer} |
136 | + ${amount}= create_fake_amount ${award.value.amount} ${award.value.valueAddedTaxIncluded} ${contract.value.valueAddedTaxIncluded} | ||
118 | ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | 137 | ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} |
119 | Set to dictionary ${USERS.users['${tender_owner}']} new_amount=${amount} | 138 | Set to dictionary ${USERS.users['${tender_owner}']} new_amount=${amount} |
120 | Run As ${tender_owner} Редагувати угоду | 139 | Run As ${tender_owner} Редагувати угоду |
@@ -124,11 +143,45 @@ Suite Teardown Test Suite Teardown | @@ -124,11 +143,45 @@ Suite Teardown Test Suite Teardown | ||
124 | ... ${amount} | 143 | ... ${amount} |
125 | 144 | ||
126 | 145 | ||
146 | +Можливість змінити значення вартості угоду з/без ПДВ | ||
147 | + [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди | ||
148 | + ... tender_owner | ||
149 | + ... ${USERS.users['${tender_owner}'].broker} | ||
150 | + ... modify_contract_amount_and_amountNet | ||
151 | + ... critical | ||
152 | + [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} | ||
153 | + [Teardown] Оновити LAST_MODIFICATION_DATE | ||
154 | + ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} | ||
155 | + ${contract}= Отримати останній элемент contracts ${tender_owner} ${viewer} | ||
156 | + ${amount_both_fields}= create_fake_amount ${award.value.amount} ${award.value.valueAddedTaxIncluded} ${contract.value.valueAddedTaxIncluded} | ||
157 | + ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | ||
158 | + Set to dictionary ${USERS.users['${tender_owner}']} amount_both_fields=${amount_both_fields} | ||
159 | + Run As ${tender_owner} Редагувати обидва поля вартості угоди | ||
160 | + ... ${TENDER['TENDER_UAID']} | ||
161 | + ... ${contract_index} | ||
162 | + ... value.amount | ||
163 | + ... value.amountNet | ||
164 | + ... ${amount_both_fields} | ||
165 | + | ||
166 | + | ||
167 | +Відображення відредагованої вартості угоди без урахування ПДВ | ||
168 | + [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди | ||
169 | + ... viewer | ||
170 | + ... ${USERS.users['${viewer}'].broker} ${USERS.users['${tender_owner}'].broker} | ||
171 | + ... contract_view_new_amountNet | ||
172 | + ... non-critical | ||
173 | + [Setup] Дочекатись синхронізації з майданчиком ${viewer} | ||
174 | + ${amount_net}= Get Variable Value ${USERS.users['${tender_owner}'].new_amount_net} | ||
175 | + ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | ||
176 | + ${amount_net_field}= Set Variable contracts[${contract_index}].value.amountNet | ||
177 | + Звірити відображення поля ${amount_net_field} тендера із ${amount_net} для користувача ${viewer} | ||
178 | + | ||
179 | + | ||
127 | Відображення відредагованої вартості угоди | 180 | Відображення відредагованої вартості угоди |
128 | [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди | 181 | [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди |
129 | ... viewer | 182 | ... viewer |
130 | ... ${USERS.users['${viewer}'].broker} ${USERS.users['${tender_owner}'].broker} | 183 | ... ${USERS.users['${viewer}'].broker} ${USERS.users['${tender_owner}'].broker} |
131 | - ... modify_contract_value | 184 | + ... contract_view_new_amount |
132 | ... non-critical | 185 | ... non-critical |
133 | [Setup] Дочекатись синхронізації з майданчиком ${viewer} | 186 | [Setup] Дочекатись синхронізації з майданчиком ${viewer} |
134 | ${amount}= Get Variable Value ${USERS.users['${tender_owner}'].new_amount} | 187 | ${amount}= Get Variable Value ${USERS.users['${tender_owner}'].new_amount} |
@@ -137,15 +190,34 @@ Suite Teardown Test Suite Teardown | @@ -137,15 +190,34 @@ Suite Teardown Test Suite Teardown | ||
137 | Звірити відображення поля ${amount_field} тендера із ${amount} для користувача ${viewer} | 190 | Звірити відображення поля ${amount_field} тендера із ${amount} для користувача ${viewer} |
138 | 191 | ||
139 | 192 | ||
140 | -Неможливість вказати ціну договору без ПДВ більше ніж результат проведення аукціону (закупівля без ПДВ) | 193 | +Відображення одночасно відредагованої вартості угоди з/без ПДВ |
194 | + [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди | ||
195 | + ... viewer | ||
196 | + ... ${USERS.users['${viewer}'].broker} ${USERS.users['${tender_owner}'].broker}. | ||
197 | + ... contract_view_new_amount_and_amountNet | ||
198 | + ... non-critical | ||
199 | + [Setup] Дочекатись синхронізації з майданчиком ${viewer} | ||
200 | + ${amount_both_fields}= Get Variable Value ${USERS.users['${tender_owner}'].amount_both_fields} | ||
201 | + ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | ||
202 | + ${amount_net_field}= Set Variable contracts[${contract_index}].value.amountNet | ||
203 | + ${amount_field}= Set Variable contracts[${contract_index}].value.amount | ||
204 | + Звірити відображення поля ${amount_net_field} тендера із ${amount_both_fields} для користувача ${viewer} | ||
205 | + Звірити відображення поля ${amount_field} тендера із ${amount_both_fields} для користувача ${viewer} | ||
206 | + | ||
207 | + | ||
208 | +Неможливість вказати ціну договору без ПДВ більше ніж результат проведення аукціону | ||
141 | # contract:value:amountNet should be <= award.value.amount if valueAddedTaxIncluded=false | 209 | # contract:value:amountNet should be <= award.value.amount if valueAddedTaxIncluded=false |
210 | +# lots:value:valueAddedTaxIncluded:false - contract:value:valueAddedTaxIncluded:true | ||
211 | +# lots:value:valueAddedTaxIncluded:true - contract:value:valueAddedTaxIncluded:false | ||
212 | +# lots:value:valueAddedTaxIncluded:false - contract:value:valueAddedTaxIncluded:false | ||
142 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди | 213 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди |
143 | ... tender_owner | 214 | ... tender_owner |
144 | ... ${USERS.users['${tender_owner}'].broker} | 215 | ... ${USERS.users['${tender_owner}'].broker} |
145 | - ... modify_contract_amountNet_vat_false | 216 | + ... modify_contract_invalid_amountNet |
146 | ... critical | 217 | ... critical |
147 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} | 218 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} |
148 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} | 219 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} |
220 | + ${contract}= Отримати останній элемент contracts ${tender_owner} ${viewer} | ||
149 | ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | 221 | ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} |
150 | ${amount_net}= Evaluate ${award.value.amount} * 2 | 222 | ${amount_net}= Evaluate ${award.value.amount} * 2 |
151 | ${value}= Require Failure ${tender_owner} Редагувати угоду | 223 | ${value}= Require Failure ${tender_owner} Редагувати угоду |
@@ -153,18 +225,27 @@ Suite Teardown Test Suite Teardown | @@ -153,18 +225,27 @@ Suite Teardown Test Suite Teardown | ||
153 | ... ${contract_index} | 225 | ... ${contract_index} |
154 | ... value.amountNet | 226 | ... value.amountNet |
155 | ... ${amount_net} | 227 | ... ${amount_net} |
156 | - Should Contain ${value} Value amountNet should be less or equal to awarded amount | 228 | + Run Keyword IF '${award.value.valueAddedTaxIncluded}' == '${False}' and '${contract.value.valueAddedTaxIncluded}' == '${True}' |
229 | + ... Should Contain ${value} Amount and amountNet should be equal | ||
230 | + Run Keyword IF '${award.value.valueAddedTaxIncluded}' == '${True}' and '${contract.value.valueAddedTaxIncluded}' == '${False}' | ||
231 | + ... Should Contain ${value} Amount and amountNet should be equal | ||
232 | + Run Keyword IF '${award.value.valueAddedTaxIncluded}' == '${False}' and '${contract.value.valueAddedTaxIncluded}' == '${False}' | ||
233 | + ... Should Contain ${value} Amount and amountNet should be equal | ||
157 | 234 | ||
158 | 235 | ||
159 | -Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону (закупівля з ПДВ) | 236 | +Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону |
160 | # contract:value:amount should be <= award.value.amount if valueAddedTaxIncluded=ture | 237 | # contract:value:amount should be <= award.value.amount if valueAddedTaxIncluded=ture |
238 | +# lots:value:valueAddedTaxIncluded:true - contract:value:valueAddedTaxIncluded:true | ||
239 | +# lots:value:valueAddedTaxIncluded:true - contract:value:valueAddedTaxIncluded:false | ||
240 | +# lots:value:valueAddedTaxIncluded:false - contract:value:valueAddedTaxIncluded:false | ||
161 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди | 241 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди |
162 | ... tender_owner | 242 | ... tender_owner |
163 | ... ${USERS.users['${tender_owner}'].broker} | 243 | ... ${USERS.users['${tender_owner}'].broker} |
164 | - ... modify_contract_amount_vat_true | 244 | + ... modify_contract_invalid_amount |
165 | ... critical | 245 | ... critical |
166 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} | 246 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} |
167 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} | 247 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} |
248 | + ${contract}= Отримати останній элемент contracts ${tender_owner} ${viewer} | ||
168 | ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | 249 | ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} |
169 | ${amount}= Evaluate ${award.value.amount} * 2 | 250 | ${amount}= Evaluate ${award.value.amount} * 2 |
170 | ${value}= Require Failure ${tender_owner} Редагувати угоду | 251 | ${value}= Require Failure ${tender_owner} Редагувати угоду |
@@ -172,36 +253,41 @@ Suite Teardown Test Suite Teardown | @@ -172,36 +253,41 @@ Suite Teardown Test Suite Teardown | ||
172 | ... ${contract_index} | 253 | ... ${contract_index} |
173 | ... value.amount | 254 | ... value.amount |
174 | ... ${amount} | 255 | ... ${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 | 256 | + Run Keyword IF '${award.value.valueAddedTaxIncluded}' == '${True}' and '${contract.value.valueAddedTaxIncluded}' == '${True}' |
257 | + ... Should Contain ${value} Amount should be less or equal to awarded amount | ||
258 | + Run Keyword IF '${award.value.valueAddedTaxIncluded}' == '${True}' and '${contract.value.valueAddedTaxIncluded}' == '${False}' | ||
259 | + ... Should Contain ${value} Amount should be less or equal to awarded amount | ||
260 | + Run Keyword IF '${award.value.valueAddedTaxIncluded}' == '${False}' and '${contract.value.valueAddedTaxIncluded}' == '${False}' | ||
261 | + ... Should Contain ${value} Amount should be less or equal to awarded amount | ||
179 | 262 | ||
180 | 263 | ||
181 | Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ) | 264 | Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ) |
182 | -# contract:value:amountNet can be <= contract:value:amount but no more than on contract:value:amount/1.2 value if valueAddedTaxIncluded=ture | 265 | +# contract:value:amountNet can be <= contract:value:amount but no more than on contract:value:amount/1.2 if valueAddedTaxIncluded=ture |
266 | +# lots:value:valueAddedTaxIncluded:true - contract:value:valueAddedTaxIncluded:true | ||
183 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди | 267 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди |
184 | ... tender_owner | 268 | ... tender_owner |
185 | ... ${USERS.users['${tender_owner}'].broker} | 269 | ... ${USERS.users['${tender_owner}'].broker} |
186 | - ... modify_contract_amountNet_vat_true | 270 | + ... modify_contract_invalid_amountNet_tender_vat_true |
187 | ... critical | 271 | ... critical |
188 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} | 272 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} |
189 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} | 273 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} |
190 | ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} | 274 | ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer} |
275 | + ${invalid_amountNet}= Evaluate ${award.value.amount} / 2 | ||
191 | ${value}= Require Failure ${tender_owner} Редагувати угоду | 276 | ${value}= Require Failure ${tender_owner} Редагувати угоду |
192 | ... ${TENDER['TENDER_UAID']} | 277 | ... ${TENDER['TENDER_UAID']} |
193 | ... ${contract_index} | 278 | ... ${contract_index} |
194 | ... value.amountNet | 279 | ... value.amountNet |
195 | - ... 0 | ||
196 | - Should Contain ${value} for 20.0% | 280 | + ... ${invalid_amountNet} |
281 | + Should Contain ${value} Amount should be greater than amountNet and differ by no more than 20.0% | ||
197 | 282 | ||
198 | 283 | ||
199 | Неможливість збільшити ціну договору з ПДВ на суму більшу за 20% від ціни договору без ПДВ (закупівля без ПДВ) | 284 | Неможливість збільшити ціну договору з ПДВ на суму більшу за 20% від ціни договору без ПДВ (закупівля без ПДВ) |
200 | # contract:value:amount can be >= contract:value:amountNet but no more than on 20% of contract:value:amountNet value if valueAddedTaxIncluded=false | 285 | # contract:value:amount can be >= contract:value:amountNet but no more than on 20% of contract:value:amountNet value if valueAddedTaxIncluded=false |
286 | +# lots:value:valueAddedTaxIncluded:false - contract:value:valueAddedTaxIncluded:true | ||
201 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди | 287 | [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди |
202 | ... tender_owner | 288 | ... tender_owner |
203 | ... ${USERS.users['${tender_owner}'].broker} | 289 | ... ${USERS.users['${tender_owner}'].broker} |
204 | - ... modify_contract_amount_vat_false | 290 | + ... modify_contract_invalid_amount_tender_vat_false |
205 | ... critical | 291 | ... critical |
206 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} | 292 | [Setup] Дочекатись синхронізації з майданчиком ${tender_owner} |
207 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} | 293 | ${award}= Отримати останній элемент awards ${tender_owner} ${viewer} |
@@ -44,24 +44,32 @@ def get_fake_funder_scheme(): | @@ -44,24 +44,32 @@ def get_fake_funder_scheme(): | ||
44 | return fake.funder_scheme() | 44 | return fake.funder_scheme() |
45 | 45 | ||
46 | 46 | ||
47 | -def create_fake_amount(award_amount, value_added_tax_included=False): | ||
48 | - min_amount_net = award_amount - award_amount * 0.2 | 47 | +def create_fake_amount(award_amount, tender_value_added_tax_included, contract_value_added_tax_included): |
48 | + min_amount_net = award_amount / 1.2 | ||
49 | range_amount_net = award_amount - min_amount_net | 49 | range_amount_net = award_amount - min_amount_net |
50 | half_min_amount_net = min_amount_net + range_amount_net / 2 | 50 | half_min_amount_net = min_amount_net + range_amount_net / 2 |
51 | half_max_amount_net = half_min_amount_net + range_amount_net | 51 | half_max_amount_net = half_min_amount_net + range_amount_net |
52 | - if value_added_tax_included: | 52 | + if tender_value_added_tax_included == True and contract_value_added_tax_included == True: |
53 | return round(random.uniform(half_min_amount_net, award_amount), 2) | 53 | return round(random.uniform(half_min_amount_net, award_amount), 2) |
54 | - else: | 54 | + if tender_value_added_tax_included == False and contract_value_added_tax_included == True: |
55 | return round(random.uniform(award_amount, half_max_amount_net), 2) | 55 | return round(random.uniform(award_amount, half_max_amount_net), 2) |
56 | + if tender_value_added_tax_included == True and contract_value_added_tax_included == False: | ||
57 | + return round(random.uniform(half_min_amount_net, award_amount), 2) | ||
58 | + if tender_value_added_tax_included == False and contract_value_added_tax_included == False: | ||
59 | + return round(random.uniform(half_min_amount_net, award_amount), 2) | ||
56 | 60 | ||
57 | 61 | ||
58 | -def create_fake_amount_net(award_amount, value_added_tax_included=False): | 62 | +def create_fake_amount_net(award_amount, tender_value_added_tax_included, contract_value_added_tax_included): |
59 | min_amount_net = award_amount / 1.2 | 63 | min_amount_net = award_amount / 1.2 |
60 | range_amount_net = award_amount - min_amount_net | 64 | range_amount_net = award_amount - min_amount_net |
61 | half_min_amount_net = min_amount_net + range_amount_net / 2 | 65 | half_min_amount_net = min_amount_net + range_amount_net / 2 |
62 | - if value_added_tax_included: | 66 | + if tender_value_added_tax_included == True and contract_value_added_tax_included == True: |
63 | return round(random.uniform(min_amount_net, half_min_amount_net), 2) | 67 | return round(random.uniform(min_amount_net, half_min_amount_net), 2) |
64 | - else: | 68 | + if tender_value_added_tax_included == False and contract_value_added_tax_included == True: |
69 | + return round(random.uniform(half_min_amount_net, award_amount), 2) | ||
70 | + if tender_value_added_tax_included == True and contract_value_added_tax_included == False: | ||
71 | + return round(random.uniform(half_min_amount_net, award_amount), 2) | ||
72 | + if tender_value_added_tax_included == False and contract_value_added_tax_included == False: | ||
65 | return round(random.uniform(half_min_amount_net, award_amount), 2) | 73 | return round(random.uniform(half_min_amount_net, award_amount), 2) |
66 | 74 | ||
67 | 75 |
@@ -66,7 +66,7 @@ | @@ -66,7 +66,7 @@ | ||
66 | -i ask_question_to_item_after_tendering_period | 66 | -i ask_question_to_item_after_tendering_period |
67 | -i ask_question_to_lot_after_tendering_period | 67 | -i ask_question_to_lot_after_tendering_period |
68 | 68 | ||
69 | --i auction | 69 | +#-i auction |
70 | 70 | ||
71 | -i qualification_add_doc_to_first_award | 71 | -i qualification_add_doc_to_first_award |
72 | -i qualification_approve_first_award | 72 | -i qualification_approve_first_award |
@@ -74,15 +74,21 @@ | @@ -74,15 +74,21 @@ | ||
74 | -i qualification_add_doc_to_second_award | 74 | -i qualification_add_doc_to_second_award |
75 | -i qualification_approve_second_award | 75 | -i qualification_approve_second_award |
76 | 76 | ||
77 | +-i contract_stand_still | ||
77 | -i contract_view | 78 | -i contract_view |
78 | --i modify_contract_amount_vat_true | ||
79 | --i modify_contract_amountNet_vat_true | 79 | + |
80 | +-i modify_contract_invalid_amount | ||
81 | +-i modify_contract_invalid_amountNet_tender_vat_true | ||
82 | + | ||
83 | +-i modify_contract_amount_net | ||
84 | +-i modify_contract_value | ||
85 | + | ||
80 | -i modify_contract | 86 | -i modify_contract |
81 | - -i modify_contract_value | 87 | + |
82 | -i add_doc_to_contract | 88 | -i add_doc_to_contract |
83 | - -i contract_doc_documentOf | 89 | +-i contract_doc_documentOf |
90 | + | ||
84 | -i contract_sign | 91 | -i contract_sign |
85 | --i contract_stand_still | ||
86 | 92 | ||
87 | -i find_contract | 93 | -i find_contract |
88 | -i access_contract | 94 | -i access_contract |
@@ -90,8 +96,11 @@ | @@ -90,8 +96,11 @@ | ||
90 | -i view_change | 96 | -i view_change |
91 | -i upload_change_document | 97 | -i upload_change_document |
92 | -i modify_change | 98 | -i modify_change |
99 | +-i change_contract_amountNet | ||
100 | +-i change_contract_amount | ||
93 | -i apply_change | 101 | -i apply_change |
94 | -i add_contract_doc | 102 | -i add_contract_doc |
95 | -i termination_reasons | 103 | -i termination_reasons |
96 | -i amount_paid | 104 | -i amount_paid |
105 | +-i change_amount_paid | ||
97 | -i contract_termination | 106 | -i contract_termination |
1 | +-v MODE:belowThreshold | ||
2 | + | ||
3 | +-v NUMBER_OF_ITEMS:1 | ||
4 | +-v NUMBER_OF_LOTS:1 | ||
5 | + | ||
6 | + | ||
7 | +-v TENDER_MEAT:True | ||
8 | +-v ITEM_MEAT:True | ||
9 | +-v LOT_MEAT:True | ||
10 | + | ||
11 | +-v VAT_INCLUDED: False | ||
12 | + | ||
13 | +-i create_tender | ||
14 | +-i find_tender | ||
15 | +-i tender_view | ||
16 | + | ||
17 | +-i make_bid_by_provider | ||
18 | +-i make_bid_by_provider1 | ||
19 | + | ||
20 | +-i qualification_approve_first_award | ||
21 | + | ||
22 | +-i contract_stand_still | ||
23 | +-i contract_view | ||
24 | + | ||
25 | +-i modify_contract_invalid_amount | ||
26 | +-i modify_contract_invalid_amountNet | ||
27 | + | ||
28 | +-i modify_contract_amount_and_amountNet | ||
29 | + | ||
30 | +-i contract_view_new_amount_and_amountNet | ||
31 | + | ||
32 | +-i modify_contract | ||
33 | + | ||
34 | +-i add_doc_to_contract | ||
35 | +-i contract_doc_documentOf | ||
36 | + | ||
37 | +-i contract_sign | ||
38 | + | ||
39 | +-i find_contract | ||
40 | +-i access_contract | ||
41 | +-i submit_change | ||
42 | +-i view_change | ||
43 | +-i upload_change_document | ||
44 | +-i modify_change | ||
45 | +-i change_contract_amount_and_amountNet | ||
46 | +-i modify_contract_view_new_amount_amountNet | ||
47 | +-i apply_change | ||
48 | +-i add_contract_doc | ||
49 | +-i termination_reasons | ||
50 | +-i amount_paid | ||
51 | +-i change_amount_and_amountNet_paid | ||
52 | +-i contract_termination |
1 | +-v MODE:belowThreshold | ||
2 | + | ||
3 | +-v NUMBER_OF_ITEMS:1 | ||
4 | +-v NUMBER_OF_LOTS:1 | ||
5 | + | ||
6 | + | ||
7 | +-v TENDER_MEAT:True | ||
8 | +-v ITEM_MEAT:True | ||
9 | +-v LOT_MEAT:True | ||
10 | + | ||
11 | +-v VAT_INCLUDED: False | ||
12 | + | ||
13 | +-i create_tender | ||
14 | +-i find_tender | ||
15 | +-i tender_view | ||
16 | + | ||
17 | +-i make_bid_by_provider | ||
18 | +-i make_bid_by_provider1 | ||
19 | + | ||
20 | +-i qualification_approve_first_award | ||
21 | + | ||
22 | +-i contract_stand_still | ||
23 | +-i contract_view | ||
24 | + | ||
25 | +-i modify_contract_vat_to_true | ||
26 | + | ||
27 | +-i modify_contract_amount_net | ||
28 | +-i modify_contract_value | ||
29 | + | ||
30 | +-i modify_contract_invalid_amount | ||
31 | +-i modify_contract_invalid_amountNet_tender_vat_true | ||
32 | + | ||
33 | +-i modify_contract | ||
34 | + | ||
35 | +-i add_doc_to_contract | ||
36 | +-i contract_doc_documentOf | ||
37 | + | ||
38 | +-i contract_sign | ||
39 | + | ||
40 | +-i find_contract | ||
41 | +-i access_contract | ||
42 | +-i submit_change | ||
43 | +-i view_change | ||
44 | +-i upload_change_document | ||
45 | +-i modify_change | ||
46 | +-i change_contract_amountNet | ||
47 | +-i change_contract_amount | ||
48 | +-i apply_change | ||
49 | +-i add_contract_doc | ||
50 | +-i termination_reasons | ||
51 | +-i amount_paid | ||
52 | +-i change_amount_paid | ||
53 | +-i contract_termination |
1 | +-v MODE:belowThreshold | ||
2 | + | ||
3 | +-v NUMBER_OF_ITEMS:1 | ||
4 | +-v NUMBER_OF_LOTS:1 | ||
5 | + | ||
6 | + | ||
7 | +-v TENDER_MEAT:True | ||
8 | +-v ITEM_MEAT:True | ||
9 | +-v LOT_MEAT:True | ||
10 | + | ||
11 | + | ||
12 | +-i create_tender | ||
13 | +-i find_tender | ||
14 | +-i tender_view | ||
15 | + | ||
16 | +-i make_bid_by_provider | ||
17 | +-i make_bid_by_provider1 | ||
18 | + | ||
19 | +-i qualification_approve_first_award | ||
20 | + | ||
21 | +-i contract_stand_still | ||
22 | +-i contract_view | ||
23 | + | ||
24 | +-i modify_contract_vat_to_false | ||
25 | + | ||
26 | +-i modify_contract_invalid_amount | ||
27 | +-i modify_contract_invalid_amountNet | ||
28 | + | ||
29 | +-i modify_contract_amount_and_amountNet | ||
30 | + | ||
31 | +-i modify_contract | ||
32 | + | ||
33 | +-i add_doc_to_contract | ||
34 | +-i contract_doc_documentOf | ||
35 | + | ||
36 | +-i contract_sign | ||
37 | + | ||
38 | +-i find_contract | ||
39 | +-i access_contract | ||
40 | +-i submit_change | ||
41 | +-i view_change | ||
42 | +-i upload_change_document | ||
43 | +-i modify_change | ||
44 | +-i change_contract_amount_and_amountNet | ||
45 | +-i modify_contract_view_new_amount_amountNet | ||
46 | +-i apply_change | ||
47 | +-i add_contract_doc | ||
48 | +-i termination_reasons | ||
49 | +-i amount_paid | ||
50 | +-i change_amount_and_amountNet_paid | ||
51 | +-i contract_termination | ||
52 | + | ||
53 | + |
1 | +-v MODE:belowThreshold | ||
2 | + | ||
3 | +-v NUMBER_OF_ITEMS:1 | ||
4 | +-v NUMBER_OF_LOTS:1 | ||
5 | + | ||
6 | + | ||
7 | +-v TENDER_MEAT:True | ||
8 | +-v ITEM_MEAT:True | ||
9 | +-v LOT_MEAT:True | ||
10 | + | ||
11 | + | ||
12 | +-i create_tender | ||
13 | +-i find_tender | ||
14 | +-i tender_view | ||
15 | + | ||
16 | +-i make_bid_by_provider | ||
17 | +-i make_bid_by_provider1 | ||
18 | + | ||
19 | +-i qualification_approve_first_award | ||
20 | + | ||
21 | +-i contract_stand_still | ||
22 | +-i contract_view | ||
23 | + | ||
24 | +-i modify_contract_invalid_amount | ||
25 | +-i modify_contract_invalid_amountNet_tender_vat_true | ||
26 | + | ||
27 | +-i modify_contract_amount_net | ||
28 | +-i modify_contract_value | ||
29 | + | ||
30 | +-i modify_contract | ||
31 | + | ||
32 | +-i add_doc_to_contract | ||
33 | +-i contract_doc_documentOf | ||
34 | + | ||
35 | +-i contract_sign | ||
36 | + | ||
37 | +-i find_contract | ||
38 | +-i access_contract | ||
39 | +-i submit_change | ||
40 | +-i view_change | ||
41 | +-i upload_change_document | ||
42 | +-i modify_change | ||
43 | +-i change_contract_amountNet | ||
44 | +-i change_contract_amount | ||
45 | +-i apply_change | ||
46 | +-i add_contract_doc | ||
47 | +-i termination_reasons | ||
48 | +-i amount_paid | ||
49 | +-i change_amount_paid | ||
50 | +-i contract_termination | ||
51 | + | ||
52 | + |
@@ -62,10 +62,28 @@ | @@ -62,10 +62,28 @@ | ||
62 | -i qualification_add_doc_to_second_award | 62 | -i qualification_add_doc_to_second_award |
63 | -i qualification_approve_second_award | 63 | -i qualification_approve_second_award |
64 | 64 | ||
65 | --i contract_sign | ||
66 | -i contract_stand_still | 65 | -i contract_stand_still |
67 | -i contract_view | 66 | -i contract_view |
68 | --i modify_contract_amount_vat_true | ||
69 | --i modify_contract_amountNet_vat_true | 67 | +-i modify_contract_invalid_amount |
68 | +-i modify_contract_invalid_amountNet_tender_vat_true | ||
69 | +-i modify_contract_amount_net | ||
70 | +-i modify_contract_value | ||
70 | -i modify_contract | 71 | -i modify_contract |
71 | - -i modify_contract_value | ||
72 | +-i add_doc_to_contract | ||
73 | +-i contract_doc_documentOf | ||
74 | +-i contract_sign | ||
75 | + | ||
76 | +-i find_contract | ||
77 | +-i access_contract | ||
78 | +-i submit_change | ||
79 | +-i view_change | ||
80 | +-i upload_change_document | ||
81 | +-i modify_change | ||
82 | +-i change_contract_amountNet | ||
83 | +-i change_contract_amount | ||
84 | +-i apply_change | ||
85 | +-i add_contract_doc | ||
86 | +-i termination_reasons | ||
87 | +-i amount_paid | ||
88 | +-i change_amount_paid | ||
89 | +-i contract_termination |
@@ -61,5 +61,28 @@ | @@ -61,5 +61,28 @@ | ||
61 | 61 | ||
62 | -i qualification_approve_first_award | 62 | -i qualification_approve_first_award |
63 | 63 | ||
64 | +-i contract_stand_still | ||
65 | +-i contract_view | ||
66 | +-i modify_contract_invalid_amount | ||
67 | +-i modify_contract_invalid_amountNet_tender_vat_true | ||
68 | +-i modify_contract_amount_net | ||
69 | +-i modify_contract_value | ||
70 | +-i modify_contract | ||
71 | +-i add_doc_to_contract | ||
72 | +-i contract_doc_documentOf | ||
64 | -i contract_sign | 73 | -i contract_sign |
65 | --i contract_stand_still | ||
74 | + | ||
75 | +-i find_contract | ||
76 | +-i access_contract | ||
77 | +-i submit_change | ||
78 | +-i view_change | ||
79 | +-i upload_change_document | ||
80 | +-i modify_change | ||
81 | +-i change_contract_amountNet | ||
82 | +-i change_contract_amount | ||
83 | +-i apply_change | ||
84 | +-i add_contract_doc | ||
85 | +-i termination_reasons | ||
86 | +-i amount_paid | ||
87 | +-i change_amount_paid | ||
88 | +-i contract_termination |
@@ -76,10 +76,13 @@ | @@ -76,10 +76,13 @@ | ||
76 | -i qualification_approve_third_award | 76 | -i qualification_approve_third_award |
77 | 77 | ||
78 | 78 | ||
79 | --i contract_view | ||
80 | -i contract_stand_still | 79 | -i contract_stand_still |
81 | --i modify_contract_amount_vat_true | ||
82 | --i modify_contract_amountNet_vat_true | 80 | +-i contract_view |
81 | +-i modify_contract_invalid_amount | ||
82 | +-i modify_contract_invalid_amountNet_tender_vat_true | ||
83 | +-i modify_contract_amount_net | ||
84 | +-i modify_contract_value | ||
83 | -i modify_contract | 85 | -i modify_contract |
84 | -i add_doc_to_contract | 86 | -i add_doc_to_contract |
87 | +-i contract_doc_documentOf | ||
85 | -i contract_sign | 88 | -i contract_sign |
@@ -47,11 +47,15 @@ | @@ -47,11 +47,15 @@ | ||
47 | -i qualification_add_doc_to_second_award | 47 | -i qualification_add_doc_to_second_award |
48 | -i qualification_approve_second_award | 48 | -i qualification_approve_second_award |
49 | 49 | ||
50 | +-i contract_stand_still | ||
50 | -i contract_view | 51 | -i contract_view |
51 | --i modify_contract_amount_vat_true | ||
52 | --i modify_contract_amountNet_vat_true | 52 | +-i modify_contract_invalid_amount |
53 | +-i modify_contract_invalid_amountNet_tender_vat_true | ||
54 | +-i modify_contract_amount_net | ||
55 | +-i modify_contract_value | ||
53 | -i modify_contract | 56 | -i modify_contract |
54 | -i add_doc_to_contract | 57 | -i add_doc_to_contract |
58 | +-i contract_doc_documentOf | ||
55 | -i contract_sign | 59 | -i contract_sign |
56 | 60 | ||
57 | -i find_contract | 61 | -i find_contract |
@@ -60,8 +64,11 @@ | @@ -60,8 +64,11 @@ | ||
60 | -i view_change | 64 | -i view_change |
61 | -i upload_change_document | 65 | -i upload_change_document |
62 | -i modify_change | 66 | -i modify_change |
67 | +-i change_contract_amountNet | ||
68 | +-i change_contract_amount | ||
63 | -i apply_change | 69 | -i apply_change |
64 | -i add_contract_doc | 70 | -i add_contract_doc |
65 | -i termination_reasons | 71 | -i termination_reasons |
66 | -i amount_paid | 72 | -i amount_paid |
73 | +-i change_amount_paid | ||
67 | -i contract_termination | 74 | -i contract_termination |
@@ -64,10 +64,28 @@ | @@ -64,10 +64,28 @@ | ||
64 | -i qualification_add_doc_to_first_award | 64 | -i qualification_add_doc_to_first_award |
65 | -i qualification_approve_first_award | 65 | -i qualification_approve_first_award |
66 | 66 | ||
67 | --i contract_sign | ||
68 | -i contract_stand_still | 67 | -i contract_stand_still |
69 | --i modify_contract_amount_vat_true | ||
70 | --i modify_contract_amountNet_vat_true | 68 | +-i contract_view |
69 | +-i modify_contract_invalid_amount | ||
70 | +-i modify_contract_invalid_amountNet_tender_vat_true | ||
71 | +-i modify_contract_amount_net | ||
72 | +-i modify_contract_value | ||
71 | -i modify_contract | 73 | -i modify_contract |
72 | - -i modify_contract_value | ||
73 | --i contract_view | ||
74 | +-i add_doc_to_contract | ||
75 | +-i contract_doc_documentOf | ||
76 | +-i contract_sign | ||
77 | + | ||
78 | +-i find_contract | ||
79 | +-i access_contract | ||
80 | +-i submit_change | ||
81 | +-i view_change | ||
82 | +-i upload_change_document | ||
83 | +-i modify_change | ||
84 | +-i change_contract_amountNet | ||
85 | +-i change_contract_amount | ||
86 | +-i apply_change | ||
87 | +-i add_contract_doc | ||
88 | +-i termination_reasons | ||
89 | +-i amount_paid | ||
90 | +-i change_amount_paid | ||
91 | +-i contract_termination |
@@ -103,15 +103,16 @@ | @@ -103,15 +103,16 @@ | ||
103 | -i qualification_add_doc_to_second_award | 103 | -i qualification_add_doc_to_second_award |
104 | -i qualification_approve_second_award | 104 | -i qualification_approve_second_award |
105 | 105 | ||
106 | +-i contract_stand_still | ||
106 | -i contract_view | 107 | -i contract_view |
107 | --i modify_contract_amount_vat_true | ||
108 | --i modify_contract_amountNet_vat_true | 108 | +-i modify_contract_invalid_amount |
109 | +-i modify_contract_invalid_amountNet_tender_vat_true | ||
110 | +-i modify_contract_amount_net | ||
111 | +-i modify_contract_value | ||
109 | -i modify_contract | 112 | -i modify_contract |
110 | - -i modify_contract_value | ||
111 | -i add_doc_to_contract | 113 | -i add_doc_to_contract |
112 | - -i contract_doc_documentOf | 114 | +-i contract_doc_documentOf |
113 | -i contract_sign | 115 | -i contract_sign |
114 | --i contract_stand_still | ||
115 | 116 | ||
116 | -i find_contract | 117 | -i find_contract |
117 | -i access_contract | 118 | -i access_contract |
@@ -119,8 +120,11 @@ | @@ -119,8 +120,11 @@ | ||
119 | -i view_change | 120 | -i view_change |
120 | -i upload_change_document | 121 | -i upload_change_document |
121 | -i modify_change | 122 | -i modify_change |
123 | +-i change_contract_amountNet | ||
124 | +-i change_contract_amount | ||
122 | -i apply_change | 125 | -i apply_change |
123 | -i add_contract_doc | 126 | -i add_contract_doc |
124 | -i termination_reasons | 127 | -i termination_reasons |
125 | -i amount_paid | 128 | -i amount_paid |
129 | +-i change_amount_paid | ||
126 | -i contract_termination | 130 | -i contract_termination |
@@ -79,15 +79,16 @@ | @@ -79,15 +79,16 @@ | ||
79 | -i qualification_add_doc_to_second_award | 79 | -i qualification_add_doc_to_second_award |
80 | -i qualification_approve_second_award | 80 | -i qualification_approve_second_award |
81 | 81 | ||
82 | +-i contract_stand_still | ||
82 | -i contract_view | 83 | -i contract_view |
83 | --i modify_contract_amount_vat_true | ||
84 | --i modify_contract_amountNet_vat_true | 84 | +-i modify_contract_invalid_amount |
85 | +-i modify_contract_invalid_amountNet_tender_vat_true | ||
86 | +-i modify_contract_amount_net | ||
87 | +-i modify_contract_value | ||
85 | -i modify_contract | 88 | -i modify_contract |
86 | - -i modify_contract_value | ||
87 | -i add_doc_to_contract | 89 | -i add_doc_to_contract |
88 | - -i contract_doc_documentOf | 90 | +-i contract_doc_documentOf |
89 | -i contract_sign | 91 | -i contract_sign |
90 | --i contract_stand_still | ||
91 | 92 | ||
92 | -i find_contract | 93 | -i find_contract |
93 | -i access_contract | 94 | -i access_contract |
@@ -95,8 +96,11 @@ | @@ -95,8 +96,11 @@ | ||
95 | -i view_change | 96 | -i view_change |
96 | -i upload_change_document | 97 | -i upload_change_document |
97 | -i modify_change | 98 | -i modify_change |
99 | +-i change_contract_amountNet | ||
100 | +-i change_contract_amount | ||
98 | -i apply_change | 101 | -i apply_change |
99 | -i add_contract_doc | 102 | -i add_contract_doc |
100 | -i termination_reasons | 103 | -i termination_reasons |
101 | -i amount_paid | 104 | -i amount_paid |
105 | +-i change_amount_paid | ||
102 | -i contract_termination | 106 | -i contract_termination |
Please
register
or
login
to post a comment