diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html index 9bec1384..6a16b17d 100644 --- a/RIGS/templates/RIGS/event_detail.html +++ b/RIGS/templates/RIGS/event_detail.html @@ -21,7 +21,7 @@ {% if event.is_rig %} - {% endif %} {% if event.is_rig %} - {% endif %} +<<<<<<< HEAD {% if event.is_rig %} {% endif %} +======= + +>>>>>>> master {% if event.is_rig %} diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html index c3b42807..814b04d0 100644 --- a/RIGS/templates/RIGS/event_invoice.html +++ b/RIGS/templates/RIGS/event_invoice.html @@ -53,8 +53,8 @@ - - + + diff --git a/RIGS/templates/RIGS/item_table.html b/RIGS/templates/RIGS/item_table.html index 7d5e701f..e5b93d91 100644 --- a/RIGS/templates/RIGS/item_table.html +++ b/RIGS/templates/RIGS/item_table.html @@ -25,7 +25,7 @@ - Sum Total + Total (ex. VAT) £ {{object.sum_total|default:0|floatformat:2}}