Merge pull request #755 from ivanka12/master

change generation deliveryDate and remove claim tags from argument files

@@ -453,10 +453,11 @@ def test_item_data(cpv=None):
     data["description"] = field_with_id("i", data["description"])
     data["description"] = field_with_id("i", data["description"])
     data["description_en"] = field_with_id("i", data["description_en"])
     data["description_en"] = field_with_id("i", data["description_en"])
     data["description_ru"] = field_with_id("i", data["description_ru"])
     data["description_ru"] = field_with_id("i", data["description_ru"])
-    days = fake.random_int(min=1, max=30)
+    startDate = fake.random_int(min=1, max=30)
+    endDate = startDate + fake.random_int(min=1, max=7)
     data["deliveryDate"] = {
     data["deliveryDate"] = {
-        "startDate": (get_now() + timedelta(days=days)).astimezone(TZ).isoformat(),
-        "endDate": (get_now() + timedelta(days=days)).astimezone(TZ).isoformat()
+        "startDate": (get_now() + timedelta(days=startDate)).replace(hour=0, minute=0, second=0, microsecond=0).isoformat(),
+        "endDate": (get_now() + timedelta(days=endDate)).replace(hour=0, minute=0, second=0, microsecond=0).isoformat()
     }
     }
     data["deliveryAddress"]["countryName_en"] = translate_country_en(data["deliveryAddress"]["countryName"])
     data["deliveryAddress"]["countryName_en"] = translate_country_en(data["deliveryAddress"]["countryName"])
     data["deliveryAddress"]["countryName_ru"] = translate_country_ru(data["deliveryAddress"]["countryName"])
     data["deliveryAddress"]["countryName_ru"] = translate_country_ru(data["deliveryAddress"]["countryName"])

@@ -42,16 +42,6 @@
 -i modify_tender_after_questions
 -i modify_tender_after_questions
 -i modify_lot_after_questions
 -i modify_lot_after_questions
 
 
--i create_tender_claim
-  -i answer_tender_claim
-  -i resolve_tender_claim
--i modify_tender_after_claim
-
--i create_lot_claim
-  -i answer_lot_claim
-  -i resolve_lot_claim
--i modify_lot_after_claim
-
 -i make_bid_without_related_lot
 -i make_bid_without_related_lot
 -i make_bid_by_provider
 -i make_bid_by_provider
   -i add_doc_to_bid_by_provider
   -i add_doc_to_bid_by_provider

@@ -40,16 +40,6 @@
 -i modify_tender_after_questions
 -i modify_tender_after_questions
 -i modify_lot_after_questions
 -i modify_lot_after_questions
 
 
--i create_tender_claim
-  -i answer_tender_claim
-  -i resolve_tender_claim
--i modify_tender_after_claim
-
--i create_lot_claim
-  -i answer_lot_claim
-  -i resolve_lot_claim
--i modify_lot_after_claim
-
 -i make_bid_without_related_lot
 -i make_bid_without_related_lot
 -i make_bid_without_parameters
 -i make_bid_without_parameters
 -i make_bid_by_provider
 -i make_bid_by_provider

@@ -42,12 +42,10 @@
 
 
 -i create_tender_claim
 -i create_tender_claim
   -i answer_tender_claim
   -i answer_tender_claim
-  -i resolve_tender_claim
 -i modify_tender_after_claim
 -i modify_tender_after_claim
 
 
 -i create_lot_claim
 -i create_lot_claim
   -i answer_lot_claim
   -i answer_lot_claim
-  -i resolve_lot_claim
 -i modify_lot_after_claim
 -i modify_lot_after_claim
 
 
 -i make_bid_without_related_lot
 -i make_bid_without_related_lot

@@ -42,12 +42,10 @@
 
 
 -i create_tender_claim
 -i create_tender_claim
   -i answer_tender_claim
   -i answer_tender_claim
-  -i resolve_tender_claim
 -i modify_tender_after_claim
 -i modify_tender_after_claim
 
 
 -i create_lot_claim
 -i create_lot_claim
   -i answer_lot_claim
   -i answer_lot_claim
-  -i resolve_lot_claim
 -i modify_lot_after_claim
 -i modify_lot_after_claim
 
 
 -i make_bid_without_related_lot
 -i make_bid_without_related_lot