-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Е-Контракт #16
Open
VDigitall
wants to merge
143
commits into
master
Choose a base branch
from
feature/e-contract
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Е-Контракт #16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VDigitall
force-pushed
the
feature/e-contract
branch
from
June 24, 2020 05:16
fbe4e36
to
d63a020
Compare
pontostroy
force-pushed
the
master
branch
3 times, most recently
from
June 24, 2020 09:23
b94b95c
to
ae3e356
Compare
prevent set compalintPeriod after award creation See merge request cdb/openprocurement.api!248
VDigitall
force-pushed
the
feature/e-contract
branch
from
July 1, 2020 16:37
d63a020
to
1adf7df
Compare
7849 ignore award complaint period belowthreshold:simple See merge request cdb/openprocurement.api!249
VDigitall
force-pushed
the
feature/e-contract
branch
2 times, most recently
from
July 10, 2020 08:59
bd45e85
to
d094e9d
Compare
VDigitall
force-pushed
the
feature/e-contract
branch
from
July 13, 2020 10:43
d094e9d
to
1547e86
Compare
8048 7849_bugfix deny contract sign before award activation date See merge request cdb/openprocurement.api!254
transaction structure implementation See merge request cdb/openprocurement.api!220
Fix cs 8046 See merge request cdb/openprocurement.api!253
Use working days for defense complaint period See merge request cdb/openprocurement.api!224
update .http files See merge request cdb/openprocurement.api!257
* Add value field to Item * Define Criterion model * Add field criteria to Tender * Update tests according changes
PriceQuotation See merge request cdb/openprocurement.api!245
* Allow with role bots upload contract documents * Validate relatedItem for documents uploaded by bots with document types `contract` and `contractData`
* Field `templateId` is allowed only for document with documentType `contractProforma` * Field `url` is not required for document with documentType `contractProforma` * Field `format` is not required for document with documentType `contracProforma` * Deny patch document with documentType `contractProforma`, allowed append new version of document instead.
VDigitall
force-pushed
the
feature/e-contract
branch
from
October 30, 2020 08:16
1547e86
to
af5fa22
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Концепція підписання договору у системі ProZorro
Workflow
contractProforma
з ідентифікатором шаблону для використанняtrBot
витягує шаблон, схему і рекомендовану форму з реєстру шаблонів Е-Контрактинг і завантажує якcontractTemplate
,contractSchema
icontractForm
документи, зв'язуючи з чернеткоюcontractProforma
documentType: contractData
зв'язуючи його з документомcontractProforma
rBot
генеруєcontractProforma
у форматі PDF на основіcontractTemplate
та даних зcontractData
, та завантажує як нову версію документаcontractProforma
contractSchema
таcontractForm
, валідують і отримують дані, та рендерять для відображення постачальникамcontractData
(яка містить інформацію про постачальника) зв’язану з чернеткоюcontractProforma
при подачі пропозиціїcontractData
(яка містить виправлену інформацію про замовника та/чи постачальника) документ доaward'y
, коли це дозволено процесом.rBot
генерує фінальний документ контрактуcontract
з повним набором данихcontractData
заповнених в шаблоніcontractTemplate
Зміни
Додано нові типи документів
ProzorroUKR-openprocurement.api/src/openprocurement/api/models.py
Lines 530 to 535 in d63a020
Додано полe
templateId
, яке можна заповнювати лише для документаcontractProforma
і новий типdocumentOf
для пов'язування документівProzorroUKR-openprocurement.api/src/openprocurement/tender/core/models.py
Lines 163 to 168 in d63a020
Додано групи та дозволи для ботів завантажувати документи до тендеру та контракту
ProzorroUKR-openprocurement.api/src/openprocurement/api/tests/auth.ini
Lines 49 to 53 in 1547e86
ProzorroUKR-openprocurement.api/src/openprocurement/tender/core/traversal.py
Lines 29 to 31 in 188b1f7
Додано/оновлено валідації для взаємодії з контрактами
validate_patch_document_contract_proforma
унеможливлює безпосереднє оновлення документаcontractProforma
validate_contract_supplier_role_for_contract_document_uploading
перевіряє тип і формат документів, які завантажує постачальникvalidate_relatedItem_for_contract_document_uploading
перевіряє відповідністьrelatedItem
до одного з документівПеревизначено тип документа для Контракта в процедурі CFASelectionUA
ProzorroUKR-openprocurement.api/src/openprocurement/tender/cfaselectionua/models/submodels/contract.py
Line 14 in d63a020