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

Fix paperwork printing

Browse Source
This commit is contained in:
David Taylor
2017-05-10 20:25:41 +01:00
parent 38a8ac1eb4
commit 0d726b2b60
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RIGS/finance.py
View File

@@ -55,8 +55,8 @@ class InvoicePrint(generic.View):
invoice = get_object_or_404(models.Invoice, pk=pk) invoice = get_object_or_404(models.Invoice, pk=pk)
object = invoice.event object = invoice.event
template = get_template('RIGS/event_print.xml') template = get_template('RIGS/event_print.xml')
copies = ('TEC', 'Client')
context = RequestContext(request, { context = {
'object': object, 'object': object,
'fonts': { 'fonts': {
'opensans': { 'opensans': {
@@ -66,7 +66,7 @@ class InvoicePrint(generic.View):
}, },
'invoice': invoice, 'invoice': invoice,
'current_user': request.user, 'current_user': request.user,
}) }
rml = template.render(context) rml = template.render(context)
buffer = StringIO.StringIO() buffer = StringIO.StringIO()

11
RIGS/rigboard.py
View File

@@ -136,6 +136,7 @@ class EventDuplicate(EventUpdate):
context["duplicate"] = True context["duplicate"] = True
return context return context
class EventPrint(generic.View): class EventPrint(generic.View):
def get(self, request, pk): def get(self, request, pk):
object = get_object_or_404(models.Event, pk=pk) object = get_object_or_404(models.Event, pk=pk)
@@ -144,9 +145,9 @@ class EventPrint(generic.View):
merger = PdfFileMerger() merger = PdfFileMerger()
for copy in copies: for thisCopy in copies:
context = RequestContext(request, { # this should be outside the loop, but bug in 1.8.2 prevents this context = { # this should be outside the loop, but bug in 1.8.2 prevents this
'object': object, 'object': object,
'fonts': { 'fonts': {
'opensans': { 'opensans': {
@@ -154,9 +155,9 @@ class EventPrint(generic.View):
'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF', 'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
} }
}, },
'copy':copy, 'copy': thisCopy,
'current_user':request.user, 'current_user': request.user,
}) }
# context['copy'] = copy # this is the way to do it once we upgrade to Django 1.8.3 # context['copy'] = copy # this is the way to do it once we upgrade to Django 1.8.3