Merge branch 'a158515627059482_stopping2invalid'

openprocurement · Jul 22, 2016 · 705e854 · 705e854
2 parents d94af8b + 9f7ccc1
commit 705e854
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/docs/source/complaints.rst b/docs/source/complaints.rst
@@ -36,9 +36,9 @@ Tender Conditions Claims/Complaints
         pending -> stopping;
         accepted -> stopping;
         edge[style=bold];
-        pending -> {accepted,invalid};
         accepted -> {declined,satisfied,stopped};
-        stopping -> stopped;
+        pending -> {accepted,invalid};
+        stopping -> {stopped,invalid};
         edge[label="auction" style=dotted];
         answered -> {invalid,declined,resolved};
     }
@@ -66,7 +66,7 @@ Tender Award Complaints
         accepted -> stopping;
         edge[style=bold];
         pending -> {accepted,invalid};
-        stopping -> stopped;
+        stopping -> {stopped,invalid};
         accepted -> {declined,satisfied,stopped};
     }
 

diff --git a/openprocurement/tender/openua/views/award_complaint.py b/openprocurement/tender/openua/views/award_complaint.py
@@ -111,7 +111,7 @@ def patch(self):
         # aboveThresholdReviewers
         elif self.request.authenticated_role == 'aboveThresholdReviewers' and self.context.status in ['pending', 'accepted', 'stopping'] and data.get('status', self.context.status) == self.context.status:
             apply_patch(self.request, save=False, src=self.context.serialize())
-        elif self.request.authenticated_role == 'aboveThresholdReviewers' and self.context.status == 'pending' and data.get('status', self.context.status) == 'invalid':
+        elif self.request.authenticated_role == 'aboveThresholdReviewers' and self.context.status in ['pending', 'stopping'] and data.get('status', self.context.status) == 'invalid':
             apply_patch(self.request, save=False, src=self.context.serialize())
             self.context.dateDecision = get_now()
             self.context.acceptance = False

diff --git a/openprocurement/tender/openua/views/complaint.py b/openprocurement/tender/openua/views/complaint.py
@@ -148,7 +148,7 @@ def patch(self):
         # aboveThresholdReviewers
         elif self.request.authenticated_role == 'aboveThresholdReviewers' and self.context.status in ['pending', 'accepted', 'stopping'] and data.get('status', self.context.status) == self.context.status:
             apply_patch(self.request, save=False, src=self.context.serialize())
-        elif self.request.authenticated_role == 'aboveThresholdReviewers' and self.context.status == 'pending' and data.get('status', self.context.status) == 'invalid':
+        elif self.request.authenticated_role == 'aboveThresholdReviewers' and self.context.status in ['pending', 'stopping'] and data.get('status', self.context.status) == 'invalid':
             apply_patch(self.request, save=False, src=self.context.serialize())
             self.context.dateDecision = get_now()
             self.context.acceptance = False