1 files changed, 16 insertions, 3 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index e3a53e5fa..c0beac524 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -73,11 +73,24 @@
 <p><label>{%trans "Associated file:"%}</label> <span class='value'><a href='#' onclick='load_window("{% url show-file item.associated_file.pk ''%}")'>{{ item.associated_file }}</a></span></p><!-- Displayed as Year/index/Commune/Common_name This should be a link to the file sheet of the related file -->
 {% if item.associated_file.is_preventive %}
 {#{% if item.operator_reference_code %}<p><label>{%trans "Operator's reference code:"%}</label> <span class='value'>{{ item.operator_reference_code }}</span></p>{% endif %}#}
-{% if item.associated_file.town_planning_service %}<p><label>{%trans "Town planning service:"%}</label> <span class='value'>{{ item.associated_file.town_planning_service }}</span></p>{% endif %}
+
+{% field "Responsible for town planning service" item.associated_file.responsible_town_planning_service.full_address %}
+{% if item.associated_file.town_planning_service %}
+  {% field "Town planning service organization" item.associated_file.town_planning_service.full_address %}
+{% else %}
+  {% field "Town planning service organization" item.associated_file.responsible_town_planning_service.attached_to.full_address %}
+{% endif %}
+
 {% if item.associated_file.permit_type %}<p><label>{%trans "Permit type:"%}</label> <span class='value'>{{ item.associated_file.permit_type }}</span></p>{% endif %}
 {% if item.associated_file.permit_reference %}<p><label>{%trans "Permit reference:"%}</label> <span class='value'>{{ item.associated_file.permit_reference }}</span></p>{% endif %}
-{% if item.associated_file.general_contractor.attached_to %}<p><label>{%trans "General contractor organisation:"%}</label> <span class='value'>{{ item.associated_file.general_contractor.attached_to }}</span></p>{% endif %} <!-- Contractor's organisation displayed as concat of Name/Adress/postal_code/city -->
-{% if item.associated_file.general_contractor %}<p><label>{%trans "General contractor:"%}</label> <span class='value'>{{ item.associated_file.general_contractor.full_label }}</span></p>{% endif %}
+
+{% field "General contractor" item.associated_file.general_contractor.full_address %}
+{% if item.associated_file.corporation_general_contractor %}
+  {% field "General contractor organization" item.associated_file.corporation_general_contractor.full_address %}
+{% else%}
+  {% field "General contractor organization" item.associated_file.general_contractor.attached_to.full_address %}
+{% endif %}
+
 {% endif %}
 {% endif %}