Merge remote-tracking branch 'origin/ICMSLST-1350' into ICMSLST-1350

web/templates/web/domains/case/import/fa/provide-report/report-info.html

@@ -57,14 +57,7 @@ <h3>Complete Supplementary Reporting</h3>
 
     {{ application_field(process.supplementary_info.completed_by, "Report Completed By") }}
     {{ application_field(process.supplementary_info.completed_datetime.strftime('%d-%b-%Y'), "Date Reporting Completed") }}
-  {% else %}
-    <div class="info-box info-box-info">
-      You must provide the details of who you bought the items from and one or more firearms
-      reports before you can complete reporting. Each report must include the means of transport,
-      the date the firearms were received and the details of who you bought the items from.
-      Once reporting has been completed you will still be able to access and update the reports from your application.
-    </div>
-
+  {% endif %}
     {% call forms.form(action='', method='post', csrf_input=csrf_input) -%}
       <div class="modal-popover-container hidden">
         <div class="modal-popover regular-popover" tabindex="0">
@@ -89,15 +82,15 @@ <h2 id="engine-modal-popover-title">Complete Supplementary Reporting Information
           </div>
         </div>
       </div>
-
-      {% if not process.supplementary_info.reports.exists() %}
+      {% if not process.supplementary_info.reports.exists() and not contacts %}
+	      <div class="info-box info-box-info">
+		      If you are not importing any firearms against this import licence then please specify why in the text box and then confirm reporting complete.
+		    </div>
         {{ fields.field(form.no_report_reason) }}
       {% endif %}
     {%- endcall %}
 
     <button type="button" onclick="$('.modal-popover-container').show()" class="button primary-button">
       Confirm Reporting Complete
     </button>
-
-  {% endif %}
 {% endblock %}