Merge branch 'a312620117236937_block_cpv' into dev

openprocurement · May 31, 2017 · abe0854 · abe0854
2 parents d32eab5 + 2541587
commit abe0854
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/docs.py b/docs.py
@@ -609,7 +609,7 @@ def test_docs(self):
 
         with open('docs/source/tutorial/tender-negotiation-quick-award-approve.http', 'w') as self.app.file_obj:
             response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
-                    self.tender_id, self.award_id, owner_token), {'data': {'status': 'active'}})
+                    self.tender_id, self.award_id, owner_token), {'data': {'status': 'active', 'qualified': True}})
             self.assertEqual(response.status, '200 OK')
 
         # get contract
@@ -644,7 +644,7 @@ def test_award_complaints(self):
         self.assertEqual(response.status, '201 Created')
         award_id = response.json['data']['id']
 
-        self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(self.tender_id, award_id, owner_token), {"data": {"status": "active"}})
+        self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(self.tender_id, award_id, owner_token), {"data": {"status": "active", "qualified": True}})
 
         with open('docs/source/tutorial/award-complaint-submission.http', 'w') as self.app.file_obj:
             response = self.app.post_json('/tenders/{}/awards/{}/complaints'.format(self.tender_id, award_id), complaint)
@@ -754,7 +754,7 @@ def test_award_complaints(self):
             response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(self.tender_id, award_id, owner_token), {"data": {
                 "status": "cancelled"}})
             self.assertEqual(response.status, '200 OK')
-        
+
         with open('docs/source/tutorial/award-complaint-newaward.http', 'w') as self.app.file_obj:
             response = self.app.post_json('/tenders/{}/awards?acc_token={}'.format(self.tender_id, owner_token), supplier)
             self.assertEqual(response.status, '201 Created')
@@ -786,7 +786,7 @@ def test_award_complaints(self):
         award_id = new_award_id
 
         self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(self.tender_id, award_id, owner_token), {"data": {
-            "status": "active"}})
+            "status": "active", "qualified": True}})
         self.assertEqual(response.status, '200 OK')
 
         with open('docs/source/tutorial/award-complaint-submit.http', 'w') as self.app.file_obj:

diff --git a/openprocurement/tender/limited/models.py b/openprocurement/tender/limited/models.py
@@ -61,6 +61,7 @@ def unit_valueAddedTaxIncluded(self):
         value = context.get("value", {})
         return value.get("valueAddedTaxIncluded", None)
 
+
 class Unit(BaseUnit):
     value = ModelType(Value)
 
@@ -73,6 +74,7 @@ class Options:
                  'edit_contract': whitelist('unit')
                 }
 
+
 class Item(BaseItem):
 
     def validate_relatedLot(self, data, relatedLot):
@@ -408,7 +410,7 @@ def initialize(self):
         if self.lots:
             for lot in self.lots:
                 lot.date = get_now()
-                
+
 NegotiationTender = Tender
 
 

diff --git a/openprocurement/tender/limited/tests/tender.py b/openprocurement/tender/limited/tests/tender.py
@@ -779,7 +779,7 @@ def test_patch_tender(self):
         self.assertEqual(len(response.json['data']['items']), 1)
 
         response = self.app.patch_json('/tenders/{}?acc_token={}'.format(tender['id'], owner_token), {'data': {'items': [{"classification": {
-            "scheme": "CPV",
+            "scheme": "ДК021",
             "id": "55523100-3",
             "description": "Послуги з харчування у школах"
         }}]}})

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '2.3.23'
+version = '2.3.25'
 
 requires = [
     'setuptools',