Skip to content

Commit

Permalink
Merge branch 'a157335104845450_next_check'
Browse files Browse the repository at this point in the history
  • Loading branch information
kroman0 committed Aug 15, 2016
2 parents 66ed1fd + c9b1bad commit 8c630e5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions openprocurement/tender/limited/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from openprocurement.api.models import ProcuringEntity as BaseProcuringEntity
from openprocurement.tender.openua.models import Complaint as BaseComplaint
from openprocurement.tender.openua.models import Item
from openprocurement.tender.openua.models import Tender as OpenUATender


class Complaint(BaseComplaint):
Expand Down Expand Up @@ -168,6 +169,7 @@ class Options:
create_accreditation = 1
edit_accreditation = 2
procuring_entity_kinds = ['general', 'special', 'defense', 'other']
block_complaint_status = OpenUATender.block_complaint_status

__parent__ = None
__name__ = ''
Expand Down
3 changes: 1 addition & 2 deletions openprocurement/tender/limited/views/contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
validate_patch_contract_data,
)
from openprocurement.api.views.contract import TenderAwardContractResource as BaseTenderAwardContractResource
from openprocurement.tender.openua.utils import PENDING_COMPLAINT_STATUS


def check_tender_status(request):
Expand Down Expand Up @@ -120,7 +119,7 @@ def patch(self):
self.request.errors.status = 403
return
if any([
i.status in PENDING_COMPLAINT_STATUS
i.status in tender.block_complaint_status
for a in tender.awards
for i in a.complaints
]):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os

version = '2.3.10'
version = '2.3.12'

requires = [
'setuptools',
Expand Down

0 comments on commit 8c630e5

Please sign in to comment.