diff --git a/RIGS/models.py b/RIGS/models.py index 4687c9b3..d900be77 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -369,6 +369,9 @@ class Event(models.Model, RevisionMixin): @property def vat(self): + # No VAT is owed on internal transfers + if self.internal: + return 0 return Decimal(self.sum_total * self.vat_rate.rate).quantize(Decimal('.01')) """ diff --git a/RIGS/templates/event_print_page.xml b/RIGS/templates/event_print_page.xml index e8495af2..b3d7ecfa 100644 --- a/RIGS/templates/event_print_page.xml +++ b/RIGS/templates/event_print_page.xml @@ -190,19 +190,21 @@ {% endif %} - £ {{ item.cost|floatformat:2 }} + £{{ item.cost|floatformat:2 }} {{ item.quantity }} - £ {{ item.total_cost|floatformat:2 }} + £{{ item.total_cost|floatformat:2 }} {% endfor %} + {% if object.vat > 0 %} - {% if quote %}VAT Registration Number: 170734807{% endif %} - Total (ex. VAT) + {% if quote %}VAT Registration Number: 170734807 + Total (ex. VAT){% endif %} £ {{ object.sum_total|floatformat:2 }} + {% endif %} {% if quote %} @@ -211,8 +213,10 @@ {% endif %} + {% if object.vat > 0 %} VAT @ {{ object.vat_rate.as_percent|floatformat:2 }}% - £ {{ object.vat|floatformat:2 }} + £{{ object.vat|floatformat:2 }} + {% endif %} @@ -224,7 +228,7 @@ {% if invoice %} Total - £ {{ object.total|floatformat:2 }} + £{{ object.total|floatformat:2 }} {% else %} @@ -233,7 +237,7 @@ - £ {{ object.total|floatformat:2 }} + £{{ object.total|floatformat:2 }} {% endif %} @@ -267,7 +271,7 @@ {{ payment.get_method_display }} {{ payment.date }} - £ {{ payment.amount|floatformat:2 }} + £{{ payment.amount|floatformat:2 }} {% endfor %} @@ -275,18 +279,18 @@ Payment Total - £ {{ object.invoice.payment_total|floatformat:2 }} + £{{ object.invoice.payment_total|floatformat:2 }} - Balance (ex. VAT) + Balance {% if object.vat > 0 %}(ex. VAT){% endif %} - £ {{ object.invoice.balance|floatformat:2 }} + £{{ object.invoice.balance|floatformat:2 }} @@ -316,7 +320,7 @@ General Enquires and 24 Hour Emergency Contact: 0115 84 68720 - {% else %} + {% elif object.vat > 0 %} VAT Registration Number: 170734807 diff --git a/RIGS/templates/item_row.html b/RIGS/templates/item_row.html index fa4cf7ca..b71facd8 100644 --- a/RIGS/templates/item_row.html +++ b/RIGS/templates/item_row.html @@ -6,11 +6,11 @@ {% if perms.RIGS.view_event %} - £ {{item.cost|floatformat:2}} + £{{item.cost|floatformat:2}} {% endif %} {{item.quantity}} {% if perms.RIGS.view_event %} - £ {{item.total_cost|floatformat:2}} + £{{item.total_cost|floatformat:2}} {% endif %} {% if edit %} diff --git a/RIGS/templates/item_table.html b/RIGS/templates/item_table.html index 305ca335..50be6b84 100644 --- a/RIGS/templates/item_table.html +++ b/RIGS/templates/item_table.html @@ -27,12 +27,13 @@ {% endfor %} {% if auth or perms.RIGS.view_event %} - + - Total (ex. VAT) - £ {{object.sum_total|default:0|floatformat:2}} + Total {% if object.vat > 0 or not object.pk %}(ex. VAT){% endif %} + £{{object.sum_total|default:0|floatformat:2}} + {% if object.vat > 0 or not object.pk %} {% if not object.pk %} VAT @ @@ -41,12 +42,13 @@ VAT @ {{object.vat_rate.as_percent|floatformat|default:"TBD"}}% {% endif %} - £ {{object.vat|default:0|floatformat:2}} + £{{object.vat|default:0|floatformat:2}} Total - £ {{object.total|default:0|floatformat:2}} + £{{object.total|default:0|floatformat:2}} + {% endif %} {% endif %} @@ -59,9 +61,9 @@ - £  + £ - £  + £ {% if edit %}