From 1b1c0a8065bc1fc1dacad6e654b4f449211c9a84 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Tue, 12 Jul 2016 23:32:05 +0200 Subject: [PATCH] use |linebreaks templatefilter --- shop/models.py | 2 +- shop/templates/pdf/custominvoice.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shop/models.py b/shop/models.py index 0ed28d3b..b3efe38e 100644 --- a/shop/models.py +++ b/shop/models.py @@ -27,7 +27,7 @@ class CustomOrder(CreatedUpdatedModel): ) customer = models.TextField( - help_text=_('The customer info for this order, use
for newlines') + help_text=_('The customer info for this order') ) amount = models.IntegerField( diff --git a/shop/templates/pdf/custominvoice.html b/shop/templates/pdf/custominvoice.html index 389508e3..20b406d1 100644 --- a/shop/templates/pdf/custominvoice.html +++ b/shop/templates/pdf/custominvoice.html @@ -8,13 +8,13 @@

{{ invoice.created|date:"b jS, Y" }}
- Order CU#{{ invoice.customorder.pk }}
+ Custom Order #{{ invoice.customorder.pk }}
Invoice #{{ invoice.pk }}

-

Customer: {{ invoice.customorder.customer }}

+

Customer: {{ invoice.customorder.customer|linebreaks }}


INVOICE

@@ -25,7 +25,7 @@ Price
- {{ invoice.customorder.text }} + {{ invoice.customorder.text|linebreaks }} {{ invoice.customorder.amount|currency }}