Merge remote-tracking branch 'origin/a224682041144054_complaint_leave…

…_unsatisfied'
openprocurement · Dec 5, 2016 · aba451e · aba451e
2 parents 75563d7 + 4591484
commit aba451e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/docs/source/complaints.rst b/docs/source/complaints.rst
@@ -30,7 +30,7 @@ Tender Award Complaints
         {pending,accepted} -> stopping;
         edge[style=bold];
         pending -> {accepted,invalid};
-        stopping -> {stopped,invalid};
+        stopping -> {stopped,invalid,declined};
         accepted -> {declined,satisfied,stopped};
         {pending;stopping} -> mistaken;
     }

diff --git a/openprocurement/tender/limited/tests/tender.py b/openprocurement/tender/limited/tests/tender.py
@@ -904,7 +904,6 @@ def test_field_relatedLot(self):
         data = deepcopy(self.initial_data)
         data['items'][0]['relatedLot'] = uuid4().hex
         response = self.app.post_json(request_path, {'data':data}, status=422)
-        print response
         self.assertEqual(response.status, '422 Unprocessable Entity')
         self.assertEqual(response.content_type, 'application/json')
         self.assertEqual(response.json['status'], 'error')

diff --git a/openprocurement/tender/limited/views/award_complaint.py b/openprocurement/tender/limited/views/award_complaint.py
@@ -125,6 +125,9 @@ def patch(self):
         elif self.request.authenticated_role == 'aboveThresholdReviewers' and self.context.status == 'accepted' and data.get('status', self.context.status) in ['declined', 'satisfied']:
             apply_patch(self.request, save=False, src=self.context.serialize())
             self.context.dateDecision = get_now()
+        elif self.request.authenticated_role == 'aboveThresholdReviewers' and self.context.status == 'stopping' and data.get('status', self.context.status) in 'declined':
+            apply_patch(self.request, save=False, src=self.context.serialize())
+            self.context.dateDecision = get_now()
         elif self.request.authenticated_role == 'aboveThresholdReviewers' and self.context.status in ['accepted', 'stopping'] and data.get('status', self.context.status) == 'stopped':
             apply_patch(self.request, save=False, src=self.context.serialize())
             self.context.dateDecision = get_now()

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