Merge branch 'a164800652922449_complains_mistaken'

openprocurement · Aug 8, 2016 · 34e15f7 · 34e15f7
2 parents 2dddb17 + 6c58176
commit 34e15f7
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
@@ -18,6 +18,8 @@ Tender Conditions Claims/Complaints
 .. graphviz::
 
     digraph G {
+        rankdir=LR;
+        {rank=same; mistaken; invalid; resolved; declined; stopped; cancelled;}
         subgraph cluster_claim {
             label = "claim";
             claim; answered;
@@ -39,6 +41,7 @@ Tender Conditions Claims/Complaints
         accepted -> {declined,satisfied,stopped};
         pending -> {accepted,invalid};
         stopping -> {stopped,invalid};
+        {pending;stopping} -> mistaken;
         edge[label="auction" style=dotted];
         answered -> {invalid,declined,resolved};
     }
@@ -54,6 +57,8 @@ Tender Award Claims/Complaints
 .. graphviz::
 
     digraph G {
+        rankdir=LR;
+        {rank=same; mistaken; invalid; resolved; declined; stopped; cancelled;}
         subgraph cluster_complaint {
             label = "complaint";
             pending; accepted; stopping; satisfied;
@@ -73,6 +78,7 @@ Tender Award Claims/Complaints
         pending -> {accepted,invalid};
         stopping -> {stopped,invalid};
         accepted -> {declined,satisfied,stopped};
+        {pending;stopping} -> mistaken;
     }
 
 .. toctree::

diff --git a/openprocurement/tender/openua/views/award_complaint.py b/openprocurement/tender/openua/views/award_complaint.py
@@ -125,7 +125,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 in ['pending', 'stopping'] 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) in ['invalid', 'mistaken']:
             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 in ['pending', 'stopping'] 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) in ['invalid', 'mistaken']:
             apply_patch(self.request, save=False, src=self.context.serialize())
             self.context.dateDecision = get_now()
             self.context.acceptance = False

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