Merge branch 'a423717924883673_701_award_cancelled'

openprocurement · Sep 7, 2017 · acb70e3 · acb70e3
2 parents 50c48fa + 7c9cb0c
commit acb70e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/openprocurement/tender/openua/views/award.py b/openprocurement/tender/openua/views/award.py
@@ -135,12 +135,14 @@ def patch(self):
                 tender.status = 'active.qualification'
                 tender.awardPeriod.endDate = None
             now = get_now()
-            award.complaintPeriod.endDate = now
+            if award.complaintPeriod.endDate > now:
+                award.complaintPeriod.endDate = now
             cancelled_awards = []
             for i in tender.awards:
                 if i.lotID != award.lotID:
                     continue
-                i.complaintPeriod.endDate = now
+                if not i.complaintPeriod.endDate or i.complaintPeriod.endDate > now:
+                    i.complaintPeriod.endDate = now
                 i.status = 'cancelled'
                 cancelled_awards.append(i.id)
             for i in tender.contracts:

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