Merge branch 'master' into master_new

@@ -53,6 +53,9 @@ Default:
              tender:  [0, 30]
         framework_selection:
              accelerator: 360
+        open_simple_defense:
+             accelerator: 1440
+             tender:  [0, 10]
     # Synchronization delay, in seconds
     timeout_on_wait: 300
 Quinta:
@@ -83,6 +86,9 @@ Quinta:
         priceQuotation:
             tender:  [0, 15]
             accelerator: 1440
+        open_simple_defense:
+             accelerator: 1440
+             tender:  [0, 10]
     keywords_file: openprocurement_client
     roles:
         provider:       Tender_User

@@ -24,7 +24,7 @@ fake = fake_uk
 used_identifier_id = []
 mode_open = ["belowThreshold", "aboveThresholdUA", "aboveThresholdEU",
              "aboveThresholdUA.defense", "competitiveDialogueUA", "competitiveDialogueEU", "esco",
-             "closeFrameworkAgreementUA"]
+             "closeFrameworkAgreementUA", "simple.defense"]
 mode_limited = ["reporting", "negotiation.quick", "negotiation"]
 mode_selective = ["priceQuotation"]
 violationType = ["corruptionDescription", "corruptionProcurementMethodType", "corruptionChanges",
@@ -332,7 +332,7 @@ def test_tender_data_planning(params):
         "buyers": []
     }
     data["procuringEntity"]["name"] = data["procuringEntity"]["identifier"]["legalName"]
-    if params.get("mode") == "aboveThresholdUA.defense":
+    if params.get("mode") in ["aboveThresholdUA.defense", "simple.defense"]:
         data["procuringEntity"]["kind"] = "defense"
     elif params.get("mode") in ["belowThreshold", "reporting"]:
         data["procuringEntity"]["kind"] = "other"
@@ -849,9 +849,9 @@ def test_change_document_data(document, change_id):
 
 
 def test_tender_data_openua(params, submissionMethodDetails, plan_data):
-    # We should not provide any values for `enquiryPeriod` when creating
-    # an openUA or openEU procedure. That field should not be present at all.
-    # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
+    """We should not provide any values for `enquiryPeriod` when creating
+    an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all.
+    Therefore, we pass a nondefault list of periods to `test_tender_data()`."""
     data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
     data['procurementMethodType'] = 'aboveThresholdUA'
     data['procuringEntity']['kind'] = 'general'
@@ -869,9 +869,9 @@ def test_tender_data_openua_defense(params, submissionMethodDetails, plan_data):
 
 
 def test_tender_data_openeu(params, submissionMethodDetails, plan_data):
-    # We should not provide any values for `enquiryPeriod` when creating
-    # an openUA or openEU procedure. That field should not be present at all.
-    # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
+    """We should not provide any values for `enquiryPeriod` when creating
+    an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all.
+    Therefore, we pass a nondefault list of periods to `test_tender_data()`."""
     data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
     data['procurementMethodType'] = 'aboveThresholdEU'
     data['title_en'] = "[TESTING]"
@@ -899,9 +899,9 @@ def test_tender_data_framework_agreement(params, submissionMethodDetails, plan_d
 
 
 def test_tender_data_competitive_dialogue(params, submissionMethodDetails, plan_data):
-    # We should not provide any values for `enquiryPeriod` when creating
-    # an openUA or openEU procedure. That field should not be present at all.
-    # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
+    """We should not provide any values for `enquiryPeriod` when creating
+    an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all.
+    Therefore, we pass a nondefault list of periods to `test_tender_data()`."""
     data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
     if params.get('dialogue_type') == 'UA':
         data['procurementMethodType'] = 'competitiveDialogueUA'
@@ -934,6 +934,16 @@ def test_tender_data_selection(procedure_intervals, params, submissionMethodDeta
     return munchify({'data': data})
 
 
+def test_tender_data_simple_defense(params, submissionMethodDetails, plan_data):
+    """We should not provide any values for `enquiryPeriod` when creating
+    an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all.
+    Therefore, we pass a nondefault list of periods to `test_tender_data()`."""
+    data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
+    data['procurementMethodType'] = 'simple.defense'
+    data['procuringEntity']['kind'] = 'defense'
+    return data
+
+
 def test_change_data():
     return munchify(
         {

@@ -94,7 +94,8 @@ from .initial_data import (
     test_data_bid_criteria,
     test_bid_criteria,
     test_qualification_criteria,
-    test_awards_criteria
+    test_awards_criteria,
+    test_tender_data_simple_defense
 )
 from barbecue import chef
 from restkit import request
@@ -388,6 +389,9 @@ def prepare_test_tender_data(procedure_intervals,
             tender_parameters, submissionMethodDetails, plan_data)})
     elif mode == 'priceQuotation':
         return munchify({'data': test_tender_data_pq(tender_parameters, submissionMethodDetails, plan_data)})
+    elif mode == "open_simple_defense":
+        return munchify({'data': test_tender_data_simple_defense(
+            tender_parameters, submissionMethodDetails, plan_data)})
 
         # The previous line needs an explicit keyword argument because,
         # unlike previous functions, this one has three arguments.
@@ -644,7 +648,8 @@ def generate_test_bid_data(tender_data, edrpou=None):
         bid = test_bid_competitive_data()
         bid.data.selfQualified = True
     elif tender_data.get('procurementMethodType', '') in (
-            'aboveThresholdUA.defense'):
+            'aboveThresholdUA.defense',
+            'simple.defense'):
         bid = test_bid_competitive_data()
         bid.data.selfEligible = True
         bid.data.selfQualified = True

+-v MODE:open_simple_defense
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:True
+-v ITEM_MEAT:False
+-v LOT_MEAT:False
+
+-i create_tender
+-i find_tender
+-i tender_view
+-i tender_view_milestone
+-i tender_view_value
+-i tender_view_minimalStep
+-i tender_view_deliveryDate
+-i tender_view_quantity
+-i tender_view_unit_name
+-i meat_view
+-i lot_view
+-i lot_view_value
+-i lot_view_minimalStep
+-i open_tender_view
+
+-i extend_tendering_period
+-i add_tender_doc
+-i modify_lot_value_amount
+
+-i add_tender_meat
+  -i delete_tender_meat
+
+-i ask_question_to_tender
+-i answer_question_after_clarifications_period
+
+-i modify_tender_after_questions
+
+-i make_bid_by_provider
+  -i modify_bid_by_provider
+  -i add_doc_to_bid_by_provider
+-i make_bid_by_provider1
+
+-i open_confirm_first_bid
+-i open_confirm_second_bid
+
+-i ask_question_to_tender_after_tendering_period
+
+-i auction
+
+-i qualification_add_doc_to_first_award
+-i qualification_approve_first_award
+
+-i contract_stand_still
+-i contract_view
+-i contract_view_dateSigned
+-i modify_contract_amount_net
+-i modify_contract_value
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
\ No newline at end of file

+-v MODE:open_simple_defense
+
+-v NUMBER_OF_ITEMS:1
+-v NUMBER_OF_LOTS:1
+
+-v TENDER_MEAT:True
+-v ITEM_MEAT:False
+-v LOT_MEAT:False
+
+-i create_tender
+-i find_tender
+-i tender_view
+-i tender_view_milestone
+-i tender_view_value
+-i tender_view_minimalStep
+-i tender_view_deliveryDate
+-i tender_view_quantity
+-i tender_view_unit_name
+-i meat_view
+-i lot_view
+-i lot_view_value
+-i lot_view_minimalStep
+-i open_tender_view
+
+-i extend_tendering_period
+-i add_tender_doc
+-i modify_lot_value_amount
+
+-i add_tender_meat
+  -i delete_tender_meat
+
+-i ask_question_to_tender
+-i answer_question_after_clarifications_period
+
+-i modify_tender_after_questions
+
+-i make_bid_by_provider
+  -i modify_bid_by_provider
+  -i add_doc_to_bid_by_provider
+
+  -i open_confirm_first_bid
+
+-i ask_question_to_tender_after_tendering_period
+
+-i qualification_add_doc_to_first_award
+-i qualification_approve_first_award
+
+-i contract_stand_still
+-i contract_view
+-i contract_view_dateSigned
+-i modify_contract_amount_net
+-i modify_contract_value
+-i modify_contract
+-i add_doc_to_contract
+-i contract_doc_documentOf
+-i contract_sign
\ No newline at end of file