Merge remote-tracking branch 'origin/a224682041144054_complaint_leave…

…_unsatisfied'
openprocurement · Dec 5, 2016 · 4b4e6ec · 4b4e6ec
2 parents e54dab6 + 28d1803
commit 4b4e6ec
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/docs/source/complaints.rst b/docs/source/complaints.rst
@@ -40,7 +40,7 @@ Tender Conditions Claims/Complaints
         edge[style=bold];
         accepted -> {declined,satisfied,stopped};
         pending -> {accepted,invalid};
-        stopping -> {stopped,invalid};
+        stopping -> {stopped,invalid,declined};
         {pending;stopping} -> mistaken;
         edge[label="auction" style=dotted];
         answered -> {invalid,declined,resolved};
@@ -76,7 +76,7 @@ Tender Award Claims/Complaints
         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/openua/views/award_complaint.py b/openprocurement/tender/openua/views/award_complaint.py
@@ -144,6 +144,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) == '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/openprocurement/tender/openua/views/complaint.py b/openprocurement/tender/openua/views/complaint.py
@@ -159,6 +159,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) == '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.15'
+version = '2.3.18'
 
 requires = [
     'setuptools',