Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/a312905574509110_docs_generator_…
Browse files Browse the repository at this point in the history
…fix'
  • Loading branch information
vmaksymiv committed Apr 26, 2017
2 parents b68d226 + feb2014 commit eae2784
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion openprocurement/tender/limited/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def unit_valueAddedTaxIncluded(self):
value = context.get("value", {})
return value.get("valueAddedTaxIncluded", None)


class Unit(BaseUnit):
value = ModelType(Value)

Expand Down Expand Up @@ -408,7 +409,7 @@ def initialize(self):
if self.lots:
for lot in self.lots:
lot.date = get_now()

NegotiationTender = Tender


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.23'
version = '2.3.25'

requires = [
'setuptools',
Expand Down

0 comments on commit eae2784

Please sign in to comment.