arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 08:22:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix text on quote paperwork for external clients

Browse Source 
Actually finish fixing PDF footer formatting.
This commit is contained in:
Tom Price
2017-05-24 16:27:31 +01:00
parent 7fdafd854e
commit 7cb9e97ecb
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RIGS/templates/RIGS/event_print.xml
View File

@@ -119,7 +119,7 @@
<drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString> <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
<setFont name="OpenSans" size="7" /> <setFont name="OpenSans" size="7" />
<drawCenteredString x="302.5" y="26"> <drawCenteredString x="302.5" y="26">
[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}}]
</drawCenteredString> </drawCenteredString>
</pageGraphics> </pageGraphics>
<frame id="main" x1="50" y1="65" width="495" height="727"/> <frame id="main" x1="50" y1="65" width="495" height="727"/>

32
RIGS/templates/RIGS/event_print_page.xml
View File

@@ -207,16 +207,22 @@
<tr> <tr>
<td> <td>
{% if quote %} {% if quote %}
<para> <para>
<b>The full hire fee is payable at least 10 days before the event.</b> This quote is valid for 30 days unless otherwise arranged.
</para> </para>
{% endif %} {% endif %}
</td> </td>
<td>VAT @ {{ object.vat_rate.as_percent|floatformat:2 }}%</td> <td>VAT @ {{ object.vat_rate.as_percent|floatformat:2 }}%</td>
<td>£ {{ object.vat|floatformat:2 }}</td> <td>£ {{ object.vat|floatformat:2 }}</td>
</tr> </tr>
<tr> <tr>
<td></td> <td>
{% if quote %}
<para>
<b>The full hire fee is payable at least 10 days before the event.</b>
</para>
{% endif %}
</td>
{% if invoice %} {% if invoice %}
<td>Total</td> <td>Total</td>
<td>£ {{ object.total|floatformat:2 }}</td> <td>£ {{ object.total|floatformat:2 }}</td>
@@ -290,14 +296,22 @@
{% endif %} {% endif %}
<keepTogether> <keepTogether>
<blockTable style="infoTable"> <blockTable style="infoTable">>
{% if quote %} {% if quote %}
<tr><td><spacer length="15" /></td></tr>
<tr> <tr>
<td> <td>
<para>Bookings will {% if object.internal %}
<b>not</b> <para>Bookings will
be confirmed until the event is authorised online. <b>not</b>
</para> be confirmed until the event is authorised online.
</para>
{% else %}
<para>Bookings will
<b>not</b>
be confirmed until we have received written confirmation and a Purchase Order.
</para>
{% endif %}
</td> </td>
</tr> </tr>
<tr> <tr>