diff --git a/RIGS/templates/RIGS/event_print.xml b/RIGS/templates/RIGS/event_print.xml index 0b5a44b1..f91409ac 100644 --- a/RIGS/templates/RIGS/event_print.xml +++ b/RIGS/templates/RIGS/event_print.xml @@ -119,7 +119,7 @@ [Page of ] - [Paperwork generated {% if current_user %}by{{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}] + [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}] diff --git a/RIGS/templates/RIGS/event_print_page.xml b/RIGS/templates/RIGS/event_print_page.xml index 9b8362eb..4b1ddfdf 100644 --- a/RIGS/templates/RIGS/event_print_page.xml +++ b/RIGS/templates/RIGS/event_print_page.xml @@ -207,16 +207,22 @@ {% if quote %} - - The full hire fee is payable at least 10 days before the event. - + + This quote is valid for 30 days unless otherwise arranged. + {% endif %} VAT @ {{ object.vat_rate.as_percent|floatformat:2 }}% £ {{ object.vat|floatformat:2 }} - + + {% if quote %} + + The full hire fee is payable at least 10 days before the event. + + {% endif %} + {% if invoice %} Total £ {{ object.total|floatformat:2 }} @@ -290,14 +296,22 @@ {% endif %} - + > {% if quote %} + - Bookings will - not - be confirmed until the event is authorised online. - + {% if object.internal %} + Bookings will + not + be confirmed until the event is authorised online. + + {% else %} + Bookings will + not + be confirmed until we have received written confirmation and a Purchase Order. + + {% endif %}