Add conference date to prepaid vouchers invoice

Do this by removing the word "prepaid" from the title of the invoice to
make it more likely to fit. Instead, add it to the individual invoice
rows where there should be more space available.

diff --git a/postgresqleu/confsponsor/invoicehandler.py b/postgresqleu/confsponsor/invoicehandler.py
index c74f19294a8fe75c85a207b512fa5399edc83f20..b8145c99d4448521579636b51c9e94bb5b7954d4 100644 (file)
--- a/postgresqleu/confsponsor/invoicehandler.py
+++ b/postgresqleu/confsponsor/invoicehandler.py
@@ -296,7 +296,7 @@ class VoucherInvoiceProcessor(object):
 # Generate an invoice for prepaid vouchers
 def create_voucher_invoice(conference, invoiceaddr, user, rt, num):
     invoicerows = [
-        ['Voucher for "%s"' % rt.regtype, 1, rt.cost, rt.conference.vat_registrations]
+        ['Prepaid voucher for "%s"' % rt.regtype, 1, rt.cost, rt.conference.vat_registrations]
     ] * num
 
     manager = InvoiceManager()
@@ -306,7 +306,7 @@ def create_voucher_invoice(conference, invoiceaddr, user, rt, num):
         user.email,
         user.first_name + ' ' + user.last_name,
         invoiceaddr,
-        'Prepaid vouchers for %s' % conference.conferencename,
+        'Vouchers for %s' % conference.name_and_date,
         timezone.now(),
         timezone.now(),
         invoicerows,