audrius/reporting-engine
1
0
Fork 1
mirror of https://github.com/OCA/reporting-engine.git synced 2025-02-16 16:30:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Style cleanup

Browse Source
This commit is contained in:
Daniel Reis
2015-10-08 18:07:42 +01:00
parent c38632cef1
commit 4259ce088e
7 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
base_report_assembler/report_assembler.py
View File

@@ -37,13 +37,13 @@ def assemble_pdf(pdf_list):
# Even though we are using PyPDF2 we can't use PdfFileMerger
# as this issue still exists in mostly used wktohtml reports version
# http://code.google.com/p/wkhtmltopdf/issues/detail?id=635
#merger = PdfFileMerger()
#merger.append(fileobj=StringIO(invoice_pdf))
#merger.append(fileobj=StringIO(bvr_pdf))
# merger = PdfFileMerger()
# merger.append(fileobj=StringIO(invoice_pdf))
# merger.append(fileobj=StringIO(bvr_pdf))
#with tempfile.TemporaryFile() as merged_pdf:
#merger.write(merged_pdf)
#return merged_pdf.read(), 'pdf'
# with tempfile.TemporaryFile() as merged_pdf:
# merger.write(merged_pdf)
# return merged_pdf.read(), 'pdf'
output = PdfFileWriter()
for pdf in pdf_list:
@@ -93,7 +93,8 @@ class PDFReportAssembler(report_sxw.report_sxw):
report_ids = self._get_report_ids(cr, uid, ids, context=context)
pdf_reports = self._generate_all_pdf(cr, uid, ids, data, report_ids, context=context)
pdf_reports = self._generate_all_pdf(
cr, uid, ids, data, report_ids, context=context)
pdf_assemblage = assemble_pdf(pdf_reports)
return pdf_assemblage, 'pdf'
@@ -103,8 +104,10 @@ class PDFReportAssembler(report_sxw.report_sxw):
Code taken from report openoffice. Thanks guys :) """
pool = pooler.get_pool(cr.dbname)
ir_obj = pool.get('ir.actions.report.xml')
report_xml_ids = ir_obj.search(cr, uid,
[('report_name', '=', self.name[7:])], context=context)
report_xml_ids = ir_obj.search(
cr, uid,
[('report_name', '=', self.name[7:])],
context=context)
if report_xml_ids:
report_xml = ir_obj.browse(cr,
@@ -117,10 +120,13 @@ class PDFReportAssembler(report_sxw.report_sxw):
report_xml.report_sxw_content = None
report_xml.report_sxw = None
else:
return super(PDFReportAssembler, self).create(cr, uid, ids, data, context)
return super(PDFReportAssembler, self).create(
cr, uid, ids, data, context)
if report_xml.report_type != 'assemblage':
return super(PDFReportAssembler, self).create(cr, uid, ids, data, context)
result = self.create_source_pdf(cr, uid, ids, data, report_xml, context)
return super(PDFReportAssembler, self).create(
cr, uid, ids, data, context)
result = self.create_source_pdf(
cr, uid, ids, data, report_xml, context)
if not result:
return (False, False)
return result